@@ -364,12 +362,12 @@ public void run() { // Checks if gas or oil is the most stable phase double gasgib = system.getPhase(0).getGibbsEnergy(); - system.setPhaseType(0, 0); + system.setPhaseType(0, PhaseType.byValue(0)); system.init(1, 0); double liqgib = system.getPhase(0).getGibbsEnergy(); if (gasgib * (1.0 - Math.signum(gasgib) * 1e-8) < liqgib) { - system.setPhaseType(0, 1); + system.setPhaseType(0, PhaseType.byValue(1)); } system.init(1); @@ -461,18 +459,18 @@ public void run() { // Checks if gas or oil is the most stable phase if (system.getPhase(0).getType() == PhaseType.GAS) { gasgib = system.getPhase(0).getGibbsEnergy(); - system.setPhaseType(0, 0); + system.setPhaseType(0, PhaseType.byValue(0)); system.init(1, 0); liqgib = system.getPhase(0).getGibbsEnergy(); } else { liqgib = system.getPhase(0).getGibbsEnergy(); - system.setPhaseType(0, 1); + system.setPhaseType(0, PhaseType.byValue(1)); system.init(1, 0); gasgib = system.getPhase(0).getGibbsEnergy(); } if (gasgib * (1.0 - Math.signum(gasgib) * 1e-8) < liqgib) { - system.setPhaseType(0, 1); + system.setPhaseType(0, PhaseType.byValue(1)); } system.init(1); diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/FreezeOut.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/FreezeOut.java index 32827b182f..dc0c4aea58 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/FreezeOut.java +++ b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/FreezeOut.java @@ -6,6 +6,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import neqsim.thermo.ThermodynamicConstantsInterface; +import neqsim.thermo.phase.PhaseType; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkSchwartzentruberEos; import neqsim.thermodynamicOperations.ThermodynamicOperations; @@ -83,7 +84,7 @@ public void run() { SystemInterface testSystem2 = new SystemSrkSchwartzentruberEos(216, 1); ThermodynamicOperations testOps2 = new ThermodynamicOperations(testSystem2); testSystem2.addComponent(testSystem.getPhase(0).getComponent(k).getComponentName(), 1); - testSystem2.setPhaseType(0, 1); + testSystem2.setPhaseType(0, PhaseType.byValue(1)); noFreezeliq = true; SolidFug = 0.0; FluidFug = 0.0; diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/FugTestConstP.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/FugTestConstP.java index 9bca127769..98676e2491 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/FugTestConstP.java +++ b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/FugTestConstP.java @@ -4,6 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.dataPresentation.JFreeChart.graph2b; import neqsim.thermo.ThermodynamicConstantsInterface; +import neqsim.thermo.phase.PhaseType; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkSchwartzentruberEos; import neqsim.thermodynamicOperations.ThermodynamicOperations; @@ -69,7 +70,7 @@ public FugTestConstP(SystemInterface system, double pres) { public void initTestSystem2(int K) { this.testSystem2 = new SystemSrkSchwartzentruberEos(temp, pres); this.testSystem2.addComponent(compName, 1); - this.testSystem2.setPhaseType(0, 1); + this.testSystem2.setPhaseType(0, PhaseType.byValue(1)); this.testOps2 = new ThermodynamicOperations(testSystem2); } diff --git a/src/main/java/neqsim/thermodynamicOperations/propertyGenerator/OLGApropertyTableGenerator.java b/src/main/java/neqsim/thermodynamicOperations/propertyGenerator/OLGApropertyTableGenerator.java index 89bff51de1..c6cc760de7 100644 --- a/src/main/java/neqsim/thermodynamicOperations/propertyGenerator/OLGApropertyTableGenerator.java +++ b/src/main/java/neqsim/thermodynamicOperations/propertyGenerator/OLGApropertyTableGenerator.java @@ -7,6 +7,7 @@ import java.io.Writer; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import neqsim.thermo.phase.PhaseType; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicOperations.ThermodynamicOperations; @@ -161,8 +162,8 @@ public void run() { } if (!thermoSystem.hasPhaseType("gas")) { - // TODO: here is a bug, calling with input oil does nothing. - thermoSystem.setPhaseType("oil", 1); + thermoSystem.setPhaseType(thermoSystem.getPhaseNumberOfPhase(PhaseType.OIL), + PhaseType.byValue(1)); thermoSystem.init(3); thermoSystem.initPhysicalProperties(); @@ -171,8 +172,8 @@ public void run() { } if (!thermoSystem.hasPhaseType("oil")) { - // TODO: here is a bug, calling with input gas does nothing. - thermoSystem.setPhaseType("gas", 1); + thermoSystem.setPhaseType(thermoSystem.getPhaseNumberOfPhase(PhaseType.GAS), + PhaseType.byValue(1)); thermoSystem.init(3); thermoSystem.initPhysicalProperties(); @@ -181,7 +182,7 @@ public void run() { } if (!thermoSystem.hasPhaseType("aqueous")) { - thermoSystem.setPhaseType(1, 1); + thermoSystem.setPhaseType(1, PhaseType.byValue(1)); thermoSystem.init(3); thermoSystem.initPhysicalProperties(); diff --git a/src/main/java/neqsim/thermodynamicOperations/propertyGenerator/OLGApropertyTableGeneratorWater.java b/src/main/java/neqsim/thermodynamicOperations/propertyGenerator/OLGApropertyTableGeneratorWater.java index 01591076ef..f93e59eec9 100644 --- a/src/main/java/neqsim/thermodynamicOperations/propertyGenerator/OLGApropertyTableGeneratorWater.java +++ b/src/main/java/neqsim/thermodynamicOperations/propertyGenerator/OLGApropertyTableGeneratorWater.java @@ -11,6 +11,7 @@ import org.apache.logging.log4j.Logger; import Jama.Matrix; import neqsim.thermo.ThermodynamicConstantsInterface; +import neqsim.thermo.phase.PhaseType; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; import neqsim.thermo.system.SystemSrkEos; @@ -573,7 +574,7 @@ public void run() { } while (k < 17); // names[k] = "GAS DENSITY"; // units[k] = "KG/M3"; } else { - oilSystem.setPhaseType(0, 0); + oilSystem.setPhaseType(0, PhaseType.byValue(0)); oilSystem.setTemperature(temperatures[j]); oilSystem.setPressure(pressures[i]); oilSystem.init(3); @@ -711,7 +712,7 @@ public void run() { } else { waterSystem.setTemperature(temperatures[j]); waterSystem.setPressure(pressures[i]); - waterSystem.setPhaseType(0, 0); + waterSystem.setPhaseType(0, PhaseType.byValue(0)); waterSystem.init(3); waterSystem.initPhysicalProperties(); diff --git a/src/main/java/neqsim/thermodynamicOperations/propertyGenerator/OLGApropertyTableGeneratorWaterStudents.java b/src/main/java/neqsim/thermodynamicOperations/propertyGenerator/OLGApropertyTableGeneratorWaterStudents.java index 7286025174..d636e59476 100644 --- a/src/main/java/neqsim/thermodynamicOperations/propertyGenerator/OLGApropertyTableGeneratorWaterStudents.java +++ b/src/main/java/neqsim/thermodynamicOperations/propertyGenerator/OLGApropertyTableGeneratorWaterStudents.java @@ -9,6 +9,7 @@ import org.apache.logging.log4j.Logger; import Jama.Matrix; import neqsim.thermo.ThermodynamicConstantsInterface; +import neqsim.thermo.phase.PhaseType; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; import neqsim.thermo.system.SystemSrkEos; @@ -731,7 +732,7 @@ public void run() { } while (k < 17); // names[k] = "GAS DENSITY"; // units[k] = "KG/M3"; } else { - oilSystem.setPhaseType(0, 0); + oilSystem.setPhaseType(0, PhaseType.byValue(0)); oilSystem.setTemperature(temperatures[j]); oilSystem.setPressure(pressures[i]); oilSystem.init(3); @@ -931,7 +932,7 @@ public void run() { } else { waterSystem.setTemperature(temperatures[j]); waterSystem.setPressure(pressures[i]); - waterSystem.setPhaseType(0, 0); + waterSystem.setPhaseType(0, PhaseType.byValue(0)); waterSystem.init(3); waterSystem.initPhysicalProperties(); diff --git a/src/main/java/neqsim/thermodynamicOperations/propertyGenerator/OLGApropertyTableGeneratorWaterStudentsPH.java b/src/main/java/neqsim/thermodynamicOperations/propertyGenerator/OLGApropertyTableGeneratorWaterStudentsPH.java index bffa4a432d..8d4bc0ee34 100644 --- a/src/main/java/neqsim/thermodynamicOperations/propertyGenerator/OLGApropertyTableGeneratorWaterStudentsPH.java +++ b/src/main/java/neqsim/thermodynamicOperations/propertyGenerator/OLGApropertyTableGeneratorWaterStudentsPH.java @@ -9,6 +9,7 @@ import org.apache.logging.log4j.Logger; import Jama.Matrix; import neqsim.thermo.ThermodynamicConstantsInterface; +import neqsim.thermo.phase.PhaseType; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; import neqsim.thermo.system.SystemSrkEos; @@ -730,7 +731,7 @@ public void run() { } while (k < 17); // names[k] = "GAS DENSITY"; // units[k] = "KG/M3"; } else { - oilSystem.setPhaseType(0, 0); + oilSystem.setPhaseType(0, PhaseType.byValue(0)); // oilSystem.setTemperature(enthalpies[j]); oilSystem.setPressure(pressures[i]); oilSystem.init(3); @@ -924,7 +925,7 @@ public void run() { } else { waterSystem.setTemperature(enthalpies[j]); waterSystem.setPressure(pressures[i]); - waterSystem.setPhaseType(0, 0); + waterSystem.setPhaseType(0, PhaseType.byValue(0)); waterSystem.init(3); waterSystem.initPhysicalProperties(); diff --git a/src/test/java/neqsim/thermo/util/example/TPMultiFlash.java b/src/test/java/neqsim/thermo/util/example/TPMultiFlash.java index bf1b40f010..f51bdfa325 100644 --- a/src/test/java/neqsim/thermo/util/example/TPMultiFlash.java +++ b/src/test/java/neqsim/thermo/util/example/TPMultiFlash.java @@ -2,6 +2,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import neqsim.thermo.phase.PhaseType; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; import neqsim.thermodynamicOperations.ThermodynamicOperations; @@ -98,7 +99,7 @@ public static void main(String[] args) { phase = 1; } - testSystem.setPhaseType(0, phase); + testSystem.setPhaseType(0, PhaseType.byValue(phase)); testSystem.init(2, 0); testSystem.initPhysicalProperties(); } diff --git a/src/test/java/neqsim/thermo/util/example/TPflashDehyd.java b/src/test/java/neqsim/thermo/util/example/TPflashDehyd.java index 70bd2bf68a..01447b327f 100644 --- a/src/test/java/neqsim/thermo/util/example/TPflashDehyd.java +++ b/src/test/java/neqsim/thermo/util/example/TPflashDehyd.java @@ -91,7 +91,7 @@ public static void main(String[] args) { * * testSystem.initPhysicalProperties(); testSystem.init(1); * - * System.out.println("start....."); testSystem.removeMoles(); + * System.out.println("start....."); testSystem.setEmptyFluid(); * testSystem.setMolarComposition(new double[]{1.0, 1e-20, 1e-20}); testSystem.init(0, 0); * testSystem.init(1); testSystem.display(); * From f2714699eaf10a3dd70ca12c5a80719c3d6de57d 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, 22 Feb 2024 18:56:58 +0100 Subject: [PATCH 2/3] rm: setPhaseType(int phaseToChange, String phaseTypeName) --- .../neqsim/thermo/system/SystemThermo.java | 24 +++++++------------ 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/src/main/java/neqsim/thermo/system/SystemThermo.java b/src/main/java/neqsim/thermo/system/SystemThermo.java index e731521961..717405528f 100644 --- a/src/main/java/neqsim/thermo/system/SystemThermo.java +++ b/src/main/java/neqsim/thermo/system/SystemThermo.java @@ -26,7 +26,6 @@ import neqsim.thermo.phase.PhaseSolidComplex; import neqsim.thermo.phase.PhaseType; import neqsim.thermo.phase.PhaseWax; -import neqsim.thermo.phase.StateOfMatter; import neqsim.util.database.NeqSimDataBase; import neqsim.util.exception.InvalidInputException; @@ -2967,21 +2966,6 @@ public void setPhaseType(int phaseToChange, PhaseType pt) { } } - /** {@inheritDoc} */ - public void setPhaseType(int phaseToChange, String phaseTypeName) { - // System.out.println("new phase type: cha " + newPhaseType); - int newPhaseType = 0; - if (phaseTypeName.equals("gas")) { - newPhaseType = 1; - } else if (StateOfMatter.isLiquid(PhaseType.byDesc(phaseTypeName))) { - newPhaseType = 0; - } else { - newPhaseType = 0; - } - - setPhaseType(phaseToChange, PhaseType.byValue(newPhaseType)); - } - /** {@inheritDoc} */ @Override public void setAllPhaseType(PhaseType pt) { @@ -2995,6 +2979,14 @@ public void setAllPhaseType(PhaseType pt) { /** {@inheritDoc} */ @Override public void invertPhaseTypes() { + // Following code was from public void setPhaseType(int phaseToChange, String phaseTypeName) { + + /* + * int newPhaseType = 0; if (phaseTypeName.equals("gas")) { newPhaseType = 1; } else if + * (StateOfMatter.isLiquid(PhaseType.byDesc(phaseTypeName))) { newPhaseType = 0; } else { + * newPhaseType = 0; } + */ + for (int i = 0; i < getMaxNumberOfPhases(); i++) { if (phaseType[i] == PhaseType.byValue(0)) { phaseType[i] = PhaseType.byValue(1); From 935a1a2b0d79790d90ed2ae28e051b08392d57ca 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, 22 Feb 2024 18:57:20 +0100 Subject: [PATCH 3/3] refact: rm getPhaseType and setPhaseType(int phaseType) --- .../neqsim/thermo/phase/PhaseInterface.java | 26 ------------------- 1 file changed, 26 deletions(-) diff --git a/src/main/java/neqsim/thermo/phase/PhaseInterface.java b/src/main/java/neqsim/thermo/phase/PhaseInterface.java index ba7afc9f67..5e5d290938 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseInterface.java +++ b/src/main/java/neqsim/thermo/phase/PhaseInterface.java @@ -1921,32 +1921,6 @@ public void setParams(PhaseInterface phase, double[][] alpha, double[][] Dij, do */ public void setType(PhaseType pt); - /** - *
- * Getter for property phasetype as int. - *
- * - * @return a int - * @deprecated Replace with {@link getType} - */ - @Deprecated - public default int getPhaseType() { - return getType().getValue(); - } - - /** - *- * Setter for property phaseType. - *
- * - * @param phaseType Phasetype as int. - * @deprecated Replace with {@link setType} - */ - @Deprecated - public default void setPhaseType(int phaseType) { - setType(PhaseType.byValue(phaseType)); - } - /** ** Getter for property phaseTypeName.