From 1e8119ffa79600ca79af1852044357d770be3c1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=85smund=20V=C3=A5ge=20Fannemel?= <34712686+asmfstatoil@users.noreply.github.com> Date: Thu, 4 May 2023 23:30:36 +0200 Subject: [PATCH 1/2] refact: database try-with --- .../ChemicalReactionFactory.java | 25 ++-- .../TestConductivityFit.java | 7 +- .../TestRacketFit.java | 4 +- .../TestInfluenceParamGTFunction.java | 4 +- .../chungMethod/TestChungFit.java | 4 +- .../CH4CO2WaterMDEA/CO2_MDEA_methane.java | 6 +- ...stIonicInteractionParameterFittingCH4.java | 5 +- ...arameterFittingToSolubilityData_Lucia.java | 27 ++-- ...arameterFittingToSolubilityData_Lucia.java | 7 +- ...ameterFittingToSolubilityDatawaterCO2.java | 13 +- ...arameterFittingToSolubilityData_Lucia.java | 45 +++--- .../TestIonicInteractionParameterFitting.java | 17 +-- ...stIonicInteractionParameterFittingCH4.java | 52 +++---- ...nicInteractionParameterFittingCo2nacl.java | 7 +- ...ractionParameterFittingMDEAPiperazine.java | 16 +-- ...InteractionParameterFittingPiperazine.java | 14 +- .../TestClassicAcentricPlusDens.java | 22 +-- .../TestMathiasCopemanToDewPoint.java | 133 +++++++++--------- 18 files changed, 203 insertions(+), 205 deletions(-) diff --git a/src/main/java/neqsim/chemicalReactions/chemicalReaction/ChemicalReactionFactory.java b/src/main/java/neqsim/chemicalReactions/chemicalReaction/ChemicalReactionFactory.java index 1f09c007e..b6bbd4e05 100644 --- a/src/main/java/neqsim/chemicalReactions/chemicalReaction/ChemicalReactionFactory.java +++ b/src/main/java/neqsim/chemicalReactions/chemicalReaction/ChemicalReactionFactory.java @@ -44,11 +44,9 @@ public static ChemicalReaction getChemicalReaction(String name) { double rateFactor = 0; double activationEnergy = 0; - try (neqsim.util.database.NeqSimDataBase database = new neqsim.util.database.NeqSimDataBase(); java.sql.ResultSet dataSet = database.getResultSet("SELECT * FROM reactionkspdata where name='" + name + "'")) { - dataSet.next(); String reacname = dataSet.getString("name"); K[0] = Double.parseDouble(dataSet.getString("K1")); @@ -59,16 +57,19 @@ public static ChemicalReaction getChemicalReaction(String name) { rateFactor = Double.parseDouble(dataSet.getString("r")); activationEnergy = Double.parseDouble(dataSet.getString("ACTENERGY")); - neqsim.util.database.NeqSimDataBase database2 = new neqsim.util.database.NeqSimDataBase(); - java.sql.ResultSet dataSet2 = - database2.getResultSet("SELECT * FROM stoccoefdata where reacname='" + reacname + "'"); - dataSet2.next(); - do { - names.add(dataSet2.getString("compname").trim()); - stocCoef.add((dataSet2.getString("stoccoef")).trim()); - } while (dataSet2.next()); - - // System.out.println("reaction added ok..."); + try ( + neqsim.util.database.NeqSimDataBase database2 = new neqsim.util.database.NeqSimDataBase(); + java.sql.ResultSet dataSet2 = database2 + .getResultSet("SELECT * FROM stoccoefdata where reacname='" + reacname + "'")) { + dataSet2.next(); + do { + names.add(dataSet2.getString("compname").trim()); + stocCoef.add((dataSet2.getString("stoccoef")).trim()); + } while (dataSet2.next()); + // System.out.println("reaction added ok..."); + } catch (Exception ex) { + logger.error("Could not add reaction", ex); + } } catch (Exception ex) { logger.error("Could not add reaction", ex); } diff --git a/src/main/java/neqsim/physicalProperties/util/parameterFitting/pureComponentParameterFitting/pureCompConductivity/linearLiquidModel/TestConductivityFit.java b/src/main/java/neqsim/physicalProperties/util/parameterFitting/pureComponentParameterFitting/pureCompConductivity/linearLiquidModel/TestConductivityFit.java index 53cb7440f..d7561361d 100644 --- a/src/main/java/neqsim/physicalProperties/util/parameterFitting/pureComponentParameterFitting/pureCompConductivity/linearLiquidModel/TestConductivityFit.java +++ b/src/main/java/neqsim/physicalProperties/util/parameterFitting/pureComponentParameterFitting/pureCompConductivity/linearLiquidModel/TestConductivityFit.java @@ -34,13 +34,12 @@ public static void main(String[] args) { ArrayList sampleList = new ArrayList(); // inserting samples from database - NeqSimDataBase database = new NeqSimDataBase(); - ResultSet dataSet = database - .getResultSet("SELECT * FROM purecomponentconductivitydata WHERE ComponentName='TEG'"); // ResultSet dataSet = database.getResultSet("NeqSimDataBase", "SELECT * FROM // activityCoefficientTable WHERE Component1='MDEA' AND Component2='water'"); - try { + try (NeqSimDataBase database = new NeqSimDataBase(); + ResultSet dataSet = database.getResultSet( + "SELECT * FROM purecomponentconductivitydata WHERE ComponentName='TEG'");) { logger.info("adding...."); while (dataSet.next()) { ConductivityFunction function = new ConductivityFunction(); diff --git a/src/main/java/neqsim/physicalProperties/util/parameterFitting/pureComponentParameterFitting/pureCompDensity/pureComponentRacketVolumeCorrectionParameterFitting/TestRacketFit.java b/src/main/java/neqsim/physicalProperties/util/parameterFitting/pureComponentParameterFitting/pureCompDensity/pureComponentRacketVolumeCorrectionParameterFitting/TestRacketFit.java index 8953254e3..50ce86c3f 100644 --- a/src/main/java/neqsim/physicalProperties/util/parameterFitting/pureComponentParameterFitting/pureCompDensity/pureComponentRacketVolumeCorrectionParameterFitting/TestRacketFit.java +++ b/src/main/java/neqsim/physicalProperties/util/parameterFitting/pureComponentParameterFitting/pureCompDensity/pureComponentRacketVolumeCorrectionParameterFitting/TestRacketFit.java @@ -34,11 +34,11 @@ public static void main(String[] args) { ArrayList sampleList = new ArrayList(); // inserting samples from database - NeqSimDataBase database = new NeqSimDataBase(); // ResultSet dataSet = database.getResultSet("NeqSimDataBase", "SELECT * FROM // activityCoefficientTable WHERE Component1='MDEA' AND Component2='water'"); - try (ResultSet dataSet = + try (NeqSimDataBase database = new NeqSimDataBase(); + ResultSet dataSet = database.getResultSet("SELECT * FROM purecomponentdensity WHERE ComponentName='MEG'")) { logger.info("adding...."); while (dataSet.next()) { diff --git a/src/main/java/neqsim/physicalProperties/util/parameterFitting/pureComponentParameterFitting/pureCompInterfaceTension/TestInfluenceParamGTFunction.java b/src/main/java/neqsim/physicalProperties/util/parameterFitting/pureComponentParameterFitting/pureCompInterfaceTension/TestInfluenceParamGTFunction.java index b2fbbcc79..a233b0cd1 100644 --- a/src/main/java/neqsim/physicalProperties/util/parameterFitting/pureComponentParameterFitting/pureCompInterfaceTension/TestInfluenceParamGTFunction.java +++ b/src/main/java/neqsim/physicalProperties/util/parameterFitting/pureComponentParameterFitting/pureCompInterfaceTension/TestInfluenceParamGTFunction.java @@ -33,7 +33,6 @@ public static void main(String[] args) { LevenbergMarquardt optim = new LevenbergMarquardt(); ArrayList sampleList = new ArrayList(); - NeqSimDataBase database = new NeqSimDataBase(); // ComponentName<>'nC10' // AND // ComponentName<>'nC11' @@ -53,7 +52,8 @@ public static void main(String[] args) { // double guess[] = {-5.2897559010400935E-17, 7.103588505598196E-17}; //, // 1.1161368619, 0.8363538313}; // PR param - try (ResultSet dataSet = database.getResultSet( + try (NeqSimDataBase database = new NeqSimDataBase(); + ResultSet dataSet = database.getResultSet( "SELECT * FROM purecomponentsurfacetension2 WHERE ComponentName IN ('n-pentane','ethane','methane', 'propane','CO2', 'c-hexane','M-cy-C5', 'n-pentane','n-hexane', 'n-nonane','nC10')") // AND ) { while (dataSet.next() && includePureCompData) { diff --git a/src/main/java/neqsim/physicalProperties/util/parameterFitting/pureComponentParameterFitting/pureCompViscosity/chungMethod/TestChungFit.java b/src/main/java/neqsim/physicalProperties/util/parameterFitting/pureComponentParameterFitting/pureCompViscosity/chungMethod/TestChungFit.java index 7ac326f50..dce70dbb3 100644 --- a/src/main/java/neqsim/physicalProperties/util/parameterFitting/pureComponentParameterFitting/pureCompViscosity/chungMethod/TestChungFit.java +++ b/src/main/java/neqsim/physicalProperties/util/parameterFitting/pureComponentParameterFitting/pureCompViscosity/chungMethod/TestChungFit.java @@ -34,9 +34,9 @@ public static void main(String[] args) { ArrayList sampleList = new ArrayList(); // inserting samples from database - NeqSimDataBase database = new NeqSimDataBase(); - try (ResultSet dataSet = database.getResultSet("SELECT * FROM purecomponentviscosity") // WHERE + try (NeqSimDataBase database = new NeqSimDataBase(); + ResultSet dataSet = database.getResultSet("SELECT * FROM purecomponentviscosity") // WHERE // ComponentName='MDEA*'"); ) { while (dataSet.next()) { diff --git a/src/main/java/neqsim/thermo/util/parameterFitting/Procede/CH4CO2WaterMDEA/CO2_MDEA_methane.java b/src/main/java/neqsim/thermo/util/parameterFitting/Procede/CH4CO2WaterMDEA/CO2_MDEA_methane.java index d645783a5..7a88c970d 100644 --- a/src/main/java/neqsim/thermo/util/parameterFitting/Procede/CH4CO2WaterMDEA/CO2_MDEA_methane.java +++ b/src/main/java/neqsim/thermo/util/parameterFitting/Procede/CH4CO2WaterMDEA/CO2_MDEA_methane.java @@ -60,10 +60,10 @@ public static void main(String[] args) { double dP; double Pold; double Pnew; - NeqSimDataBase database = new NeqSimDataBase(); - ResultSet dataSet = database.getResultSet("SELECT * FROM PatrickCO2"); - try { + try (NeqSimDataBase database = new NeqSimDataBase(); + ResultSet dataSet = database.getResultSet("SELECT * FROM PatrickCO2"); + ) { while (dataSet.next()) { i += 1; logger.info("Adding.... " + i); diff --git a/src/main/java/neqsim/thermo/util/parameterFitting/Procede/CH4CO2WaterMDEA/TestIonicInteractionParameterFittingCH4.java b/src/main/java/neqsim/thermo/util/parameterFitting/Procede/CH4CO2WaterMDEA/TestIonicInteractionParameterFittingCH4.java index 8519c7f51..c1daa7844 100644 --- a/src/main/java/neqsim/thermo/util/parameterFitting/Procede/CH4CO2WaterMDEA/TestIonicInteractionParameterFittingCH4.java +++ b/src/main/java/neqsim/thermo/util/parameterFitting/Procede/CH4CO2WaterMDEA/TestIonicInteractionParameterFittingCH4.java @@ -35,8 +35,6 @@ public static void main(String[] args) { ArrayList sampleList = new ArrayList(); // inserting samples from database - NeqSimDataBase database = new NeqSimDataBase(); - ResultSet dataSet = database.getResultSet("SELECT * FROM CO2CH4MDEA"); double ID; @@ -55,7 +53,8 @@ public static void main(String[] args) { // double guess[] = {0.0004929757}; //Case II double[] guess = {0.0004929757, 1e-10}; // Case II and CO2-CH4 parameter also regressed - try { + try (NeqSimDataBase database = new NeqSimDataBase(); + ResultSet dataSet = database.getResultSet("SELECT * FROM CO2CH4MDEA");) { int i = 0; logger.info("adding...."); while (dataSet.next()) { diff --git a/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/EosInteractionParameterFitting/TestCPAParameterFittingToSolubilityData_Lucia.java b/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/EosInteractionParameterFitting/TestCPAParameterFittingToSolubilityData_Lucia.java index f6407ce08..d6605a911 100644 --- a/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/EosInteractionParameterFitting/TestCPAParameterFittingToSolubilityData_Lucia.java +++ b/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/EosInteractionParameterFitting/TestCPAParameterFittingToSolubilityData_Lucia.java @@ -34,18 +34,7 @@ public static void main(String[] args) { ArrayList sampleList = new ArrayList(); // inserting samples from database - NeqSimDataBase database = new NeqSimDataBase(); - ResultSet dataSet = database.getResultSet( - "SELECT * FROM luciadata8 WHERE Component='methane' AND Temperature>410.15 AND Pressure<100000000 AND L2<>NULL AND L2>0.00000001 ORDER BY Temperature,Pressure"); // AND - // Reference='Houghton1957' - // AND - // Reference<>'Nighswander1989' - // AND - // Temperature>278.15 - // AND - // Temperature<383.15 - // AND - // Pressure<60.01325"); + // ResultSet dataSet = database.getResultSet( "SELECT * FROM LuciaData8 WHERE // Component='nitrogen' AND Temperature<390 AND L2<>NULL AND L2>0.0000000001 // ORDER BY Temperature,Pressure"); @@ -62,7 +51,12 @@ public static void main(String[] args) { // binarySolubilityData WHERE ComponentSolute='methane' AND // ComponentSolvent='water'"); - try { + try (NeqSimDataBase database = new NeqSimDataBase(); + ResultSet dataSet = database.getResultSet( + "SELECT * FROM luciadata8 WHERE Component='methane' AND Temperature>410.15 AND Pressure<100000000 AND L2<>NULL AND L2>0.00000001 ORDER BY Temperature,Pressure"); + // AND // Reference='Houghton1957' AND Reference<>'Nighswander1989' AND // + // Temperature>278.15 // AND // Temperature<383.15 // AND // Pressure<60.01325"); + ) { int p = 0; logger.info("adding...."); while (!dataSet.next() && p < 50) { @@ -114,8 +108,6 @@ public static void main(String[] args) { // AND Y<>NULL AND Y>0.00000001 ORDER BY Temperature,Pressure"); // AND // Reference='Houghton1957' AND Reference<>'Nighswander1989' AND // Temperature>278.15 AND Temperature<383.15 AND Pressure<60.01325"); - dataSet = database.getResultSet( - "SELECT * FROM LuciaData8 WHERE Component='methane' AND Temperature>273.15 AND Pressure<153000000 AND Y<>NULL AND Y>0.000000001 ORDER BY Temperature,Pressure"); // dataSet = database.getResultSet( "SELECT * FROM LuciaData8 WHERE // Component='nitrogen' AND Temperature<390 AND Y<>NULL AND Y>0.000000001 ORDER // BY Temperature,Pressure"); @@ -131,7 +123,10 @@ public static void main(String[] args) { // ResultSet dataSet = database.getResultSet( "SELECT * FROM // binarySolubilityData WHERE ComponentSolute='methane' AND // ComponentSolvent='water'"); - try { + try (NeqSimDataBase database = new NeqSimDataBase();) { + ResultSet dataSet = database.getResultSet( + "SELECT * FROM LuciaData8 WHERE Component='methane' AND Temperature>273.15 AND Pressure<153000000 AND Y<>NULL AND Y>0.000000001 ORDER BY Temperature,Pressure"); + int p = 0; logger.info("adding...."); while (dataSet.next() && p < 150) { diff --git a/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/HuronVidalParameterFitting/TestBinaryHVParameterFittingToSolubilityData_Lucia.java b/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/HuronVidalParameterFitting/TestBinaryHVParameterFittingToSolubilityData_Lucia.java index 686d20402..32a8e4eea 100644 --- a/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/HuronVidalParameterFitting/TestBinaryHVParameterFittingToSolubilityData_Lucia.java +++ b/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/HuronVidalParameterFitting/TestBinaryHVParameterFittingToSolubilityData_Lucia.java @@ -35,7 +35,6 @@ public static void main(String[] args) { ArrayList sampleList = new ArrayList(); // inserting samples from database - NeqSimDataBase database = new NeqSimDataBase(); // ResultSet dataSet = database.getResultSet( "SELECT * FROM LuciaData8 WHERE // Component='CO2' AND Temperature>250 AND Temperature<420 AND // Pressure<700000000 AND L2 IS NOT NULL AND L2>0.000000001 ORDER BY @@ -56,7 +55,8 @@ public static void main(String[] args) { // ResultSet dataSet = database.getResultSet( "SELECT * FROM LuciaData8 WHERE // Component='H2S' AND Temperature>250 AND Temperature<420 AND Pressure<10000000 // AND L2<>NULL AND L2>0.000000001 ORDER BY Temperature,Pressure"); - try (ResultSet dataSet = database.getResultSet( + try (NeqSimDataBase database = new NeqSimDataBase(); + ResultSet dataSet = database.getResultSet( "SELECT * FROM LuciaData8 WHERE Component='methane' AND Temperature<520 AND L2<>NULL AND L2>0.0000000001 ORDER BY Temperature,Pressure") // AND // Reference='Houghton1957' // AND @@ -164,7 +164,8 @@ public static void main(String[] args) { // activityCoefficientTable WHERE Component1='MDEA' AND Component2='water'"); // testSystem.addComponent(dataSet.getString("ComponentSolute"), 1.0); // testSystem.addComponent(dataSet.getString("ComponentSolvent"), 1.0); - try (ResultSet dataSet = database.getResultSet( + try (NeqSimDataBase database = new NeqSimDataBase(); + ResultSet dataSet = database.getResultSet( "SELECT * FROM LuciaData8 WHERE Component='methane' AND ID<3000 AND Temperature<520 AND Y<>NULL AND Y>0.0000000001 ORDER BY Temperature,Pressure")) { int p = 0; logger.info("adding...."); diff --git a/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/HuronVidalParameterFitting/TestBinaryHVParameterFittingToSolubilityDatawaterCO2.java b/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/HuronVidalParameterFitting/TestBinaryHVParameterFittingToSolubilityDatawaterCO2.java index 77ca7c323..d2f09d441 100644 --- a/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/HuronVidalParameterFitting/TestBinaryHVParameterFittingToSolubilityDatawaterCO2.java +++ b/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/HuronVidalParameterFitting/TestBinaryHVParameterFittingToSolubilityDatawaterCO2.java @@ -34,8 +34,9 @@ public static void main(String[] args) { LevenbergMarquardt optim = new LevenbergMarquardt(); ArrayList sampleList = new ArrayList(); - // inserting samples from database - NeqSimDataBase database = new NeqSimDataBase(); + + try (NeqSimDataBase database = new NeqSimDataBase();) { + // inserting samples from database // ResultSet dataSet = database.getResultSet( "SELECT * FROM CO2watersolubility // WHERE pressureMPA<6 AND reference IN ('[18]', '[35]', '[36]', '[37]', '[38]', // '[39]', '[40]', '[41]','[42]')"); @@ -43,7 +44,6 @@ public static void main(String[] args) { ResultSet dataSet = database.getResultSet( "SELECT * FROM CO2watersolubility WHERE pressureMPA<5 AND reference IN ('[18]', '[35]', '[36]', '[37]', '[38]', '[39]', '[40]', '[41]','[42]', '[32]', '[33]', '[34]')"); - try { int p = 0; while (dataSet.next() && p < 550) { p++; @@ -86,10 +86,11 @@ public static void main(String[] args) { logger.error("database error", ex); } - dataSet = database.getResultSet( - "SELECT * FROM LuciaData8 WHERE Component='CO2' AND ID<3000 AND Temperature>250 AND Pressure<700000000 AND Temperature<420 AND Y<>NULL AND Y>0.0000000001 ORDER BY Temperature,Pressure"); - try { + try (NeqSimDataBase database = new NeqSimDataBase(); + ResultSet dataSet = database.getResultSet( + "SELECT * FROM LuciaData8 WHERE Component='CO2' AND ID<3000 AND Temperature>250 AND Pressure<700000000 AND Temperature<420 AND Y<>NULL AND Y>0.0000000001 ORDER BY Temperature,Pressure"); + ) { int p = 0; while (!dataSet.next() && p < 100) { p++; diff --git a/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/HuronVidalParameterFitting/TestBinaryWSParameterFittingToSolubilityData_Lucia.java b/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/HuronVidalParameterFitting/TestBinaryWSParameterFittingToSolubilityData_Lucia.java index 67e25c12b..30e8002c6 100644 --- a/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/HuronVidalParameterFitting/TestBinaryWSParameterFittingToSolubilityData_Lucia.java +++ b/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/HuronVidalParameterFitting/TestBinaryWSParameterFittingToSolubilityData_Lucia.java @@ -35,25 +35,19 @@ public static void main(String[] args) { ArrayList sampleList = new ArrayList(); // inserting samples from database - NeqSimDataBase database = new NeqSimDataBase(); - ResultSet dataSet = database.getResultSet( - "SELECT * FROM LuciaData WHERE Component='methane' AND Temperature<520 AND L2<>NULL AND L2>0.00000001 ORDER BY Temperature,Pressure"); // AND - // Reference='Houghton1957' - // AND - // Reference<>'Nighswander1989' - // AND - // Temperature>278.15 - // AND - // Temperature<383.15 - // AND - // Pressure<60.01325"); + // ResultSet dataSet = database.getResultSet( "SELECT * FROM LuciaData WHERE // Component='CO2' AND Temperature>250 AND Temperature<420 AND L2<>NULL AND // L2>0.00000001 ORDER BY Temperature,Pressure"); // AND Reference='Houghton1957' // AND Reference<>'Nighswander1989' AND Temperature>278.15 AND // Temperature<383.15 AND Pressure<60.01325"); - try { + try (NeqSimDataBase database = new NeqSimDataBase(); + ResultSet dataSet = database.getResultSet( + "SELECT * FROM LuciaData WHERE Component='methane' AND Temperature<520 AND L2<>NULL AND L2>0.00000001 ORDER BY Temperature,Pressure"); + // AND// Reference='Houghton1957'// AND// Reference<>'Nighswander1989'// AND// + // Temperature>278.15// AND// Temperature<383.15// AND // Pressure<60.01325"); + ) { int p = 0; while (dataSet.next() && p < 100) { p++; @@ -114,17 +108,6 @@ public static void main(String[] args) { logger.error("database error", ex); } - dataSet = database.getResultSet( - "SELECT * FROM LuciaData WHERE Component='methane' AND ID<3000 AND Temperature<520 AND Y<>NULL AND Y>0.00000001 ORDER BY Temperature,Pressure"); // AND - // Reference='Houghton1957' - // AND - // Reference<>'Nighswander1989' - // AND - // Temperature>278.15 - // AND - // Temperature<383.15 - // AND - // Pressure<60.01325"); // dataSet = database.getResultSet( "SELECT * FROM LuciaData WHERE // Component='CO2' AND ID<3000 AND Temperature>250 AND Temperature<420 AND // Y<>NULL AND Y>0.00000001 ORDER BY Temperature,Pressure"); // AND @@ -135,7 +118,19 @@ public static void main(String[] args) { // activityCoefficientTable WHERE Component1='MDEA' AND Component2='water'"); // testSystem.addComponent(dataSet.getString("ComponentSolute"), 1.0); // testSystem.addComponent(dataSet.getString("ComponentSolvent"), 1.0); - try { + try (NeqSimDataBase database = new NeqSimDataBase(); + ResultSet dataSet = database.getResultSet( + "SELECT * FROM LuciaData WHERE Component='methane' AND ID<3000 AND Temperature<520 AND Y<>NULL AND Y>0.00000001 ORDER BY Temperature,Pressure"); // AND + // Reference='Houghton1957' + // AND + // Reference<>'Nighswander1989' + // AND + // Temperature>278.15 + // AND + // Temperature<383.15 + // AND + // Pressure<60.01325"); + ) { int p = 0; while (dataSet.next() && p < 100) { p++; diff --git a/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/ionicInteractionCoefficientFitting/TestIonicInteractionParameterFitting.java b/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/ionicInteractionCoefficientFitting/TestIonicInteractionParameterFitting.java index b9b1d60e4..4cb9d2979 100644 --- a/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/ionicInteractionCoefficientFitting/TestIonicInteractionParameterFitting.java +++ b/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/ionicInteractionCoefficientFitting/TestIonicInteractionParameterFitting.java @@ -34,7 +34,6 @@ public static void main(String[] args) { ArrayList sampleList = new ArrayList(); // inserting samples from database - NeqSimDataBase database = new NeqSimDataBase(); // ResultSet dataSet = database.getResultSet( "SELECT * FROM CO2KurCor WHERE // Reference<>'Bahiri1984' AND Temperature<373.15 ORDER BY // wtMDEA,Temperature,Reference,loading"); @@ -113,12 +112,13 @@ public static void main(String[] args) { // catch(Exception ex){ // logger.error("database error", ex); // } - double[] guess = {-0.0001868490, -0.0006868943, -0.0000210224, -0.0002324934, 0.0005}; - ResultSet dataSet = database.getResultSet( - "SELECT * FROM CO2waterMDEA2 WHERE Temperature<'393.15' AND PressureCO2<'20' AND Reference<>'GPA'"); - try { + + try (NeqSimDataBase database = new NeqSimDataBase();) { + ResultSet dataSet = database.getResultSet( + "SELECT * FROM CO2waterMDEA2 WHERE Temperature<'393.15' AND PressureCO2<'20' AND Reference<>'GPA'"); + int i = 0; while (dataSet.next() && i < 25) { int ID = Integer.parseInt(dataSet.getString("ID")); @@ -193,10 +193,11 @@ public static void main(String[] args) { logger.error("database error", ex); } - dataSet = database.getResultSet( - "SELECT * FROM CO2waterMDEA2 WHERE Temperature<'393.15' AND Pressure<'20' AND Reference<>'GPA'"); - try { + + try (NeqSimDataBase database = new NeqSimDataBase(); + ResultSet dataSet = database.getResultSet( + "SELECT * FROM CO2waterMDEA2 WHERE Temperature<'393.15' AND Pressure<'20' AND Reference<>'GPA'");) { int i = 0; while (dataSet.next() && i < 2) { int ID = Integer.parseInt(dataSet.getString("ID")); diff --git a/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/ionicInteractionCoefficientFitting/TestIonicInteractionParameterFittingCH4.java b/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/ionicInteractionCoefficientFitting/TestIonicInteractionParameterFittingCH4.java index f098072e4..e5730f3c0 100644 --- a/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/ionicInteractionCoefficientFitting/TestIonicInteractionParameterFittingCH4.java +++ b/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/ionicInteractionCoefficientFitting/TestIonicInteractionParameterFittingCH4.java @@ -34,13 +34,6 @@ public static void main(String[] args) { ArrayList sampleList = new ArrayList(); // inserting samples from database - NeqSimDataBase database = new NeqSimDataBase(); - ResultSet dataSet = database.getResultSet("SELECT * FROM Co2Ch4MDEA WHERE loading<1.9"); // AND - // temperature=313.15 - // AND - // pressure<210 - // AND - // wt=30"); // ResultSet dataSet = database.getResultSet( "SELECT * FROM // activityCoefficientTable WHERE Component1='MDEA' AND Component2='water'");AND // Reference='Lemoine2000' @@ -49,7 +42,14 @@ public static void main(String[] args) { // double guess[] = {-0.0000309356,-0.1469925592,-0.0272808384}; - try { + try (NeqSimDataBase database = new NeqSimDataBase(); + ResultSet dataSet = database.getResultSet("SELECT * FROM Co2Ch4MDEA WHERE loading<1.9"); // AND + // temperature=313.15 + // AND + // pressure<210 + // AND + // wt=30"); + ) { int i = 0; while (dataSet.next() && i < 100) { i++; @@ -95,13 +95,15 @@ public static void main(String[] args) { // ResultSet dataSet = database.getResultSet( "SELECT * FROM // activityCoefficientTable WHERE Component1='MDEA' AND Component2='water'");AND // Reference='Lemoine2000' - dataSet = database.getResultSet("SELECT * FROM Co2Ch4MDEA WHERE loading<1.9"); // AND - // temperature=313.15 - // AND - // pressure<210 - // AND - // wt=50"); - try { + + try (NeqSimDataBase database = new NeqSimDataBase(); + ResultSet dataSet = database.getResultSet("SELECT * FROM Co2Ch4MDEA WHERE loading<1.9")) // AND + // temperature=313.15 + // AND + // pressure<210 + // AND + // wt=50");) + { int i = 0; while (!dataSet.next() && i < 100) { i++; @@ -139,19 +141,21 @@ public static void main(String[] args) { sample.setThermodynamicSystem(testSystem); sampleList.add(sample); } - } catch (Exception ex) { + } catch ( + + Exception ex) { logger.error("database error", ex); } SampleSet sampleSet = new SampleSet(sampleList); optim.setSampleSet(sampleSet); - // do simulations + // do simulations - optim.solve(); - // optim.runMonteCarloSimulation(); - // optim.displayCurveFit(); - // optim.displayGraph(); - optim.displayCurveFit(); - optim.writeToTextFile("c:/testFit.txt"); - } + optim.solve(); + // optim.runMonteCarloSimulation(); + // optim.displayCurveFit(); + // optim.displayGraph(); + optim.displayCurveFit(); + optim.writeToTextFile("c:/testFit.txt"); +} } diff --git a/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/ionicInteractionCoefficientFitting/TestIonicInteractionParameterFittingCo2nacl.java b/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/ionicInteractionCoefficientFitting/TestIonicInteractionParameterFittingCo2nacl.java index 25e4faa67..975856510 100644 --- a/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/ionicInteractionCoefficientFitting/TestIonicInteractionParameterFittingCo2nacl.java +++ b/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/ionicInteractionCoefficientFitting/TestIonicInteractionParameterFittingCo2nacl.java @@ -34,9 +34,6 @@ public static void main(String[] args) { ArrayList sampleList = new ArrayList(); // inserting samples from database - NeqSimDataBase database = new NeqSimDataBase(); - ResultSet dataSet = database.getResultSet( - "SELECT * FROM co2wation WHERE comp3='K+' AND temperature>340 AND pressure<190"); // ResultSet dataSet = database.getResultSet( "SELECT * FROM // activityCoefficientTable WHERE Component1='MDEA' AND Component2='water'");AND // Reference='Lemoine2000' @@ -48,7 +45,9 @@ public static void main(String[] args) { // double guess[] = {-0.00000650867}; //k+ 40 double guess[] = {0.0000267226}; // k+ 80 - try { + try (NeqSimDataBase database = new NeqSimDataBase(); + ResultSet dataSet = database.getResultSet( + "SELECT * FROM co2wation WHERE comp3='K+' AND temperature>340 AND pressure<190");) { int i = 0; while (dataSet.next() && i < 403) { i++; diff --git a/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/ionicInteractionCoefficientFitting/TestIonicInteractionParameterFittingMDEAPiperazine.java b/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/ionicInteractionCoefficientFitting/TestIonicInteractionParameterFittingMDEAPiperazine.java index f49ca7dde..6e6c0e85d 100644 --- a/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/ionicInteractionCoefficientFitting/TestIonicInteractionParameterFittingMDEAPiperazine.java +++ b/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/ionicInteractionCoefficientFitting/TestIonicInteractionParameterFittingMDEAPiperazine.java @@ -35,16 +35,16 @@ public static void main(String[] args) { ArrayList sampleList = new ArrayList(); // inserting samples from database - NeqSimDataBase database = new NeqSimDataBase(); - double guess[] = {0.0007757516}; // , -0.00013534324}; //, -0.000210224}; //, -0.0002324934, - // 0.0005}; - ResultSet dataSet = database.getResultSet("SELECT * FROM CO2waterPZ"); // WHERE - // Temperature<393.15 - // AND - // PressureCO2<4"); - try { + + try (NeqSimDataBase database = new NeqSimDataBase();) { + double guess[] = {0.0007757516}; // , -0.00013534324}; //, -0.000210224}; //, -0.0002324934, + // 0.0005}; + ResultSet dataSet = database.getResultSet("SELECT * FROM CO2waterPZ"); // WHERE + // Temperature<393.15 + // AND + // PressureCO2<4"); int i = 0; while (dataSet.next() && i < 25) { i++; diff --git a/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/ionicInteractionCoefficientFitting/TestIonicInteractionParameterFittingPiperazine.java b/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/ionicInteractionCoefficientFitting/TestIonicInteractionParameterFittingPiperazine.java index 7b639f17c..f92e40d4e 100644 --- a/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/ionicInteractionCoefficientFitting/TestIonicInteractionParameterFittingPiperazine.java +++ b/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/ionicInteractionCoefficientFitting/TestIonicInteractionParameterFittingPiperazine.java @@ -34,15 +34,13 @@ public static void main(String[] args) { ArrayList sampleList = new ArrayList(); // inserting samples from database - NeqSimDataBase database = new NeqSimDataBase(); + try (NeqSimDataBase database = new NeqSimDataBase();) { + double guess[] = {-0.0001868490, -0.0006868943, -0.0000210224, -0.0002324934, 0.0005}; + ResultSet dataSet = database.getResultSet("SELECT * FROM CO2waterMDEAPiperazine"); // WHERE + // Temperature<393.15 + // AND + // PressureCO2<4"); - double guess[] = {-0.0001868490, -0.0006868943, -0.0000210224, -0.0002324934, 0.0005}; - ResultSet dataSet = database.getResultSet("SELECT * FROM CO2waterMDEAPiperazine"); // WHERE - // Temperature<393.15 - // AND - // PressureCO2<4"); - - try { int i = 0; while (dataSet.next() && i < 16) { i++; diff --git a/src/main/java/neqsim/thermo/util/parameterFitting/pureComponentParameterFitting/acentricFactorFitting/TestClassicAcentricPlusDens.java b/src/main/java/neqsim/thermo/util/parameterFitting/pureComponentParameterFitting/acentricFactorFitting/TestClassicAcentricPlusDens.java index 78638e2ac..73eeb2e93 100644 --- a/src/main/java/neqsim/thermo/util/parameterFitting/pureComponentParameterFitting/acentricFactorFitting/TestClassicAcentricPlusDens.java +++ b/src/main/java/neqsim/thermo/util/parameterFitting/pureComponentParameterFitting/acentricFactorFitting/TestClassicAcentricPlusDens.java @@ -33,7 +33,6 @@ public static void main(String[] args) { ArrayList sampleList = new ArrayList(); // inserting samples from database - NeqSimDataBase database = new NeqSimDataBase(); // ResultSet dataSet = database.getResultSet( "SELECT * FROM // PureComponentVapourPressures WHERE ComponentName='methane' AND @@ -44,10 +43,11 @@ public static void main(String[] args) { // ResultSet dataSet = database.getResultSet( "SELECT * FROM // PureComponentVapourPressures WHERE ComponentName='water' AND VapourPressure>0 // ORDER BY Temperature ASC"); - ResultSet dataSet = database.getResultSet( - "SELECT * FROM PureComponentVapourPressures WHERE ComponentName='nitrogen' AND VapourPressure>0 ORDER BY Temperature ASC"); double guess[] = {0.04}; - try { + try (NeqSimDataBase database = new NeqSimDataBase();) { + ResultSet dataSet = database.getResultSet( + "SELECT * FROM PureComponentVapourPressures WHERE ComponentName='nitrogen' AND VapourPressure>0 ORDER BY Temperature ASC"); + logger.info("adding...."); while (!dataSet.next()) { ClassicAcentricFunction function = new ClassicAcentricFunction(); @@ -83,9 +83,10 @@ public static void main(String[] args) { // WHERE ComponentName='CO2' AND VapourPressure>5"); // dataSet = database.getResultSet( "SELECT * FROM PureComponentVapourPressures // WHERE ComponentName='water' AND VapourPressure>0 ORDER BY Temperature ASC"); - dataSet = database.getResultSet( - "SELECT * FROM PureComponentVapourPressures WHERE ComponentName='nitrogen' AND VapourPressure>0 ORDER BY Temperature ASC"); - try { + + try (NeqSimDataBase database = new NeqSimDataBase(); + ResultSet dataSet = database.getResultSet( + "SELECT * FROM PureComponentVapourPressures WHERE ComponentName='nitrogen' AND VapourPressure>0 ORDER BY Temperature ASC");) { logger.info("adding...."); while (!dataSet.next()) { ClassicAcentricDens function = new ClassicAcentricDens(1); @@ -120,9 +121,10 @@ public static void main(String[] args) { // WHERE ComponentName='CO2' AND VapourPressure>5"); // dataSet = database.getResultSet( "SELECT * FROM PureComponentVapourPressures // WHERE ComponentName='water' AND VapourPressure>0 ORDER BY Temperature ASC"); - dataSet = database.getResultSet( - "SELECT * FROM PureComponentVapourPressures WHERE ComponentName='nitrogen' AND VapourPressure>0 ORDER BY Temperature ASC"); - try { + try (NeqSimDataBase database = new NeqSimDataBase(); + ResultSet dataSet = database.getResultSet( + "SELECT * FROM PureComponentVapourPressures WHERE ComponentName='nitrogen' AND VapourPressure>0 ORDER BY Temperature ASC"); + ) { logger.info("adding...."); while (dataSet.next()) { ClassicAcentricDens function = new ClassicAcentricDens(0); diff --git a/src/main/java/neqsim/thermo/util/parameterFitting/pureComponentParameterFitting/acentricFactorFitting/TestMathiasCopemanToDewPoint.java b/src/main/java/neqsim/thermo/util/parameterFitting/pureComponentParameterFitting/acentricFactorFitting/TestMathiasCopemanToDewPoint.java index c5f7646a1..0f14f73f3 100644 --- a/src/main/java/neqsim/thermo/util/parameterFitting/pureComponentParameterFitting/acentricFactorFitting/TestMathiasCopemanToDewPoint.java +++ b/src/main/java/neqsim/thermo/util/parameterFitting/pureComponentParameterFitting/acentricFactorFitting/TestMathiasCopemanToDewPoint.java @@ -34,8 +34,6 @@ public static void main(String[] args) { ArrayList sampleList = new ArrayList(); // inserting samples from database - NeqSimDataBase database = new NeqSimDataBase(); - ResultSet dataSet = null; // // PVTsim14 values for MC-parameters // double guess[] ={0.547, -0.399, 0.575, // methane @@ -67,17 +65,55 @@ public static void main(String[] args) { 1.1084438340, 1.1800358360, -1.4810259893, 1.4887592454}; String nameList[] = {"methane", "ethane", "propane", "n-butane", "i-butane", "n-pentane", "c-hexane", "benzene", "n-heptane"}; + try (NeqSimDataBase database = new NeqSimDataBase();) { + ResultSet dataSet = null; + + for (int compNumb = 0; compNumb < nameList.length; compNumb++) { + dataSet = + database.getResultSet("SELECT * FROM PureComponentVapourPressures WHERE ComponentName='" + + nameList[compNumb] + "' AND VapourPressure>0 ORDER BY Temperature ASC"); + + try { + long numberOfPoint = 3; + logger.error("point " + numberOfPoint); + int i = 0; + while (dataSet.next()) { + i++; + if (i % numberOfPoint == 0) { + MathiasCopemanToDewPoint function = new MathiasCopemanToDewPoint(); + function.setInitialGuess(guess); + + SystemInterface testSystem = + new SystemSrkMathiasCopeman(Double.parseDouble(dataSet.getString("Temperature")), + Double.parseDouble(dataSet.getString("VapourPressure"))); + testSystem.addComponent(dataSet.getString("ComponentName"), 100.0); + // testSystem.createDatabase(true); + double sample1[] = {testSystem.getPressure()}; + double standardDeviation1[] = {0.1, 0.1, 0.1}; + double val = testSystem.getTemperature(); + double stdErr = 1.0; + SampleValue sample = new SampleValue(val, stdErr, sample1, standardDeviation1); + sample.setFunction(function); + sample.setReference(dataSet.getString("Reference")); + sample.setThermodynamicSystem(testSystem); + sampleList.add(sample); + } + } + } catch (Exception ex) { + logger.error("database error", ex); + } + } - for (int compNumb = 0; compNumb < nameList.length; compNumb++) { dataSet = - database.getResultSet("SELECT * FROM PureComponentVapourPressures WHERE ComponentName='" - + nameList[compNumb] + "' AND VapourPressure>0 ORDER BY Temperature ASC"); + database.getResultSet("SELECT * FROM dewPointDataSynthHCStatoil WHERE Pressure<80.0"); // "0 + // AND + // reference='Morch2004gas1'"); try { - long numberOfPoint = 3; - logger.error("point " + numberOfPoint); + long numberOfPoint = 1; + logger.info("point " + numberOfPoint); int i = 0; - while (dataSet.next()) { + while (dataSet.next() && i < 100) { i++; if (i % numberOfPoint == 0) { MathiasCopemanToDewPoint function = new MathiasCopemanToDewPoint(); @@ -85,8 +121,29 @@ public static void main(String[] args) { SystemInterface testSystem = new SystemSrkMathiasCopeman(Double.parseDouble(dataSet.getString("Temperature")), - Double.parseDouble(dataSet.getString("VapourPressure"))); - testSystem.addComponent(dataSet.getString("ComponentName"), 100.0); + Double.parseDouble(dataSet.getString("Pressure"))); + testSystem.addComponent(dataSet.getString("comp1"), + Double.parseDouble(dataSet.getString("x1"))); + testSystem.addComponent(dataSet.getString("comp2"), + Double.parseDouble(dataSet.getString("x2"))); + testSystem.addComponent(dataSet.getString("comp3"), + Double.parseDouble(dataSet.getString("x3"))); + testSystem.addComponent(dataSet.getString("comp4"), + Double.parseDouble(dataSet.getString("x4"))); + testSystem.addComponent(dataSet.getString("comp5"), + Double.parseDouble(dataSet.getString("x5"))); + testSystem.addComponent(dataSet.getString("comp6"), + Double.parseDouble(dataSet.getString("x6"))); + testSystem.addComponent(dataSet.getString("comp7"), + Double.parseDouble(dataSet.getString("x7"))); + testSystem.addComponent(dataSet.getString("comp8"), + Double.parseDouble(dataSet.getString("x8"))); + testSystem.addComponent(dataSet.getString("comp9"), + Double.parseDouble(dataSet.getString("x9"))); + // testSystem.addComponent(dataSet.getString("comp9"), + // Double.parseDouble(dataSet.getString("x9"))); + // testSystem.addComponent(dataSet.getString("comp10"), + // Double.parseDouble(dataSet.getString("x10"))); // testSystem.createDatabase(true); double sample1[] = {testSystem.getPressure()}; double standardDeviation1[] = {0.1, 0.1, 0.1}; @@ -94,7 +151,7 @@ public static void main(String[] args) { double stdErr = 1.0; SampleValue sample = new SampleValue(val, stdErr, sample1, standardDeviation1); sample.setFunction(function); - sample.setReference(dataSet.getString("Reference")); + sample.setReference(dataSet.getString("reference")); sample.setThermodynamicSystem(testSystem); sampleList.add(sample); } @@ -102,61 +159,7 @@ public static void main(String[] args) { } catch (Exception ex) { logger.error("database error", ex); } - } - - dataSet = database.getResultSet("SELECT * FROM dewPointDataSynthHCStatoil WHERE Pressure<80.0"); // "0 - // AND - // reference='Morch2004gas1'"); - - try { - long numberOfPoint = 1; - logger.info("point " + numberOfPoint); - int i = 0; - while (dataSet.next() && i < 100) { - i++; - if (i % numberOfPoint == 0) { - MathiasCopemanToDewPoint function = new MathiasCopemanToDewPoint(); - function.setInitialGuess(guess); - - SystemInterface testSystem = - new SystemSrkMathiasCopeman(Double.parseDouble(dataSet.getString("Temperature")), - Double.parseDouble(dataSet.getString("Pressure"))); - testSystem.addComponent(dataSet.getString("comp1"), - Double.parseDouble(dataSet.getString("x1"))); - testSystem.addComponent(dataSet.getString("comp2"), - Double.parseDouble(dataSet.getString("x2"))); - testSystem.addComponent(dataSet.getString("comp3"), - Double.parseDouble(dataSet.getString("x3"))); - testSystem.addComponent(dataSet.getString("comp4"), - Double.parseDouble(dataSet.getString("x4"))); - testSystem.addComponent(dataSet.getString("comp5"), - Double.parseDouble(dataSet.getString("x5"))); - testSystem.addComponent(dataSet.getString("comp6"), - Double.parseDouble(dataSet.getString("x6"))); - testSystem.addComponent(dataSet.getString("comp7"), - Double.parseDouble(dataSet.getString("x7"))); - testSystem.addComponent(dataSet.getString("comp8"), - Double.parseDouble(dataSet.getString("x8"))); - testSystem.addComponent(dataSet.getString("comp9"), - Double.parseDouble(dataSet.getString("x9"))); - // testSystem.addComponent(dataSet.getString("comp9"), - // Double.parseDouble(dataSet.getString("x9"))); - // testSystem.addComponent(dataSet.getString("comp10"), - // Double.parseDouble(dataSet.getString("x10"))); - // testSystem.createDatabase(true); - double sample1[] = {testSystem.getPressure()}; - double standardDeviation1[] = {0.1, 0.1, 0.1}; - double val = testSystem.getTemperature(); - double stdErr = 1.0; - SampleValue sample = new SampleValue(val, stdErr, sample1, standardDeviation1); - sample.setFunction(function); - sample.setReference(dataSet.getString("reference")); - sample.setThermodynamicSystem(testSystem); - sampleList.add(sample); - } - } } catch (Exception ex) { - logger.error("database error", ex); } SampleSet sampleSet = new SampleSet(sampleList); From fcd5d5de27b01810a58b825e319b1638ca1a4468 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=85smund=20V=C3=A5ge=20Fannemel?= <34712686+asmfstatoil@users.noreply.github.com> Date: Fri, 5 May 2023 00:56:25 +0200 Subject: [PATCH 2/2] more --- .../chemicalReaction/ChemicalReactionFactory.java | 4 ++-- .../TestIonicInteractionParameterFitting_CO2.java | 2 -- .../TestBinaryUMRPRUFittingToSolubilityData.java | 4 ---- .../TestIonicInteractionParameterFitting_Sleipner.java | 2 -- .../pureComponentParameterFitting/cpaParam/TestCPA_ice.java | 1 - src/main/java/neqsim/util/database/NeqSimFluidDataBase.java | 1 - 6 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/main/java/neqsim/chemicalReactions/chemicalReaction/ChemicalReactionFactory.java b/src/main/java/neqsim/chemicalReactions/chemicalReaction/ChemicalReactionFactory.java index b6bbd4e05..b95feb4de 100644 --- a/src/main/java/neqsim/chemicalReactions/chemicalReaction/ChemicalReactionFactory.java +++ b/src/main/java/neqsim/chemicalReactions/chemicalReaction/ChemicalReactionFactory.java @@ -9,6 +9,7 @@ import java.util.ArrayList; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import neqsim.util.database.NeqSimDataBase; /** *

@@ -57,8 +58,7 @@ public static ChemicalReaction getChemicalReaction(String name) { rateFactor = Double.parseDouble(dataSet.getString("r")); activationEnergy = Double.parseDouble(dataSet.getString("ACTENERGY")); - try ( - neqsim.util.database.NeqSimDataBase database2 = new neqsim.util.database.NeqSimDataBase(); + try (NeqSimDataBase database2 = new neqsim.util.database.NeqSimDataBase(); java.sql.ResultSet dataSet2 = database2 .getResultSet("SELECT * FROM stoccoefdata where reacname='" + reacname + "'")) { dataSet2.next(); diff --git a/src/main/java/neqsim/thermo/util/parameterFitting/Procede/CO2WaterMDEA/TestIonicInteractionParameterFitting_CO2.java b/src/main/java/neqsim/thermo/util/parameterFitting/Procede/CO2WaterMDEA/TestIonicInteractionParameterFitting_CO2.java index b695b222d..0ae648563 100644 --- a/src/main/java/neqsim/thermo/util/parameterFitting/Procede/CO2WaterMDEA/TestIonicInteractionParameterFitting_CO2.java +++ b/src/main/java/neqsim/thermo/util/parameterFitting/Procede/CO2WaterMDEA/TestIonicInteractionParameterFitting_CO2.java @@ -139,7 +139,6 @@ public static void main(String[] args) { logger.error("database error", ex); } - try (NeqSimDataBase database = new NeqSimDataBase(); ResultSet dataSet = database.getResultSet("SELECT * FROM CO2WaterMDEA WHERE ID>230")) { int i = 0; @@ -207,7 +206,6 @@ public static void main(String[] args) { logger.error("database error", ex); } - try (NeqSimDataBase database = new NeqSimDataBase(); ResultSet dataSet = database.getResultSet("SELECT * FROM CO2WaterMDEAtest")) { int i = 0; diff --git a/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/HuronVidalParameterFitting/TestBinaryUMRPRUFittingToSolubilityData.java b/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/HuronVidalParameterFitting/TestBinaryUMRPRUFittingToSolubilityData.java index d857f8b91..84d32aff0 100644 --- a/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/HuronVidalParameterFitting/TestBinaryUMRPRUFittingToSolubilityData.java +++ b/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/HuronVidalParameterFitting/TestBinaryUMRPRUFittingToSolubilityData.java @@ -33,7 +33,6 @@ public static void main(String[] args) { LevenbergMarquardt optim = new LevenbergMarquardt(); ArrayList sampleList = new ArrayList(); - double parameterGuess[] = {188.385052774267, -0.84022345}; // , 2630.871733876947}; try (NeqSimDataBase database = new NeqSimDataBase(); @@ -180,7 +179,6 @@ public static void main(String[] args) { logger.error("database error", ex); } - try (NeqSimDataBase database = new NeqSimDataBase(); ResultSet dataSet = database.getResultSet( "SELECT * FROM binarySolubilityData WHERE ComponentSolute='Hg' AND ComponentSolvent='n-pentane'");) { @@ -216,7 +214,6 @@ public static void main(String[] args) { logger.error("database error", ex); } - try (NeqSimDataBase database = new NeqSimDataBase(); ResultSet dataSet = database.getResultSet( "SELECT * FROM binarySolubilityData WHERE ComponentSolute='Hg' AND ComponentSolvent='butane'");) { @@ -253,7 +250,6 @@ public static void main(String[] args) { logger.error("database error", ex); } - try (NeqSimDataBase database = new NeqSimDataBase(); ResultSet dataSet = database.getResultSet( "SELECT * FROM binarySolubilityData WHERE ComponentSolute='Hg' AND ComponentSolvent='propane'");) { diff --git a/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/ionicInteractionCoefficientFitting/TestIonicInteractionParameterFitting_Sleipner.java b/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/ionicInteractionCoefficientFitting/TestIonicInteractionParameterFitting_Sleipner.java index c31aea935..b6b65201c 100644 --- a/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/ionicInteractionCoefficientFitting/TestIonicInteractionParameterFitting_Sleipner.java +++ b/src/main/java/neqsim/thermo/util/parameterFitting/binaryInteractionParameterFitting/ionicInteractionCoefficientFitting/TestIonicInteractionParameterFitting_Sleipner.java @@ -34,9 +34,7 @@ public static void main(String[] args) { LevenbergMarquardt optim = new LevenbergMarquardt(); ArrayList sampleList = new ArrayList(); - // ResultSet dataSet = database.getResultSet( "SELECT * FROM Sleipneracid"); - try (NeqSimDataBase database = new NeqSimDataBase()) { ResultSet dataSet = database.getResultSet("SELECT * FROM Sleipner"); diff --git a/src/main/java/neqsim/thermo/util/parameterFitting/pureComponentParameterFitting/cpaParam/TestCPA_ice.java b/src/main/java/neqsim/thermo/util/parameterFitting/pureComponentParameterFitting/cpaParam/TestCPA_ice.java index 4a49004c2..432bdb315 100644 --- a/src/main/java/neqsim/thermo/util/parameterFitting/pureComponentParameterFitting/cpaParam/TestCPA_ice.java +++ b/src/main/java/neqsim/thermo/util/parameterFitting/pureComponentParameterFitting/cpaParam/TestCPA_ice.java @@ -140,7 +140,6 @@ public static void main(String[] args) { logger.error("database error", ex); } - try (NeqSimDataBase database = new NeqSimDataBase(); ResultSet dataSet = database.getResultSet( "SELECT * FROM PureComponentVapourPressures WHERE ComponentName='water' AND Temperature>273.15 AND Temperature<620.15 ORDER BY Temperature");) { diff --git a/src/main/java/neqsim/util/database/NeqSimFluidDataBase.java b/src/main/java/neqsim/util/database/NeqSimFluidDataBase.java index f933f9983..1d531b665 100644 --- a/src/main/java/neqsim/util/database/NeqSimFluidDataBase.java +++ b/src/main/java/neqsim/util/database/NeqSimFluidDataBase.java @@ -22,7 +22,6 @@ public class NeqSimFluidDataBase private static final long serialVersionUID = 1000; static Logger logger = LogManager.getLogger(NeqSimFluidDataBase.class); - static boolean started = false; protected Connection databaseConnection; /** Constant useOnlineBase=false. */