From fd8c13af6366846cc881aca90b690f1808e79df7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=85smund=20V=C3=A5ge=20Fannemel?= <34712686+asmfstatoil@users.noreply.github.com> Date: Mon, 6 Jan 2025 14:33:00 +0100 Subject: [PATCH] feat: new function phase.getComponentName --- .../ChemicalReactionOperations.java | 2 +- .../chemicalreaction/ChemicalReaction.java | 4 +- .../ChemicalReactionList.java | 4 +- .../fluidmechanics/flownode/FlowNode.java | 6 +-- .../heatmasstransfercalc/FluidBoundary.java | 7 ++- .../EnhancementFactorAlg.java | 2 +- .../shipsystem/LNGship.java | 4 +- .../surfacetension/GTSurfaceTensionODE.java | 2 +- .../GTSurfaceTensionSimple.java | 10 ++-- .../surfacetension/LGTSurfaceTension.java | 14 +++--- .../equipment/absorber/SimpleTEGAbsorber.java | 7 ++- .../absorber/WaterStripperColumn.java | 7 ++- .../equipment/compressor/Compressor.java | 2 +- .../equipment/expander/ExpanderOld.java | 2 +- .../neqsim/process/equipment/mixer/Mixer.java | 8 ++-- .../process/equipment/mixer/StaticMixer.java | 5 +- .../equipment/mixer/StaticNeqMixer.java | 5 +- .../equipment/mixer/StaticPhaseMixer.java | 5 +- .../neqsim/process/equipment/pump/Pump.java | 2 +- .../process/equipment/util/Recycle.java | 6 +-- src/main/java/neqsim/standards/Standard.java | 2 +- .../BestPracticeHydrocarbonDewPoint.java | 4 +- .../standards/gasquality/Draft_GERG2004.java | 4 +- .../standards/gasquality/Draft_ISO18453.java | 2 +- .../gasquality/Standard_ISO6578.java | 20 ++++---- .../gasquality/Standard_ISO6976.java | 8 ++-- .../gasquality/Standard_ISO6976_2016.java | 2 +- .../characterization/PlusCharacterize.java | 4 +- .../characterization/WaxCharacterise.java | 13 +++-- .../neqsim/thermo/mixingrule/MixingRule.java | 11 +++++ src/main/java/neqsim/thermo/phase/Phase.java | 2 +- .../java/neqsim/thermo/phase/PhaseEos.java | 2 +- .../java/neqsim/thermo/phase/PhaseGE.java | 2 +- .../java/neqsim/thermo/phase/PhaseGENRTL.java | 2 +- .../thermo/phase/PhaseGENRTLmodifiedHV.java | 4 +- .../thermo/phase/PhaseGENRTLmodifiedWS.java | 4 +- .../neqsim/thermo/phase/PhaseGEUnifac.java | 2 +- .../thermo/phase/PhaseGEUnifacPSRK.java | 2 +- .../thermo/phase/PhaseGEUnifacUMRPRU.java | 2 +- .../neqsim/thermo/phase/PhaseGEUniquac.java | 2 +- .../neqsim/thermo/phase/PhaseGEWilson.java | 2 +- .../neqsim/thermo/phase/PhaseInterface.java | 10 ++++ .../flashops/TPmultiflash.java | 6 +-- .../flashops/dTPflash.java | 2 +- .../DewPointTemperatureFlash.java | 2 +- .../DewPointTemperatureFlashDer.java | 2 +- .../HydrateFormationTemperatureFlash.java | 2 +- .../SolidComplexTemperatureCalc.java | 4 +- .../system/SystemThermoNameTagTest.java | 47 +++++++++++++++++++ .../thermo/util/example/DewPointCurve.java | 14 +++--- .../readwrite/EclipseFluidReadWriteTest.java | 2 +- 51 files changed, 173 insertions(+), 118 deletions(-) create mode 100644 src/main/java/neqsim/thermo/mixingrule/MixingRule.java create mode 100644 src/test/java/neqsim/thermo/system/SystemThermoNameTagTest.java diff --git a/src/main/java/neqsim/chemicalreactions/ChemicalReactionOperations.java b/src/main/java/neqsim/chemicalreactions/ChemicalReactionOperations.java index 4d59a3b48..7429ee0ae 100644 --- a/src/main/java/neqsim/chemicalreactions/ChemicalReactionOperations.java +++ b/src/main/java/neqsim/chemicalreactions/ChemicalReactionOperations.java @@ -180,7 +180,7 @@ public void setReactiveComponents() { if (name.equals(allComponentNames[i])) { components[k++] = system.getPhase(phase).getComponent(j); // System.out.println("reactive comp " + - // system.getPhases()[1].getComponent(j).getName()); + // system.getPhases()[1].getComponentName(j)); } } } diff --git a/src/main/java/neqsim/chemicalreactions/chemicalreaction/ChemicalReaction.java b/src/main/java/neqsim/chemicalreactions/chemicalreaction/ChemicalReaction.java index 27b438fc1..facf1d317 100644 --- a/src/main/java/neqsim/chemicalreactions/chemicalreaction/ChemicalReaction.java +++ b/src/main/java/neqsim/chemicalreactions/chemicalreaction/ChemicalReaction.java @@ -257,7 +257,7 @@ public void initMoleNumbers(PhaseInterface phase, ComponentInterface[] component for (int i = 0; i < names.length; i++) { for (int j = 0; j < components.length; j++) { // System.out.println("names: " + names[i] + " " + - // system.getPhases()[0].getComponent(j).getName()); + // system.getPhases()[0].getComponentName(j)); if (this.names[i].equals(components[j].getName())) { for (int k = 0; k < Amatrix.length; k++) { tempAmatrix.set(k, i, Amatrix[k][j]); @@ -318,7 +318,7 @@ public void init(PhaseInterface phase) { // System.out.println("K: " + Math.exp(lnK)); for (int i = 0; i < names.length; i++) { for (int j = 0; j < phase.getNumberOfComponents(); j++) { - if (this.names[i].equals(phase.getComponent(j).getName())) { + if (this.names[i].equals(phase.getComponentName(j))) { moles[i] = phase.getComponent(j).getNumberOfMolesInPhase(); } } diff --git a/src/main/java/neqsim/chemicalreactions/chemicalreaction/ChemicalReactionList.java b/src/main/java/neqsim/chemicalreactions/chemicalreaction/ChemicalReactionList.java index 3e9bf3a4c..fbba81250 100644 --- a/src/main/java/neqsim/chemicalreactions/chemicalreaction/ChemicalReactionList.java +++ b/src/main/java/neqsim/chemicalreactions/chemicalreaction/ChemicalReactionList.java @@ -348,10 +348,10 @@ public void calcReacMatrix(PhaseInterface phase) { while (e.hasNext()) { reaction = e.next(); for (int j = 0; j < reaction.getNames().length; j++) { - if (phase.getComponent(i).getName().equals(reaction.getNames()[j])) { + if (phase.getComponentName(i).equals(reaction.getNames()[j])) { for (int k = 0; k < phase.getNumberOfComponents(); k++) { for (int o = 0; o < reaction.getNames().length; o++) { - if (phase.getComponent(k).getName().equals(reaction.getNames()[o])) { + if (phase.getComponentName(k).equals(reaction.getNames()[o])) { // System.out.println("comp1 " + // system.getPhases()[1].getComponent(i).getComponentName() + // " comp2 " diff --git a/src/main/java/neqsim/fluidmechanics/flownode/FlowNode.java b/src/main/java/neqsim/fluidmechanics/flownode/FlowNode.java index 887f1a6c4..ef870d889 100644 --- a/src/main/java/neqsim/fluidmechanics/flownode/FlowNode.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/FlowNode.java @@ -671,7 +671,7 @@ public String[][] createTable(String name) { FieldPosition test = new FieldPosition(0); for (int i = 0; i < bulkSystem.getNumberOfPhases(); i++) { for (int j = 0; j < bulkSystem.getPhases()[0].getNumberOfComponents(); j++) { - table[j + 1][0] = bulkSystem.getPhases()[0].getComponent(j).getName(); + table[j + 1][0] = bulkSystem.getPhases()[0].getComponentName(j); buf = new StringBuffer(); table[j + 1][i + 1] = nf.format(bulkSystem.getPhase(bulkSystem.getPhaseIndex(i)).getComponent(j).getx(), buf, @@ -681,7 +681,7 @@ public String[][] createTable(String name) { for (int j = 0; j < bulkSystem.getPhases()[0].getNumberOfComponents(); j++) { table[j + bulkSystem.getPhases()[0].getNumberOfComponents() + 2][0] = - getInterphaseSystem().getPhases()[0].getComponent(j).getName(); + getInterphaseSystem().getPhases()[0].getComponentName(j); buf = new StringBuffer(); table[j + bulkSystem.getPhases()[0].getNumberOfComponents() + 2][i + 1] = nf.format(getInterphaseSystem().getPhase(getInterphaseSystem().getPhaseIndex(i)) @@ -691,7 +691,7 @@ public String[][] createTable(String name) { for (int j = 0; j < bulkSystem.getPhases()[0].getNumberOfComponents(); j++) { table[j + 2 * bulkSystem.getPhases()[0].getNumberOfComponents() + 3][0] = - bulkSystem.getPhases()[0].getComponent(j).getName(); + bulkSystem.getPhases()[0].getComponentName(j); buf = new StringBuffer(); table[j + 2 * bulkSystem.getPhases()[0].getNumberOfComponents() + 3][i + 1] = nf.format(getFluidBoundary().getInterphaseMolarFlux(j), buf, test).toString(); diff --git a/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/FluidBoundary.java b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/FluidBoundary.java index 372e73840..1a4ae0661 100644 --- a/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/FluidBoundary.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/FluidBoundary.java @@ -441,8 +441,7 @@ public String[][] createTable(String name) { FieldPosition test = new FieldPosition(0); for (int i = 0; i < bulkSystem.getNumberOfPhases(); i++) { for (int j = 0; j < bulkSystem.getPhases()[0].getNumberOfComponents(); j++) { - table[j + 1][0] = - "eff. mass trans coef. " + bulkSystem.getPhases()[0].getComponent(j).getName(); + table[j + 1][0] = "eff. mass trans coef. " + bulkSystem.getPhases()[0].getComponentName(j); buf = new StringBuffer(); table[j + 1][i + 1] = nf.format(getEffectiveMassTransferCoefficient(i, j), buf, test).toString(); @@ -452,7 +451,7 @@ public String[][] createTable(String name) { getEnhancementFactor().calcEnhancementVec(i); for (int j = 0; j < bulkSystem.getPhases()[0].getNumberOfComponents(); j++) { table[j + bulkSystem.getPhases()[0].getNumberOfComponents() + 2][0] = - "enhancement " + getInterphaseSystem().getPhases()[0].getComponent(j).getName(); + "enhancement " + getInterphaseSystem().getPhases()[0].getComponentName(j); buf = new StringBuffer(); table[j + bulkSystem.getPhases()[0].getNumberOfComponents() + 2][i + 1] = nf.format(getEnhancementFactor().getEnhancementVec(j), buf, test).toString(); @@ -462,7 +461,7 @@ public String[][] createTable(String name) { getBulkSystem().getPhase(i).getPhysicalProperties().calcEffectiveDiffusionCoefficients(); for (int j = 0; j < bulkSystem.getPhases()[0].getNumberOfComponents(); j++) { table[j + 2 * bulkSystem.getPhases()[0].getNumberOfComponents() + 3][0] = - "schmidt " + bulkSystem.getPhases()[0].getComponent(j).getName(); + "schmidt " + bulkSystem.getPhases()[0].getComponentName(j); buf = new StringBuffer(); table[j + 2 * bulkSystem.getPhases()[0].getNumberOfComponents() + 3][i + 1] = nf.format( getBulkSystem().getPhase(i).getPhysicalProperties().getEffectiveSchmidtNumber(j), buf, diff --git a/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/nonequilibriumfluidboundary/filmmodelboundary/reactivefilmmodel/enhancementfactor/EnhancementFactorAlg.java b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/nonequilibriumfluidboundary/filmmodelboundary/reactivefilmmodel/enhancementfactor/EnhancementFactorAlg.java index e5deb6ac3..dc267f165 100644 --- a/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/nonequilibriumfluidboundary/filmmodelboundary/reactivefilmmodel/enhancementfactor/EnhancementFactorAlg.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/nonequilibriumfluidboundary/filmmodelboundary/reactivefilmmodel/enhancementfactor/EnhancementFactorAlg.java @@ -30,7 +30,7 @@ public void calcEnhancementVec(int phaseNum) { double hatta = 0.0; for (int j = 0; j < fluidBoundary.getBulkSystem().getPhase(phaseNum) .getNumberOfComponents(); j++) { - if (fluidBoundary.getBulkSystem().getPhase(phaseNum).getComponent(j).getName().equals("CO2") + if (fluidBoundary.getBulkSystem().getPhase(phaseNum).getComponentName(j).equals("CO2") && phaseNum == 1) { enhancementVec[j] = fluidBoundary.getBulkSystem().getChemicalReactionOperations() .solveKinetics(phaseNum, fluidBoundary.getInterphaseSystem().getPhase(phaseNum), j); diff --git a/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/shipsystem/LNGship.java b/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/shipsystem/LNGship.java index 7700e974a..a7bc28efc 100644 --- a/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/shipsystem/LNGship.java +++ b/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/shipsystem/LNGship.java @@ -141,7 +141,7 @@ public void createSystem() { double oldMoles = getThermoSystem().getTotalNumberOfMoles(); for (int i = 0; i < getThermoSystem().getPhase(0).getNumberOfComponents(); i++) { - getThermoSystem().addComponent(getThermoSystem().getPhase(0).getComponent(i).getName(), + getThermoSystem().addComponent(getThermoSystem().getPhase(0).getComponentName(i), (initialNumberOffMoles - oldMoles) * getThermoSystem().getPhase(0).getComponent(i).getz()); } @@ -295,7 +295,7 @@ public void solveTransient(int type, UUID id) { this.standardISO6976.setReferenceType("volume"); for (int i = 0; i < getThermoSystem().getPhase(0).getNumberOfComponents(); i++) { - getThermoSystem().addComponent(getThermoSystem().getPhase(0).getComponent(i).getName(), + getThermoSystem().addComponent(getThermoSystem().getPhase(0).getComponentName(i), -xgas[i] * molarBoilOffRate); } } diff --git a/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/GTSurfaceTensionODE.java b/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/GTSurfaceTensionODE.java index 222cd2336..7fad502ea 100644 --- a/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/GTSurfaceTensionODE.java +++ b/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/GTSurfaceTensionODE.java @@ -111,7 +111,7 @@ public GTSurfaceTensionODE(SystemInterface flashedSystem, int phase1, int phase2 double[] nv = new double[this.ncomp]; for (i = 0; i < ncomp; i++) { nv[i] = this.rho_ph1[i] * Pa; - // this.sys.addComponent(this.sys.getPhase(0).getComponent(i).getName(), + // this.sys.addComponent(this.sys.getPhase(0).getComponentName(i), // this.rho_ph1[i]*Pa); } this.sys.setMolarComposition(nv); diff --git a/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/GTSurfaceTensionSimple.java b/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/GTSurfaceTensionSimple.java index 63540f091..9379d1001 100644 --- a/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/GTSurfaceTensionSimple.java +++ b/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/GTSurfaceTensionSimple.java @@ -103,9 +103,9 @@ public double calcSurfaceTension(int interface1, int interface2) { .getChemicalPotential(system.getPhase(interface1)); den_interface[0][i] = 1e5 * system.getPhase(interface1).getComponent(i).getx() / system.getPhase(interface1).getMolarVolume(); - localSystem.addComponent(localSystem.getPhase(0).getComponent(i).getName(), + localSystem.addComponent(localSystem.getPhase(0).getComponentName(i), -system.getPhase(0).getComponent(i).getNumberOfmoles()); - localSystem.addComponent(localSystem.getPhase(0).getComponent(i).getName(), + localSystem.addComponent(localSystem.getPhase(0).getComponentName(i), system.getPhase(interface1).getComponent(i).getx() / system.getPhase(interface1).getMolarVolume()); } @@ -203,7 +203,7 @@ public double calcSurfaceTension(int interface1, int interface2) { for (int i = 0; i < localSystem.getPhase(0).getNumberOfComponents(); i++) { den_interface[j][i] = den_interface[j - 1][i] + del_den_interface[i]; totalDens += den_interface[j][i]; - localSystem.addComponent(localSystem.getPhase(0).getComponent(i).getName(), + localSystem.addComponent(localSystem.getPhase(0).getComponentName(i), (del_den_interface[i] - del_den_interface_old[i]) / 1.0e5); del_den_interface_old[i] = del_den_interface[i]; } @@ -285,8 +285,8 @@ public double calcSurfaceTension(int interface1, int interface2) { kappai = del_den_interface[i] / del_den_interface[referenceComponentNumber]; mu_times_den[j] += den_interface[j][i] * (mu_inter[j][i] - mu_equi[i]); for (int k = 0; k < localSystem.getPhase(0).getNumberOfComponents(); k++) { - if ((localSystem.getPhase(0).getComponent(i).getName().equals("water") - || localSystem.getPhase(0).getComponent(k).getName().equals("water")) && i != k) { + if ((localSystem.getPhase(0).getComponentName(i).equals("water") + || localSystem.getPhase(0).getComponentName(k).equals("water")) && i != k) { interact = 0.0; } else { interact = 0.0; diff --git a/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/LGTSurfaceTension.java b/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/LGTSurfaceTension.java index 0bda10d93..a62a9eb71 100644 --- a/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/LGTSurfaceTension.java +++ b/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/LGTSurfaceTension.java @@ -85,9 +85,9 @@ public double calcSurfaceTension(int interface1, int interface2) { / system.getPhase(interface1).getMolarVolume()) / (ite_step * 1.0); del_den_interface_old[i] = 0.0; - localSystem.addComponent(localSystem.getPhase(0).getComponent(i).getName(), + localSystem.addComponent(localSystem.getPhase(0).getComponentName(i), -system.getPhase(0).getComponent(i).getNumberOfmoles()); - localSystem.addComponent(localSystem.getPhase(0).getComponent(i).getName(), + localSystem.addComponent(localSystem.getPhase(0).getComponentName(i), system.getPhase(interface1).getComponent(i).getx() / system.getPhase(interface1).getMolarVolume()); } @@ -117,7 +117,7 @@ public double calcSurfaceTension(int interface1, int interface2) { for (int i = 0; i < localSystem.getPhase(0).getNumberOfComponents(); i++) { den_interface[j][i] = den_interface[j - 1][i] + del_den_interface[i]; - localSystem.addComponent(localSystem.getPhase(0).getComponent(i).getName(), + localSystem.addComponent(localSystem.getPhase(0).getComponentName(i), (del_den_interface[i] - del_den_interface_old[i]) / 1.0e5); del_den_interface_old[i] = del_den_interface[i]; } @@ -154,10 +154,10 @@ public double calcSurfaceTension(int interface1, int interface2) { mu_times_den[j] += den_interface[j][i] * (mu_inter[j][i] - mu_equi[i]); for (int k = 0; k < localSystem.getPhase(0).getNumberOfComponents(); k++) { - if ((localSystem.getPhase(0).getComponent(i).getName().equals("water") - || localSystem.getPhase(0).getComponent(k).getName().equals("water")) && i != k) { - if ((localSystem.getPhase(0).getComponent(i).getName().equals("MEG") - || localSystem.getPhase(0).getComponent(k).getName().equals("MEG")) && i != k) { + if ((localSystem.getPhase(0).getComponentName(i).equals("water") + || localSystem.getPhase(0).getComponentName(k).equals("water")) && i != k) { + if ((localSystem.getPhase(0).getComponentName(i).equals("MEG") + || localSystem.getPhase(0).getComponentName(k).equals("MEG")) && i != k) { interact = 0.2; } else { interact = 0.35; diff --git a/src/main/java/neqsim/process/equipment/absorber/SimpleTEGAbsorber.java b/src/main/java/neqsim/process/equipment/absorber/SimpleTEGAbsorber.java index 463ab23dd..0c857fd5c 100644 --- a/src/main/java/neqsim/process/equipment/absorber/SimpleTEGAbsorber.java +++ b/src/main/java/neqsim/process/equipment/absorber/SimpleTEGAbsorber.java @@ -131,8 +131,7 @@ public void mixStream() { for (int i = 0; i < streams.get(k).getThermoSystem().getPhases()[0] .getNumberOfComponents(); i++) { boolean gotComponent = false; - String componentName = - streams.get(k).getThermoSystem().getPhases()[0].getComponent(i).getName(); + String componentName = streams.get(k).getThermoSystem().getPhases()[0].getComponentName(i); // System.out.println("adding: " + componentName); double moles = @@ -141,7 +140,7 @@ public void mixStream() { // mixedStream.getThermoSystem().getPhases()[0].getNumberOfComponents()); for (int p = 0; p < mixedStream.getThermoSystem().getPhases()[0] .getNumberOfComponents(); p++) { - if (mixedStream.getThermoSystem().getPhases()[0].getComponent(p).getName() + if (mixedStream.getThermoSystem().getPhases()[0].getComponentName(p) .equals(componentName)) { gotComponent = true; compName = @@ -450,7 +449,7 @@ public void displayResult() { for (int i = 0; i < thermoSystem.getNumberOfPhases(); i++) { for (int j = 0; j < thermoSystem.getPhases()[0].getNumberOfComponents(); j++) { - table[j + 1][0] = thermoSystem.getPhases()[0].getComponent(j).getName(); + table[j + 1][0] = thermoSystem.getPhases()[0].getComponentName(j); buf = new StringBuffer(); table[j + 1][i + 1] = nf.format(thermoSystem.getPhases()[i].getComponent(j).getx(), buf, test).toString(); diff --git a/src/main/java/neqsim/process/equipment/absorber/WaterStripperColumn.java b/src/main/java/neqsim/process/equipment/absorber/WaterStripperColumn.java index 507b653b9..ca1fbb633 100644 --- a/src/main/java/neqsim/process/equipment/absorber/WaterStripperColumn.java +++ b/src/main/java/neqsim/process/equipment/absorber/WaterStripperColumn.java @@ -130,8 +130,7 @@ public void mixStream() { for (int i = 0; i < streams.get(k).getThermoSystem().getPhases()[0] .getNumberOfComponents(); i++) { boolean gotComponent = false; - String componentName = - streams.get(k).getThermoSystem().getPhases()[0].getComponent(i).getName(); + String componentName = streams.get(k).getThermoSystem().getPhases()[0].getComponentName(i); // System.out.println("adding: " + componentName); double moles = @@ -140,7 +139,7 @@ public void mixStream() { // mixedStream.getThermoSystem().getPhases()[0].getNumberOfComponents()); for (int p = 0; p < mixedStream.getThermoSystem().getPhases()[0] .getNumberOfComponents(); p++) { - if (mixedStream.getThermoSystem().getPhases()[0].getComponent(p).getName() + if (mixedStream.getThermoSystem().getPhases()[0].getComponentName(p) .equals(componentName)) { gotComponent = true; @@ -402,7 +401,7 @@ public void displayResult() { for (int i = 0; i < thermoSystem.getNumberOfPhases(); i++) { for (int j = 0; j < thermoSystem.getPhases()[0].getNumberOfComponents(); j++) { - table[j + 1][0] = thermoSystem.getPhases()[0].getComponent(j).getName(); + table[j + 1][0] = thermoSystem.getPhases()[0].getComponentName(j); buf = new StringBuffer(); table[j + 1][i + 1] = nf.format(thermoSystem.getPhases()[i].getComponent(j).getx(), buf, test).toString(); diff --git a/src/main/java/neqsim/process/equipment/compressor/Compressor.java b/src/main/java/neqsim/process/equipment/compressor/Compressor.java index fa7936b40..7a7663446 100644 --- a/src/main/java/neqsim/process/equipment/compressor/Compressor.java +++ b/src/main/java/neqsim/process/equipment/compressor/Compressor.java @@ -894,7 +894,7 @@ public void displayResult() { for (int i = 0; i < getThermoSystem().getNumberOfPhases(); i++) { for (int j = 0; j < getThermoSystem().getPhases()[0].getNumberOfComponents(); j++) { - table[j + 1][0] = getThermoSystem().getPhases()[0].getComponent(j).getName(); + table[j + 1][0] = getThermoSystem().getPhases()[0].getComponentName(j); buf = new StringBuffer(); table[j + 1][i + 1] = nf .format(getThermoSystem().getPhases()[i].getComponent(j).getx(), buf, test).toString(); diff --git a/src/main/java/neqsim/process/equipment/expander/ExpanderOld.java b/src/main/java/neqsim/process/equipment/expander/ExpanderOld.java index b72c7331c..1fb408ae5 100644 --- a/src/main/java/neqsim/process/equipment/expander/ExpanderOld.java +++ b/src/main/java/neqsim/process/equipment/expander/ExpanderOld.java @@ -117,7 +117,7 @@ public void displayResult() { for (int i = 0; i < thermoSystem.getNumberOfPhases(); i++) { for (int j = 0; j < thermoSystem.getPhases()[0].getNumberOfComponents(); j++) { - table[j + 1][0] = thermoSystem.getPhases()[0].getComponent(j).getName(); + table[j + 1][0] = thermoSystem.getPhases()[0].getComponentName(j); buf = new StringBuffer(); table[j + 1][i + 1] = nf.format(thermoSystem.getPhases()[i].getComponent(j).getx(), buf, test).toString(); diff --git a/src/main/java/neqsim/process/equipment/mixer/Mixer.java b/src/main/java/neqsim/process/equipment/mixer/Mixer.java index 065f1fd7c..2e95c7752 100644 --- a/src/main/java/neqsim/process/equipment/mixer/Mixer.java +++ b/src/main/java/neqsim/process/equipment/mixer/Mixer.java @@ -123,8 +123,7 @@ public void mixStream() { for (int i = 0; i < streams.get(k).getThermoSystem().getPhase(0) .getNumberOfComponents(); i++) { boolean gotComponent = false; - String componentName = - streams.get(k).getThermoSystem().getPhase(0).getComponent(i).getName(); + String componentName = streams.get(k).getThermoSystem().getPhase(0).getComponentName(i); // System.out.println("adding: " + componentName); double moles = @@ -133,8 +132,7 @@ public void mixStream() { // mixedStream.getThermoSystem().getPhase(0).getNumberOfComponents()); for (int p = 0; p < mixedStream.getThermoSystem().getPhase(0) .getNumberOfComponents(); p++) { - if (mixedStream.getThermoSystem().getPhase(0).getComponent(p).getName() - .equals(componentName)) { + if (mixedStream.getThermoSystem().getPhase(0).getComponentName(p).equals(componentName)) { gotComponent = true; index = streams.get(0).getThermoSystem().getPhase(0).getComponent(p).getComponentNumber(); @@ -285,7 +283,7 @@ public void displayResult() { for (int i = 0; i < thermoSystem.getNumberOfPhases(); i++) { for (int j = 0; j < thermoSystem.getPhases()[0].getNumberOfComponents(); j++) { - table[j + 1][0] = thermoSystem.getPhases()[0].getComponent(j).getName(); + table[j + 1][0] = thermoSystem.getPhases()[0].getComponentName(j); buf = new StringBuffer(); table[j + 1][i + 1] = nf.format(thermoSystem.getPhases()[i].getComponent(j).getx(), buf, test).toString(); diff --git a/src/main/java/neqsim/process/equipment/mixer/StaticMixer.java b/src/main/java/neqsim/process/equipment/mixer/StaticMixer.java index 6080d87b5..d15d34e4f 100644 --- a/src/main/java/neqsim/process/equipment/mixer/StaticMixer.java +++ b/src/main/java/neqsim/process/equipment/mixer/StaticMixer.java @@ -41,8 +41,7 @@ public void mixStream() { for (int i = 0; i < streams.get(k).getThermoSystem().getPhases()[0] .getNumberOfComponents(); i++) { boolean gotComponent = false; - String componentName = - streams.get(k).getThermoSystem().getPhases()[0].getComponent(i).getName(); + String componentName = streams.get(k).getThermoSystem().getPhases()[0].getComponentName(i); // System.out.println("adding: " + componentName); double moles = streams.get(k).getThermoSystem().getPhases()[0].getComponent(i).getNumberOfmoles(); @@ -50,7 +49,7 @@ public void mixStream() { // mixedStream.getThermoSystem().getPhases()[0].getNumberOfComponents()); for (int p = 0; p < mixedStream.getThermoSystem().getPhases()[0] .getNumberOfComponents(); p++) { - if (mixedStream.getThermoSystem().getPhases()[0].getComponent(p).getName() + if (mixedStream.getThermoSystem().getPhases()[0].getComponentName(p) .equals(componentName)) { gotComponent = true; index = streams.get(0).getThermoSystem().getPhases()[0].getComponent(p) diff --git a/src/main/java/neqsim/process/equipment/mixer/StaticNeqMixer.java b/src/main/java/neqsim/process/equipment/mixer/StaticNeqMixer.java index c995828fa..4f6625e1d 100644 --- a/src/main/java/neqsim/process/equipment/mixer/StaticNeqMixer.java +++ b/src/main/java/neqsim/process/equipment/mixer/StaticNeqMixer.java @@ -43,8 +43,7 @@ public void mixStream() { for (int i = 0; i < streams.get(k).getThermoSystem().getPhases()[0] .getNumberOfComponents(); i++) { boolean gotComponent = false; - String componentName = - streams.get(k).getThermoSystem().getPhases()[0].getComponent(i).getName(); + String componentName = streams.get(k).getThermoSystem().getPhases()[0].getComponentName(i); System.out.println("adding: " + componentName); int numberOfPhases = streams.get(k).getThermoSystem().getNumberOfPhases(); double[] moles = new double[numberOfPhases]; @@ -56,7 +55,7 @@ public void mixStream() { } for (int p = 0; p < mixedStream.getThermoSystem().getPhases()[0] .getNumberOfComponents(); p++) { - if (mixedStream.getThermoSystem().getPhases()[0].getComponent(p).getName() + if (mixedStream.getThermoSystem().getPhases()[0].getComponentName(p) .equals(componentName)) { gotComponent = true; index = streams.get(0).getThermoSystem().getPhases()[0].getComponent(p) diff --git a/src/main/java/neqsim/process/equipment/mixer/StaticPhaseMixer.java b/src/main/java/neqsim/process/equipment/mixer/StaticPhaseMixer.java index 3d86ee8fb..48f6aa5e4 100644 --- a/src/main/java/neqsim/process/equipment/mixer/StaticPhaseMixer.java +++ b/src/main/java/neqsim/process/equipment/mixer/StaticPhaseMixer.java @@ -36,8 +36,7 @@ public void mixStream() { for (int i = 0; i < streams.get(k).getThermoSystem().getPhases()[0] .getNumberOfComponents(); i++) { boolean gotComponent = false; - String componentName = - streams.get(k).getThermoSystem().getPhases()[0].getComponent(i).getName(); + String componentName = streams.get(k).getThermoSystem().getPhases()[0].getComponentName(i); System.out.println("adding: " + componentName); int numberOfPhases = streams.get(k).getThermoSystem().getNumberOfPhases(); double[] moles = new double[numberOfPhases]; @@ -58,7 +57,7 @@ public void mixStream() { for (int p = 0; p < mixedStream.getThermoSystem().getPhases()[0] .getNumberOfComponents(); p++) { - if (mixedStream.getThermoSystem().getPhases()[0].getComponent(p).getName() + if (mixedStream.getThermoSystem().getPhases()[0].getComponentName(p) .equals(componentName)) { gotComponent = true; index = streams.get(0).getThermoSystem().getPhases()[0].getComponent(p) diff --git a/src/main/java/neqsim/process/equipment/pump/Pump.java b/src/main/java/neqsim/process/equipment/pump/Pump.java index 67665988c..1284537a5 100644 --- a/src/main/java/neqsim/process/equipment/pump/Pump.java +++ b/src/main/java/neqsim/process/equipment/pump/Pump.java @@ -214,7 +214,7 @@ public void displayResult() { for (int i = 0; i < thermoSystem.getNumberOfPhases(); i++) { for (int j = 0; j < thermoSystem.getPhases()[0].getNumberOfComponents(); j++) { - table[j + 1][0] = thermoSystem.getPhases()[0].getComponent(j).getName(); + table[j + 1][0] = thermoSystem.getPhases()[0].getComponentName(j); buf = new StringBuffer(); table[j + 1][i + 1] = nf.format(thermoSystem.getPhases()[i].getComponent(j).getx(), buf, test).toString(); diff --git a/src/main/java/neqsim/process/equipment/util/Recycle.java b/src/main/java/neqsim/process/equipment/util/Recycle.java index 2b9847f4c..c8bdc7767 100644 --- a/src/main/java/neqsim/process/equipment/util/Recycle.java +++ b/src/main/java/neqsim/process/equipment/util/Recycle.java @@ -205,8 +205,7 @@ public void mixStream() { for (int i = 0; i < streams.get(k).getThermoSystem().getPhase(0) .getNumberOfComponents(); i++) { boolean gotComponent = false; - String componentName = - streams.get(k).getThermoSystem().getPhase(0).getComponent(i).getName(); + String componentName = streams.get(k).getThermoSystem().getPhase(0).getComponentName(i); // logger.info("adding: " + componentName); // int numberOfPhases = streams.get(k).getThermoSystem().getNumberOfPhases(); @@ -216,8 +215,7 @@ public void mixStream() { // mixedStream.getThermoSystem().getPhase(0).getNumberOfComponents()); for (int p = 0; p < mixedStream.getThermoSystem().getPhase(0) .getNumberOfComponents(); p++) { - if (mixedStream.getThermoSystem().getPhase(0).getComponent(p).getName() - .equals(componentName)) { + if (mixedStream.getThermoSystem().getPhase(0).getComponentName(p).equals(componentName)) { gotComponent = true; index = streams.get(0).getThermoSystem().getPhase(0).getComponent(p).getComponentNumber(); diff --git a/src/main/java/neqsim/standards/Standard.java b/src/main/java/neqsim/standards/Standard.java index e6b717dc7..d809b84f6 100644 --- a/src/main/java/neqsim/standards/Standard.java +++ b/src/main/java/neqsim/standards/Standard.java @@ -142,7 +142,7 @@ public String[][] createTable(String name) { FieldPosition test = new FieldPosition(0); for (int i = 0; i < thermoSystem.getNumberOfPhases(); i++) { for (int j = 0; j < thermoSystem.getPhases()[0].getNumberOfComponents(); j++) { - table[j + 1][0] = thermoSystem.getPhases()[0].getComponent(j).getName(); + table[j + 1][0] = thermoSystem.getPhases()[0].getComponentName(j); buf = new StringBuffer(); table[j + 1][i + 1] = nf.format(thermoSystem.getPhase(thermoSystem.getPhaseIndex(i)).getComponent(j).getx(), diff --git a/src/main/java/neqsim/standards/gasquality/BestPracticeHydrocarbonDewPoint.java b/src/main/java/neqsim/standards/gasquality/BestPracticeHydrocarbonDewPoint.java index 472ee3ed7..d7ba818d7 100644 --- a/src/main/java/neqsim/standards/gasquality/BestPracticeHydrocarbonDewPoint.java +++ b/src/main/java/neqsim/standards/gasquality/BestPracticeHydrocarbonDewPoint.java @@ -42,8 +42,8 @@ public BestPracticeHydrocarbonDewPoint(SystemInterface thermoSystem) { // System.out.println("setting model GERG water..."); this.thermoSystem = new SystemSrkEos(initTemperature, specPressure); for (int i = 0; i < thermoSystem.getPhase(0).getNumberOfComponents(); i++) { - if (!thermoSystem.getPhase(0).getComponent(i).getName().equals("water")) { - this.thermoSystem.addComponent(thermoSystem.getPhase(0).getComponent(i).getName(), + if (!thermoSystem.getPhase(0).getComponentName(i).equals("water")) { + this.thermoSystem.addComponent(thermoSystem.getPhase(0).getComponentName(i), thermoSystem.getPhase(0).getComponent(i).getNumberOfmoles()); } } diff --git a/src/main/java/neqsim/standards/gasquality/Draft_GERG2004.java b/src/main/java/neqsim/standards/gasquality/Draft_GERG2004.java index 86301410c..cce18cf7a 100644 --- a/src/main/java/neqsim/standards/gasquality/Draft_GERG2004.java +++ b/src/main/java/neqsim/standards/gasquality/Draft_GERG2004.java @@ -42,7 +42,7 @@ public Draft_GERG2004(SystemInterface thermoSystemMet) { this.thermoSystem = new SystemGERG2004Eos(thermoSystemMet.getTemperature(), thermoSystemMet.getPressure()); for (int i = 0; i < thermoSystemMet.getPhase(0).getNumberOfComponents(); i++) { - this.thermoSystem.addComponent(thermoSystemMet.getPhase(0).getComponent(i).getName(), + this.thermoSystem.addComponent(thermoSystemMet.getPhase(0).getComponentName(i), thermoSystemMet.getPhase(0).getComponent(i).getNumberOfmoles()); } } @@ -139,7 +139,7 @@ public String[][] createTable(String name) { FieldPosition test = new FieldPosition(0); for (int i = 0; i < thermoSystem.getNumberOfPhases(); i++) { for (int j = 0; j < thermoSystem.getPhases()[0].getNumberOfComponents(); j++) { - table[j + 1][0] = thermoSystem.getPhases()[0].getComponent(j).getName(); + table[j + 1][0] = thermoSystem.getPhases()[0].getComponentName(j); buf = new StringBuffer(); table[j + 1][i + 1] = nf.format(thermoSystem.getPhase(thermoSystem.getPhaseIndex(i)).getComponent(j).getx(), diff --git a/src/main/java/neqsim/standards/gasquality/Draft_ISO18453.java b/src/main/java/neqsim/standards/gasquality/Draft_ISO18453.java index 4411e1ff1..3eb7cdf7e 100644 --- a/src/main/java/neqsim/standards/gasquality/Draft_ISO18453.java +++ b/src/main/java/neqsim/standards/gasquality/Draft_ISO18453.java @@ -43,7 +43,7 @@ public Draft_ISO18453(SystemInterface thermoSystem) { // System.out.println("setting model GERG water..."); this.thermoSystem = new SystemGERGwaterEos(initTemperature, getReferencePressure()); for (int i = 0; i < thermoSystem.getPhase(0).getNumberOfComponents(); i++) { - this.thermoSystem.addComponent(thermoSystem.getPhase(0).getComponent(i).getName(), + this.thermoSystem.addComponent(thermoSystem.getPhase(0).getComponentName(i), thermoSystem.getPhase(0).getComponent(i).getNumberOfmoles()); } } diff --git a/src/main/java/neqsim/standards/gasquality/Standard_ISO6578.java b/src/main/java/neqsim/standards/gasquality/Standard_ISO6578.java index b338963aa..dcd0d58ef 100644 --- a/src/main/java/neqsim/standards/gasquality/Standard_ISO6578.java +++ b/src/main/java/neqsim/standards/gasquality/Standard_ISO6578.java @@ -148,48 +148,48 @@ public void calculate() { PolynomialSplineFunction function = null; for (int i = 0; i < thermoSystem.getPhase(0).getNumberOfComponents(); i++) { // double a, b, c; - if (thermoSystem.getPhase(0).getComponent(i).getName().equals("methane")) { + if (thermoSystem.getPhase(0).getComponentName(i).equals("methane")) { // a = 8.452e-7; // b = -5.744e-5; // c = 3.383e-2; function = liearInterpol.interpolate(Vitemperatures, Vimethane); - } else if (thermoSystem.getPhase(0).getComponent(i).getName().equals("ethane")) { + } else if (thermoSystem.getPhase(0).getComponentName(i).equals("ethane")) { // a = 1.905e-7; // b = 4.133e-5; // c = 4.083e-2; function = liearInterpol.interpolate(Vitemperatures, Viethane); - } else if (thermoSystem.getPhase(0).getComponent(i).getName().equals("propane")) { + } else if (thermoSystem.getPhase(0).getComponentName(i).equals("propane")) { // a = 1.310e-7; // b = 6.102e-5; // c = 5.391e-2; function = liearInterpol.interpolate(Vitemperatures, Vipropane); - } else if (thermoSystem.getPhase(0).getComponent(i).getName().equals("i-butane")) { + } else if (thermoSystem.getPhase(0).getComponentName(i).equals("i-butane")) { // a = 1.25e-7; // b = 7.257e-5; // c = 6.854e-2; function = liearInterpol.interpolate(Vitemperatures, ViiC4); - } else if (thermoSystem.getPhase(0).getComponent(i).getName().equals("n-butane")) { + } else if (thermoSystem.getPhase(0).getComponentName(i).equals("n-butane")) { // a = 1.101e-7; // b = 7.114e-5; // c = 6.742e-2; function = liearInterpol.interpolate(Vitemperatures, VinC4); - } else if (thermoSystem.getPhase(0).getComponent(i).getName().equals("i-pentane") - || thermoSystem.getPhase(0).getComponent(i).getName().equals("iC5")) { + } else if (thermoSystem.getPhase(0).getComponentName(i).equals("i-pentane") + || thermoSystem.getPhase(0).getComponentName(i).equals("iC5")) { // a = 9.524e-8; // b = 8.727e-5; // c = 8.063e-2; function = liearInterpol.interpolate(Vitemperatures, ViiC5); - } else if (thermoSystem.getPhase(0).getComponent(i).getName().equals("n-pentane")) { + } else if (thermoSystem.getPhase(0).getComponentName(i).equals("n-pentane")) { // a = 5.060e-8; // b = 9.386e-5; // c = 8.031e-2; function = liearInterpol.interpolate(Vitemperatures, VinC5); - } else if (thermoSystem.getPhase(0).getComponent(i).getName().equals("n-hexane")) { + } else if (thermoSystem.getPhase(0).getComponentName(i).equals("n-hexane")) { // a = 5.060e-8; // b = 9.386e-5; // c = 8.031e-2; function = liearInterpol.interpolate(Vitemperatures, VinC6); - } else if (thermoSystem.getPhase(0).getComponent(i).getName().equals("nitrogen")) { + } else if (thermoSystem.getPhase(0).getComponentName(i).equals("nitrogen")) { // a = 1.968e-5; // b = -3.753e-3; // c = 2.198e-1; diff --git a/src/main/java/neqsim/standards/gasquality/Standard_ISO6976.java b/src/main/java/neqsim/standards/gasquality/Standard_ISO6976.java index 8b2bb4046..131cd2e1c 100644 --- a/src/main/java/neqsim/standards/gasquality/Standard_ISO6976.java +++ b/src/main/java/neqsim/standards/gasquality/Standard_ISO6976.java @@ -127,7 +127,7 @@ public Standard_ISO6976(String name, String description, SystemInterface thermoS for (int i = 0; i < thermoSystem.getPhase(0).getNumberOfComponents(); i++) { try { dataSet = database.getResultSet(("SELECT * FROM ISO6976constants WHERE ComponentName='" - + this.thermoSystem.getPhase(0).getComponent(i).getName() + "'")); + + this.thermoSystem.getPhase(0).getComponentName(i) + "'")); dataSet.next(); dataSet.getString("ID"); } catch (Exception ex) { @@ -453,7 +453,7 @@ public String[][] createTable(String name) { } for (int i = 0; i < thermoSystem.getNumberOfPhases(); i++) { for (int j = 0; j < thermoSystem.getPhases()[0].getNumberOfComponents(); j++) { - table[j + 1][0] = thermoSystem.getPhases()[0].getComponent(j).getName(); + table[j + 1][0] = thermoSystem.getPhases()[0].getComponentName(j); buf = new StringBuffer(); table[j + 1][i + 1] = nf.format(thermoSystem.getPhase(thermoSystem.getPhaseIndex(i)).getComponent(j).getx(), @@ -642,10 +642,10 @@ public double getTotalMolesOfInerts() { public void removeInertsButNitrogen() { for (int j = 0; j < thermoSystem.getPhases()[0].getNumberOfComponents(); j++) { if (carbonNumber[j] == 0 - && !thermoSystem.getPhase(0).getComponent(j).getName().equals("nitrogen")) { + && !thermoSystem.getPhase(0).getComponentName(j).equals("nitrogen")) { thermoSystem.addComponent("nitrogen", thermoSystem.getPhase(0).getComponent(j).getNumberOfmoles()); - thermoSystem.addComponent(thermoSystem.getPhase(0).getComponent(j).getName(), + thermoSystem.addComponent(thermoSystem.getPhase(0).getComponentName(j), -thermoSystem.getPhase(0).getComponent(j).getNumberOfmoles() * 0.99999); } } diff --git a/src/main/java/neqsim/standards/gasquality/Standard_ISO6976_2016.java b/src/main/java/neqsim/standards/gasquality/Standard_ISO6976_2016.java index 67a2b1572..4a4dfb2fc 100644 --- a/src/main/java/neqsim/standards/gasquality/Standard_ISO6976_2016.java +++ b/src/main/java/neqsim/standards/gasquality/Standard_ISO6976_2016.java @@ -108,7 +108,7 @@ public Standard_ISO6976_2016(SystemInterface thermoSystem) { try { dataSet = database.getResultSet(("SELECT * FROM iso6976constants2016 WHERE ComponentName='" - + this.thermoSystem.getPhase(0).getComponent(i).getName() + "'")); + + this.thermoSystem.getPhase(0).getComponentName(i) + "'")); dataSet.next(); M[i] = Double.parseDouble(dataSet.getString("MolarMass")); } catch (Exception ex) { diff --git a/src/main/java/neqsim/thermo/characterization/PlusCharacterize.java b/src/main/java/neqsim/thermo/characterization/PlusCharacterize.java index c26bf21d8..e651cbf84 100644 --- a/src/main/java/neqsim/thermo/characterization/PlusCharacterize.java +++ b/src/main/java/neqsim/thermo/characterization/PlusCharacterize.java @@ -274,7 +274,7 @@ public void addCharacterizedPlusFraction() { for (int i = 0; i < system.getPhase(0).getNumberOfComponents(); i++) { if (system.getPhase(0).getComponent(i).isIsPlusFraction()) { - system.removeComponent(system.getPhase(0).getComponent(i).getName()); + system.removeComponent(system.getPhase(0).getComponentName(i)); break; } } @@ -435,7 +435,7 @@ public void removeTBPfraction() { for (int i = 0; i < system.getPhase(0).getNumberOfComponents(); i++) { double boilpoint = system.getPhase(0).getComponent(i).getNormalBoilingPoint(); if (boilpoint >= 273.15 + 69.0) { - list.add(system.getPhase(0).getComponent(i).getName()); + list.add(system.getPhase(0).getComponentName(i)); } } diff --git a/src/main/java/neqsim/thermo/characterization/WaxCharacterise.java b/src/main/java/neqsim/thermo/characterization/WaxCharacterise.java index acf55c266..6d629b9a4 100644 --- a/src/main/java/neqsim/thermo/characterization/WaxCharacterise.java +++ b/src/main/java/neqsim/thermo/characterization/WaxCharacterise.java @@ -177,17 +177,17 @@ public void addTBPWax() { int numberOfCOmponents = thermoSystem.getPhase(0).getNumberOfComponents(); boolean hasWax = false; for (int i = 0; i < numberOfCOmponents; i++) { - if (thermoSystem.getPhase(0).getComponent(i).getName().startsWith("wax")) { + if (thermoSystem.getPhase(0).getComponentName(i).startsWith("wax")) { hasWax = true; } } for (int i = 0; i < numberOfCOmponents; i++) { - if (hasWax && thermoSystem.getPhase(0).getComponent(i).getName().startsWith("wax")) { + if (hasWax && thermoSystem.getPhase(0).getComponentName(i).startsWith("wax")) { double A = parameterWax[0]; double B = parameterWax[1]; double C = parameterWax[2]; - String compName = thermoSystem.getPhase(0).getComponent(i).getName().substring(3); + String compName = thermoSystem.getPhase(0).getComponentName(i).substring(3); double densityLocal = calcParaffinDensity(i); @@ -203,8 +203,7 @@ public void addTBPWax() { } thermoSystem.addComponent(compName, -molesChange); - thermoSystem.addComponent(thermoSystem.getPhase(0).getComponent(i).getName(), - molesChange); + thermoSystem.addComponent(thermoSystem.getPhase(0).getComponentName(i), molesChange); for (int k = 0; k < thermoSystem.getNumberOfPhases(); k++) { thermoSystem.getPhase(k).getComponent(i).setWaxFormer(true); thermoSystem.getPhase(k).getComponent(i).setHeatOfFusion(calcHeatOfFusion(i)); @@ -251,8 +250,8 @@ public void addTBPWax() { @Override public void removeWax() { for (int i = 0; i < thermoSystem.getPhase(0).getNumberOfComponents(); i++) { - if (thermoSystem.getPhase(0).getComponent(i).getName().startsWith("wax")) { - String compName = thermoSystem.getPhase(0).getComponent(i).getName().substring(3); + if (thermoSystem.getPhase(0).getComponentName(i).startsWith("wax")) { + String compName = thermoSystem.getPhase(0).getComponentName(i).substring(3); double moles = thermoSystem.getPhase(0).getComponent(i).getNumberOfmoles(); thermoSystem.addComponent(thermoSystem.getPhase(0).getComponent(i).getComponentName(), -moles); diff --git a/src/main/java/neqsim/thermo/mixingrule/MixingRule.java b/src/main/java/neqsim/thermo/mixingrule/MixingRule.java new file mode 100644 index 000000000..191e330a2 --- /dev/null +++ b/src/main/java/neqsim/thermo/mixingrule/MixingRule.java @@ -0,0 +1,11 @@ +package neqsim.thermo.mixingrule; + +public enum MixingRule { + /* + * if (typename.equals("no")) { var = 1; } else if (typename.equals("classic")) { var = 2; } else + * if (typename.equals("HV")) { var = 4; } else if (typename.equals("WS")) { var = 5; } else if + * (typename.equals("CPA-Mix")) { var = 7; } else if (typename.equals("classic-T")) { var = 8; } + * else if (typename.equals("classic-T-cpa")) { var = 9; } else if + * (typename.equals("classic-Tx-cpa")) { var = 10; + */ +} diff --git a/src/main/java/neqsim/thermo/phase/Phase.java b/src/main/java/neqsim/thermo/phase/Phase.java index 44b69fbbd..cd75ba17d 100644 --- a/src/main/java/neqsim/thermo/phase/Phase.java +++ b/src/main/java/neqsim/thermo/phase/Phase.java @@ -1393,7 +1393,7 @@ public double getPureComponentFugacity(int p, boolean pure) { @Override public double getLogInfiniteDiluteFugacity(int k, int p) { if (refPhase == null) { - initRefPhases(false, getComponent(p).getName()); + initRefPhases(false, getComponentName(p)); } refPhase[k].setTemperature(temperature); refPhase[k].setPressure(pressure); diff --git a/src/main/java/neqsim/thermo/phase/PhaseEos.java b/src/main/java/neqsim/thermo/phase/PhaseEos.java index 10a8943f5..df7b70207 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseEos.java +++ b/src/main/java/neqsim/thermo/phase/PhaseEos.java @@ -135,7 +135,7 @@ public void init(double totalNumberOfMoles, int numberOfComponents, int initType for (int i = 0; i < numberOfComponents; i++) { if ((getComponent(i).isHydrocarbon() || getComponent(i).isInert() || getComponent(i).isIsTBPfraction()) && !getComponent(i).getName().equals("water") - && !getComponent(i).getName().equals("water_PC")) { + && !getComponentName(i).equals("water_PC")) { sumHydrocarbons += getComponent(i).getx(); } else { sumAqueous += getComponent(i).getx(); diff --git a/src/main/java/neqsim/thermo/phase/PhaseGE.java b/src/main/java/neqsim/thermo/phase/PhaseGE.java index ed716fa9b..875d2819b 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseGE.java +++ b/src/main/java/neqsim/thermo/phase/PhaseGE.java @@ -182,7 +182,7 @@ public double getActivityCoefficient(int k) { */ public double getActivityCoefficientInfDilWater(int k, int p) { if (refPhase == null) { - initRefPhases(false, getComponent(p).getName()); + initRefPhases(false, getComponentName(p)); } refPhase[k].setTemperature(temperature); refPhase[k].setPressure(pressure); diff --git a/src/main/java/neqsim/thermo/phase/PhaseGENRTL.java b/src/main/java/neqsim/thermo/phase/PhaseGENRTL.java index 9f7954219..560477fcc 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseGENRTL.java +++ b/src/main/java/neqsim/thermo/phase/PhaseGENRTL.java @@ -58,7 +58,7 @@ public PhaseGENRTL(PhaseInterface phase, double[][] alpha, double[][] Dij, Strin this.intparam = intparam; for (int i = 0; i < alpha[0].length; i++) { numberOfComponents++; - componentArray[i] = new ComponentGeNRTL(phase.getComponent(i).getName(), + componentArray[i] = new ComponentGeNRTL(phase.getComponentName(i), phase.getComponent(i).getNumberOfmoles(), phase.getComponent(i).getNumberOfMolesInPhase(), phase.getComponent(i).getComponentNumber()); } diff --git a/src/main/java/neqsim/thermo/phase/PhaseGENRTLmodifiedHV.java b/src/main/java/neqsim/thermo/phase/PhaseGENRTLmodifiedHV.java index 999853fe3..1a179b06d 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseGENRTLmodifiedHV.java +++ b/src/main/java/neqsim/thermo/phase/PhaseGENRTLmodifiedHV.java @@ -51,7 +51,7 @@ public PhaseGENRTLmodifiedHV(PhaseInterface phase, double[][] alpha, double[][] componentArray = new ComponentGENRTLmodifiedHV[alpha[0].length]; type = 0; for (int i = 0; i < alpha[0].length; i++) { - componentArray[i] = new ComponentGENRTLmodifiedHV(phase.getComponent(i).getName(), + componentArray[i] = new ComponentGENRTLmodifiedHV(phase.getComponentName(i), phase.getComponent(i).getNumberOfmoles(), phase.getComponent(i).getNumberOfMolesInPhase(), phase.getComponent(i).getComponentNumber()); } @@ -76,7 +76,7 @@ public PhaseGENRTLmodifiedHV(PhaseInterface phase, double[][] alpha, double[][] type = 1; this.DijT = DijT; for (int i = 0; i < alpha[0].length; i++) { - componentArray[i] = new ComponentGENRTLmodifiedHV(phase.getComponent(i).getName(), + componentArray[i] = new ComponentGENRTLmodifiedHV(phase.getComponentName(i), phase.getComponent(i).getNumberOfmoles(), phase.getComponent(i).getNumberOfMolesInPhase(), phase.getComponent(i).getComponentNumber()); } diff --git a/src/main/java/neqsim/thermo/phase/PhaseGENRTLmodifiedWS.java b/src/main/java/neqsim/thermo/phase/PhaseGENRTLmodifiedWS.java index 329c781d6..218131c94 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseGENRTLmodifiedWS.java +++ b/src/main/java/neqsim/thermo/phase/PhaseGENRTLmodifiedWS.java @@ -40,7 +40,7 @@ public PhaseGENRTLmodifiedWS(PhaseInterface phase, double[][] alpha, double[][] componentArray = new ComponentGENRTLmodifiedWS[alpha[0].length]; for (int i = 0; i < alpha[0].length; i++) { numberOfComponents++; - componentArray[i] = new ComponentGENRTLmodifiedWS(phase.getComponent(i).getName(), + componentArray[i] = new ComponentGENRTLmodifiedWS(phase.getComponentName(i), phase.getComponent(i).getNumberOfmoles(), phase.getComponent(i).getNumberOfMolesInPhase(), phase.getComponent(i).getComponentNumber()); } @@ -63,7 +63,7 @@ public PhaseGENRTLmodifiedWS(PhaseInterface phase, double[][] alpha, double[][] super(phase, alpha, Dij, DijT, mixRule, intparam); componentArray = new ComponentGENRTLmodifiedWS[alpha[0].length]; for (int i = 0; i < alpha[0].length; i++) { - componentArray[i] = new ComponentGENRTLmodifiedWS(phase.getComponent(i).getName(), + componentArray[i] = new ComponentGENRTLmodifiedWS(phase.getComponentName(i), phase.getComponent(i).getNumberOfmoles(), phase.getComponent(i).getNumberOfMolesInPhase(), phase.getComponent(i).getComponentNumber()); } diff --git a/src/main/java/neqsim/thermo/phase/PhaseGEUnifac.java b/src/main/java/neqsim/thermo/phase/PhaseGEUnifac.java index e1febda81..220df36c9 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseGEUnifac.java +++ b/src/main/java/neqsim/thermo/phase/PhaseGEUnifac.java @@ -54,7 +54,7 @@ public PhaseGEUnifac(PhaseInterface phase, double[][] alpha, double[][] Dij, Str super(phase, alpha, Dij, mixRule, intparam); componentArray = new ComponentGEUnifac[alpha[0].length]; for (int i = 0; i < alpha[0].length; i++) { - componentArray[i] = new ComponentGEUnifac(phase.getComponent(i).getName(), + componentArray[i] = new ComponentGEUnifac(phase.getComponentName(i), phase.getComponent(i).getNumberOfmoles(), phase.getComponent(i).getNumberOfMolesInPhase(), phase.getComponent(i).getComponentNumber()); } diff --git a/src/main/java/neqsim/thermo/phase/PhaseGEUnifacPSRK.java b/src/main/java/neqsim/thermo/phase/PhaseGEUnifacPSRK.java index a5e01a71b..e2a86a3e5 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseGEUnifacPSRK.java +++ b/src/main/java/neqsim/thermo/phase/PhaseGEUnifacPSRK.java @@ -48,7 +48,7 @@ public PhaseGEUnifacPSRK(PhaseInterface phase, double[][] alpha, double[][] Dij, super(phase, alpha, Dij, mixRule, intparam); componentArray = new ComponentGEUnifac[alpha[0].length]; for (int i = 0; i < alpha[0].length; i++) { - componentArray[i] = new ComponentGEUnifacPSRK(phase.getComponent(i).getName(), + componentArray[i] = new ComponentGEUnifacPSRK(phase.getComponentName(i), phase.getComponent(i).getNumberOfmoles(), phase.getComponent(i).getNumberOfMolesInPhase(), phase.getComponent(i).getComponentNumber()); } diff --git a/src/main/java/neqsim/thermo/phase/PhaseGEUnifacUMRPRU.java b/src/main/java/neqsim/thermo/phase/PhaseGEUnifacUMRPRU.java index a3ad28c6c..b351f9b1e 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseGEUnifacUMRPRU.java +++ b/src/main/java/neqsim/thermo/phase/PhaseGEUnifacUMRPRU.java @@ -55,7 +55,7 @@ public PhaseGEUnifacUMRPRU(PhaseInterface phase, double[][] alpha, double[][] Di super(phase, alpha, Dij, mixRule, intparam); componentArray = new ComponentGEUnifac[alpha[0].length]; for (int i = 0; i < alpha[0].length; i++) { - componentArray[i] = new ComponentGEUnifacUMRPRU(phase.getComponent(i).getName(), + componentArray[i] = new ComponentGEUnifacUMRPRU(phase.getComponentName(i), phase.getComponent(i).getNumberOfmoles(), phase.getComponent(i).getNumberOfMolesInPhase(), phase.getComponent(i).getComponentNumber()); componentArray[i].setAttractiveTerm(phase.getComponent(i).getAttractiveTermNumber()); diff --git a/src/main/java/neqsim/thermo/phase/PhaseGEUniquac.java b/src/main/java/neqsim/thermo/phase/PhaseGEUniquac.java index 0cf21a450..9c4fda123 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseGEUniquac.java +++ b/src/main/java/neqsim/thermo/phase/PhaseGEUniquac.java @@ -59,7 +59,7 @@ public PhaseGEUniquac(PhaseInterface phase, double[][] alpha, double[][] Dij, St this.intparam = intparam; for (int i = 0; i < alpha[0].length; i++) { numberOfComponents++; - componentArray[i] = new ComponentGEUniquac(phase.getComponent(i).getName(), + componentArray[i] = new ComponentGEUniquac(phase.getComponentName(i), phase.getComponent(i).getNumberOfmoles(), phase.getComponent(i).getNumberOfMolesInPhase(), phase.getComponent(i).getComponentNumber()); } diff --git a/src/main/java/neqsim/thermo/phase/PhaseGEWilson.java b/src/main/java/neqsim/thermo/phase/PhaseGEWilson.java index b23f2a144..256313470 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseGEWilson.java +++ b/src/main/java/neqsim/thermo/phase/PhaseGEWilson.java @@ -45,7 +45,7 @@ public PhaseGEWilson(PhaseInterface phase, double[][] alpha, double[][] Dij, Str componentArray = new ComponentGEWilson[alpha[0].length]; for (int i = 0; i < alpha[0].length; i++) { numberOfComponents++; - componentArray[i] = new ComponentGEWilson(phase.getComponent(i).getName(), + componentArray[i] = new ComponentGEWilson(phase.getComponentName(i), phase.getComponent(i).getNumberOfmoles(), phase.getComponent(i).getNumberOfMolesInPhase(), phase.getComponent(i).getComponentNumber()); } diff --git a/src/main/java/neqsim/thermo/phase/PhaseInterface.java b/src/main/java/neqsim/thermo/phase/PhaseInterface.java index 0f7423039..5c7364791 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseInterface.java +++ b/src/main/java/neqsim/thermo/phase/PhaseInterface.java @@ -344,6 +344,16 @@ public default void initPhysicalProperties(String name) { */ public ComponentInterface[] getcomponentArray(); + /** + * Get name of component i. + * + * @param index Component index + * @return Name of component + */ + public default String getComponentName(int index) { + return getComponent(index).getComponentName(); + } + /** * Get normalized names of components in phase. * diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/TPmultiflash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/TPmultiflash.java index f01b5571c..3e925e97d 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/TPmultiflash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/TPmultiflash.java @@ -367,7 +367,7 @@ public void stabilityAnalysis() { } } } - // if(minimumGibbsEnergySystem.getPhase(0).getComponent(j).getName().equals("water") + // if(minimumGibbsEnergySystem.getPhase(0).getComponentName(j).equals("water") // && minimumGibbsEnergySystem.isChemicalSystem()) continue; // logger.info("STAB CHECK COMP " + // system.getPhase(0).getComponent(j).getComponentName()); @@ -718,7 +718,7 @@ public void stabilityAnalysis3() { } } } - // if(minimumGibbsEnergySystem.getPhase(0).getComponent(j).getName().equals("water") + // if(minimumGibbsEnergySystem.getPhase(0).getComponentName(j).equals("water") // && minimumGibbsEnergySystem.isChemicalSystem()) continue; // logger.info("STAB CHECK COMP " + // system.getPhase(0).getComponent(j).getComponentName()); @@ -1058,7 +1058,7 @@ public void stabilityAnalysis2() { && j != hydrocarbonTestCompNumb && j != lightTestCompNumb)) { continue; } - // if(minimumGibbsEnergySystem.getPhase(0).getComponent(j).getName().equals("water") + // if(minimumGibbsEnergySystem.getPhase(0).getComponentName(j).equals("water") // && minimumGibbsEnergySystem.isChemicalSystem()) continue; // logger.info("STAB CHECK COMP " + // system.getPhase(0).getComponent(j).getComponentName()); diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/dTPflash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/dTPflash.java index f8405db90..bb45566db 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/dTPflash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/dTPflash.java @@ -55,7 +55,7 @@ public void run() { for (int i = 0; i < system.getPhase(0).getNumberOfComponents(); i++) { // boolean hasgot = false; for (int j = 0; j < flashComp.length; j++) { - if (flashComp[j].equals(system.getPhase(0).getComponent(i).getName())) { + if (flashComp[j].equals(system.getPhase(0).getComponentName(i))) { diff += Math.abs((system.getPhase(1).getComponent(i).getx() * system.getPhase(1).getComponent(i).getFugacityCoefficient() * system.getPhase(1).getPressure()) diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/DewPointTemperatureFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/DewPointTemperatureFlash.java index ce7b6d58d..f2843388c 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/DewPointTemperatureFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/DewPointTemperatureFlash.java @@ -55,7 +55,7 @@ public void run() { if (system.getPhases()[0].getComponent(i).getIonicCharge() != 0) { system.getPhases()[0].getComponent(i).setx(1e-40); } else { - if (system.getPhases()[1].getComponent(i).getName().equals("water")) { + if (system.getPhases()[1].getComponentName(i).equals("water")) { system.getPhases()[1].getComponent(i).setx(1.0); } else if (system.getPhases()[1].hasComponent("water")) { system.getPhases()[1].getComponent(i).setx(1.0e-10); diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/DewPointTemperatureFlashDer.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/DewPointTemperatureFlashDer.java index 97e970813..7626f3317 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/DewPointTemperatureFlashDer.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/DewPointTemperatureFlashDer.java @@ -51,7 +51,7 @@ public void run() { if (system.getPhases()[0].getComponent(i).getIonicCharge() != 0) { system.getPhases()[0].getComponent(i).setx(1e-40); } else { - if (system.getPhases()[1].getComponent(i).getName().equals("water")) { + if (system.getPhases()[1].getComponentName(i).equals("water")) { system.getPhases()[1].getComponent(i).setx(1.0); } else if (system.getPhases()[1].hasComponent("water")) { system.getPhases()[1].getComponent(i).setx(1.0e-10); diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/HydrateFormationTemperatureFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/HydrateFormationTemperatureFlash.java index a04b414d0..f7de3bc24 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/HydrateFormationTemperatureFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/HydrateFormationTemperatureFlash.java @@ -159,7 +159,7 @@ public void setFug() { for (int i = 0; i < system.getPhase(0).getNumberOfComponents(); i++) { for (int j = 0; j < system.getPhase(0).getNumberOfComponents(); j++) { if (system.getPhase(4).getComponent(j).isHydrateFormer() - || system.getPhase(4).getComponent(j).getName().equals("water")) { + || system.getPhase(4).getComponentName(j).equals("water")) { ((ComponentHydrate) system.getPhase(4).getComponent(i)).setRefFug(j, system.getPhase(0).getFugacity(j)); } else { diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/SolidComplexTemperatureCalc.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/SolidComplexTemperatureCalc.java index f5fdef264..fc19a8e27 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/SolidComplexTemperatureCalc.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/SolidComplexTemperatureCalc.java @@ -95,8 +95,8 @@ public void runOld() { iter++; ops.TPflash(); for (int i = 0; i < system.getPhase(0).getNumberOfComponents(); i++) { - if (system.getPhases()[5].getComponent(i).getName().equals("water") - || system.getPhases()[5].getComponent(i).getName().equals("MEG")) { + if (system.getPhases()[5].getComponentName(i).equals("water") + || system.getPhases()[5].getComponentName(i).equals("MEG")) { system.getPhases()[5].getComponent(i).setx(0.5); } else { system.getPhases()[5].getComponent(i).setx(1e-20); diff --git a/src/test/java/neqsim/thermo/system/SystemThermoNameTagTest.java b/src/test/java/neqsim/thermo/system/SystemThermoNameTagTest.java new file mode 100644 index 000000000..9ef35dc23 --- /dev/null +++ b/src/test/java/neqsim/thermo/system/SystemThermoNameTagTest.java @@ -0,0 +1,47 @@ +package neqsim.thermo.system; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import neqsim.thermodynamicoperations.ThermodynamicOperations; + +public class SystemThermoNameTagTest { + static neqsim.thermo.system.SystemInterface testSystem = null; + + /** + *

+ * setUp. + *

+ */ + @BeforeAll + public static void setUp() { + testSystem = new neqsim.thermo.system.SystemPrEos(298.0, 10.0); + testSystem.addComponent("nitrogen", 0.01); + testSystem.addComponent("CO2", 0.01); + testSystem.addComponent("methane", 0.68); + testSystem.setMixingRule("classic"); + ThermodynamicOperations testOps = new ThermodynamicOperations(testSystem); + testOps.TPflash(); + testSystem.initProperties(); + } + + @Test + public void SetNameTag() { + String[] a = testSystem.getCompNames(); + String[] b = testSystem.getComponentNames(); + assertArrayEquals(a, b); + + SystemInterface tmpSystem = testSystem.clone(); + tmpSystem.setFluidName(null); + String[] c = tmpSystem.getCompNames(); + assertArrayEquals(a, c); + + String prefix = "test"; + tmpSystem.setComponentNameTag(prefix); + String[] c2 = tmpSystem.getCompNames(); + for (String str : c2) { + assertTrue(str.startsWith(prefix)); + } + } +} diff --git a/src/test/java/neqsim/thermo/util/example/DewPointCurve.java b/src/test/java/neqsim/thermo/util/example/DewPointCurve.java index 73ab89ebd..69fefa62c 100644 --- a/src/test/java/neqsim/thermo/util/example/DewPointCurve.java +++ b/src/test/java/neqsim/thermo/util/example/DewPointCurve.java @@ -84,15 +84,13 @@ public static void main(String args[]) { /* * System.out.println("temp " + (testSystem.getTemperature() - 273.15)); for (int i = 0; i < * testSystem.getPhase(0).getNumberOfComponents(); i++) { - * System.out.println("unsymetric activity coeff " + - * testSystem.getPhase(1).getComponent(i).getName() + " " + - * testSystem.getPhase(1).getActivityCoefficientUnSymetric(i)); } for (int i = 0; i < + * System.out.println("unsymetric activity coeff " + testSystem.getPhase(1).getComponentName(i) + * + " " + testSystem.getPhase(1).getActivityCoefficientUnSymetric(i)); } for (int i = 0; i < * testSystem.getPhase(0).getNumberOfComponents(); i++) { - * System.out.println("symetric activity coeff " + - * testSystem.getPhase(1).getComponent(i).getName() + " " + - * testSystem.getPhase(1).getActivityCoefficientSymetric(i)); } - * System.out.println("activity coeff " + testSystem.getPhase(1).getComponent(1).getName() + " " - * + testSystem.getPhase(1).getActivityCoefficient(1, 0)); + * System.out.println("symetric activity coeff " + testSystem.getPhase(1).getComponentName(i) + + * " " + testSystem.getPhase(1).getActivityCoefficientSymetric(i)); } + * System.out.println("activity coeff " + testSystem.getPhase(1).getComponentName(1) + " " + + * testSystem.getPhase(1).getActivityCoefficient(1, 0)); */ } } diff --git a/src/test/java/neqsim/thermo/util/readwrite/EclipseFluidReadWriteTest.java b/src/test/java/neqsim/thermo/util/readwrite/EclipseFluidReadWriteTest.java index abd4a7686..d48e1e774 100644 --- a/src/test/java/neqsim/thermo/util/readwrite/EclipseFluidReadWriteTest.java +++ b/src/test/java/neqsim/thermo/util/readwrite/EclipseFluidReadWriteTest.java @@ -91,7 +91,7 @@ void testReadFluid1() throws IOException { // (((PhaseEos) testSystem.getPhase(0)).getMixingRule().getBinaryInteractionParameters())); // for (int i = 0; i < testSystem.getNumberOfComponents(); i++) { - // System.out.println(testSystem.getComponent(i).getName() + " TC " + // System.out.println(testSystem.getComponentName(i) + " TC " // + (testSystem.getComponent(i).getVolumeCorrectionConst())); // } }