From 4020a77bcbcb60ff203a58dbb26795979470af98 Mon Sep 17 00:00:00 2001 From: fannemel Date: Tue, 18 Jan 2022 10:14:40 +0100 Subject: [PATCH] efficients etc (#292) --- .../nonLinearSolver/sysNewtonRhapson.java | 4 +- .../ChemicalEquilibrium.java | 8 +- .../fluidMechanics/flowLeg/FlowLeg.java | 4 +- .../flowLeg/FlowLegInterface.java | 8 +- .../fluidMechanics/flowNode/FlowNode.java | 2 +- .../flowNode/FlowNodeInterface.java | 8 +- .../NonEquilibriumFluidBoundary.java | 16 +-- .../KrishnaStandartFilmModel.java | 66 +++++++---- .../ReactiveFluidBoundary.java | 14 +-- .../fluidMechanics/flowSystem/FlowSystem.java | 4 +- .../PotentialTheoryAdsorption.java | 6 +- .../CorrespondingStatesDiffusivity.java | 16 +-- .../diffusivity/Diffusivity.java | 24 ++-- .../diffusivity/Diffusivity.java | 34 +++--- .../diffusivity/WilkeLeeDiffusivity.java | 8 +- .../diffusivity/AmineDiffusivity.java | 16 +-- .../diffusivity/CO2water.java | 4 +- .../diffusivity/Diffusivity.java | 30 ++--- .../diffusivity/SiddiqiLucasMethod.java | 8 +- .../methodInterface/DiffusivityInterface.java | 32 ++++-- .../diffusivity/Diffusivity.java | 20 ++-- .../PhysicalProperties.java | 14 +-- .../PhysicalPropertiesInterface.java | 8 +- .../diffusivity/DiffusivityFunction.java | 2 +- .../absorber/SimpleTEGAbsorber.java | 6 +- .../distillation/DistillationColumn.java | 26 ++--- .../sectionType/SeparatorSection.java | 16 +-- .../GlycolDehydrationlModule.java | 4 +- .../parameterFitting/StatisticsInterface.java | 4 +- .../neqsim/thermo/ThermodynamicModelTest.java | 104 +++++++++--------- .../neqsim/thermo/component/Component.java | 42 +++---- .../component/ComponentDesmukhMather.java | 14 +-- .../neqsim/thermo/component/ComponentEos.java | 6 +- .../neqsim/thermo/component/ComponentGE.java | 8 +- .../thermo/component/ComponentGERG2004.java | 2 +- .../thermo/component/ComponentGEUnifac.java | 4 +- .../thermo/component/ComponentGEUniquac.java | 4 +- .../thermo/component/ComponentGEWilson.java | 10 +- .../thermo/component/ComponentGeDuanSun.java | 18 +-- .../thermo/component/ComponentHydrate.java | 30 ++--- .../component/ComponentHydrateBallard.java | 10 +- .../thermo/component/ComponentHydrateGF.java | 28 ++--- .../component/ComponentHydrateKluda.java | 24 ++-- .../component/ComponentHydratePVTsim.java | 16 +-- .../component/ComponentHydrateStatoil.java | 10 +- .../thermo/component/ComponentInterface.java | 17 +-- .../component/ComponentKentEisenberg.java | 10 +- .../thermo/component/ComponentPCSAFT.java | 4 +- .../thermo/component/ComponentSolid.java | 20 ++-- .../neqsim/thermo/component/ComponentWax.java | 12 +- .../thermo/component/ComponentWaxWilson.java | 18 +-- .../thermo/component/ComponentWonWax.java | 14 +-- src/main/java/neqsim/thermo/phase/Phase.java | 26 ++--- .../neqsim/thermo/phase/PhaseDefault.java | 2 +- .../thermo/phase/PhaseGENRTLmodifiedHV.java | 2 +- .../neqsim/thermo/phase/PhaseGEUnifac.java | 2 +- .../neqsim/thermo/phase/PhaseGEWilson.java | 2 +- .../neqsim/thermo/system/SystemThermo.java | 50 ++++----- .../neqsim/thermo/util/empiric/DuanSun.java | 4 +- .../BinaryHVParameterFittingFunction_N2O.java | 2 +- ...teractionParameterFittingFunction_CO2.java | 2 +- ...BinaryHVParameterFittingFunction_MDEA.java | 4 +- .../Procede/WaterMDEA/Water_MDEA1.java | 4 +- ...meterFitToActivityCoefficientFunction.java | 2 +- ...osInteractionParameterFittingFunction.java | 8 +- ...ryHVParameterFittingToEquilibriumData.java | 4 +- ...meterFitToActivityCoefficientFunction.java | 2 +- .../TestMathiasCopemanToDewPoint.java | 12 +- .../flashOps/Flash.java | 10 +- .../flashOps/SolidFlash.java | 24 ++-- .../flashOps/SolidFlash1.java | 38 +++---- .../flashOps/SolidFlash12.java | 32 +++--- .../flashOps/TPflash.java | 18 +-- .../flashOps/TPgradientFlash.java | 8 +- .../flashOps/TPmultiflash.java | 28 ++--- .../flashOps/TPmultiflashWAX.java | 16 +-- .../flashOps/TPmultiflash_1.java | 14 +-- .../flashOps/dTPflash.java | 8 +- .../flashOps/saturationOps/FreezeOut.java | 2 +- .../flashOps/saturationOps/FugTestConstP.java | 2 +- .../HCdewPointPressureFlash.java | 4 +- .../HydrateFormationPressureFlash.java | 2 +- .../SolidComplexTemperatureCalc.java | 2 +- .../flashOps/saturationOps/WATcalc.java | 2 +- .../bubblePointPressureFlash.java | 8 +- .../bubblePointPressureFlashDer.java | 8 +- .../bubblePointTemperatureFlash.java | 8 +- .../bubblePointTemperatureNoDer.java | 8 +- .../saturationOps/constantDutyFlash.java | 8 +- .../constantDutyPressureFlash.java | 4 +- .../constantDutyTemperatureFlash.java | 8 +- .../saturationOps/cricondebarFlash.java | 12 +- .../saturationOps/cricondenBarTemp.java | 4 +- .../saturationOps/cricondenBarTemp1.java | 4 +- .../saturationOps/dewPointPressureFlash.java | 4 +- .../dewPointTemperatureFlash.java | 4 +- .../dewPointTemperatureFlashDer.java | 4 +- .../freezingPointTemperatureFlash.java | 6 +- .../freezingPointTemperatureFlashOld.java | 11 +- .../freezingPointTemperatureFlashTR.java | 10 +- .../waterDewPointTemperatureFlash.java | 10 +- .../flashOps/sysNewtonRhapsonPHflash.java | 4 +- .../flashOps/sysNewtonRhapsonTPflash.java | 4 +- .../flashOps/sysNewtonRhapsonTPflashNew.java | 4 +- .../CricondenBarFlash.java | 12 +- .../CricondenThermFlash.java | 12 +- .../sysNewtonRhapsonPhaseEnvelope.java | 8 +- .../sysNewtonRhapsonPhaseEnvelope2.java | 4 +- .../reactiveCurves/pLoadingCurve.java | 2 +- .../util/examples/TPflashTest.java | 6 +- .../util/example/TEGdehydrationProcess2.java | 12 +- .../neqsim/thermo/system/ModelBaseTest.java | 8 +- .../neqsim/thermo/system/SystemPrEosTest.java | 83 ++++++++------ .../system/SystemUMRPRUMCEosNewTest.java | 64 +++++++---- .../thermo/util/example/LNGfilling.java | 2 +- .../thermo/util/example/TPMultiFlash.java | 10 +- .../thermo/util/example/TPflashDehyd.java | 2 +- .../TestCharacterizationCondensate1.java | 10 +- .../thermo/util/example/TestPCSAFT.java | 8 +- .../thermo/util/example/TestVHflash.java | 2 +- .../util/example/MEGwaterComplexFlash.java | 10 +- 121 files changed, 816 insertions(+), 747 deletions(-) diff --git a/src/main/java/neqsim/MathLib/nonLinearSolver/sysNewtonRhapson.java b/src/main/java/neqsim/MathLib/nonLinearSolver/sysNewtonRhapson.java index 876e91581..1d8267345 100644 --- a/src/main/java/neqsim/MathLib/nonLinearSolver/sysNewtonRhapson.java +++ b/src/main/java/neqsim/MathLib/nonLinearSolver/sysNewtonRhapson.java @@ -72,8 +72,8 @@ public sysNewtonRhapson(SystemInterface system, int numberOfPhases, int numberOf public void setfvec() { for (int i = 0; i < numberOfComponents; i++) { fvec.set(i, 0, u.get(i, 0) - + Math.log(system.getPhases()[1].getComponents()[i].getFugasityCoeffisient() - / system.getPhases()[0].getComponents()[i].getFugasityCoeffisient())); + + Math.log(system.getPhases()[1].getComponents()[i].getFugacityCoefficient() + / system.getPhases()[0].getComponents()[i].getFugacityCoefficient())); } double fsum = 0.0; for (int i = 0; i < numberOfComponents; i++) { diff --git a/src/main/java/neqsim/chemicalReactions/chemicalEquilibriaum/ChemicalEquilibrium.java b/src/main/java/neqsim/chemicalReactions/chemicalEquilibriaum/ChemicalEquilibrium.java index 87ef38f52..9f2b6f301 100644 --- a/src/main/java/neqsim/chemicalReactions/chemicalEquilibriaum/ChemicalEquilibrium.java +++ b/src/main/java/neqsim/chemicalReactions/chemicalEquilibriaum/ChemicalEquilibrium.java @@ -391,9 +391,9 @@ public double step() { return step; } else { // chem_pot_omega[i] = R*T*(chem_ref[i]+ Math.log(n_omega[i]/n_t) + - // Math.log(system.getPhases()[1].getComponents()[components[i].getComponentNumber()].getFugasityCoeffisient()/chem_pot_pure[i])); + // Math.log(system.getPhases()[1].getComponents()[components[i].getComponentNumber()].getFugacityCoefficient()/chem_pot_pure[i])); // chem_pot[i] = R*T*(chem_ref[i] + Math.log(n_mol[i]/n_t)+ - // Math.log(system.getPhases()[1].getComponents()[components[i].getComponentNumber()].getFugasityCoeffisient()/chem_pot_pure[i])); + // Math.log(system.getPhases()[1].getComponents()[components[i].getComponentNumber()].getFugacityCoefficient()/chem_pot_pure[i])); if (system.getPhase(phasenumb).getComponents()[components[i].getComponentNumber()] .getReferenceStateType().equals("solvent")) { @@ -402,14 +402,14 @@ public double step() { .getComponentNumber()].getNumberOfMolesInPhase()) - Math.log(n_t) + logactivityVec[i]);// system.getPhase(phasenumb).getActivityCoefficient(components[i].getComponentNumber(),components[waterNumb].getComponentNumber()))); // System.out.println("solvent activ: "+ i + " " + - // system.getPhases()[1].getComponents()[components[i].getComponentNumber()].getFugasityCoeffisient()/chem_pot_pure[i]); + // system.getPhases()[1].getComponents()[components[i].getComponentNumber()].getFugacityCoefficient()/chem_pot_pure[i]); } else { chem_pot[i] = R * system.getPhase(phasenumb).getTemperature() * (chem_ref[i] + Math.log(system.getPhase(phasenumb).getComponents()[components[i] .getComponentNumber()].getNumberOfMolesInPhase()) - Math.log(n_t) + logactivityVec[i]);// system.getPhase(phasenumb).getActivityCoefficient(components[i].getComponentNumber(),components[waterNumb].getComponentNumber()))); // System.out.println("solute activ : " + i + " " + - // system.getPhases()[1].getComponents()[components[i].getComponentNumber()].getFugasityCoeffisient()/chem_pot_dilute[i]); + // system.getPhases()[1].getComponents()[components[i].getComponentNumber()].getFugacityCoefficient()/chem_pot_dilute[i]); } chem_pot_omega[i] = R * system.getPhase(phasenumb).getTemperature() * (chem_ref[i] + Math.log(n_omega[i]) - Math.log(n_t) + logactivityVec[i]); diff --git a/src/main/java/neqsim/fluidMechanics/flowLeg/FlowLeg.java b/src/main/java/neqsim/fluidMechanics/flowLeg/FlowLeg.java index 0a15d3c87..4b6835e93 100644 --- a/src/main/java/neqsim/fluidMechanics/flowLeg/FlowLeg.java +++ b/src/main/java/neqsim/fluidMechanics/flowLeg/FlowLeg.java @@ -159,7 +159,7 @@ public void setHeightCoordinates(double startHeightCoordinate, double endHeightC /** {@inheritDoc} */ @Override - public void setOuterHeatTransferCOefficients(double startHeatTransferCoefficient, + public void setOuterHeatTransferCoefficients(double startHeatTransferCoefficient, double endHeatTransferCoefficient) { this.startOuterHeatTransferCoefficient = startHeatTransferCoefficient; this.endOuterHeatTransferCoefficient = endHeatTransferCoefficient; @@ -167,7 +167,7 @@ public void setOuterHeatTransferCOefficients(double startHeatTransferCoefficient /** {@inheritDoc} */ @Override - public void setWallHeatTransferCOefficients(double startHeatTransferCoefficient, + public void setWallHeatTransferCoefficients(double startHeatTransferCoefficient, double endHeatTransferCoefficient) { this.startWallHeatTransferCOefficients = startHeatTransferCoefficient; this.endWallHeatTransferCOefficients = endHeatTransferCoefficient; diff --git a/src/main/java/neqsim/fluidMechanics/flowLeg/FlowLegInterface.java b/src/main/java/neqsim/fluidMechanics/flowLeg/FlowLegInterface.java index af81cb298..1430dccc9 100644 --- a/src/main/java/neqsim/fluidMechanics/flowLeg/FlowLegInterface.java +++ b/src/main/java/neqsim/fluidMechanics/flowLeg/FlowLegInterface.java @@ -123,24 +123,24 @@ public void setLongitudionalCoordinates(double startLongitudionalCoordinate, /** *

- * setOuterHeatTransferCOefficients. + * setOuterHeatTransferCoefficients. *

* * @param startHeatTransferCoefficient a double * @param endHeatTransferCoefficient a double */ - public void setOuterHeatTransferCOefficients(double startHeatTransferCoefficient, + public void setOuterHeatTransferCoefficients(double startHeatTransferCoefficient, double endHeatTransferCoefficient); /** *

- * setWallHeatTransferCOefficients. + * setWallHeatTransferCoefficients. *

* * @param startHeatTransferCoefficient a double * @param endHeatTransferCoefficient a double */ - public void setWallHeatTransferCOefficients(double startHeatTransferCoefficient, + public void setWallHeatTransferCoefficients(double startHeatTransferCoefficient, double endHeatTransferCoefficient); /** diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/FlowNode.java b/src/main/java/neqsim/fluidMechanics/flowNode/FlowNode.java index f47340ec7..5c507de9b 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/FlowNode.java +++ b/src/main/java/neqsim/fluidMechanics/flowNode/FlowNode.java @@ -517,7 +517,7 @@ public double getPrandtlNumber(int phase) { @Override public double getSchmidtNumber(int phase, int component1, int component2) { return getBulkSystem().getPhase(phase).getPhysicalProperties() - .getDiffusionCoeffisient(component1, component2) + .getDiffusionCoefficient(component1, component2) / getBulkSystem().getPhase(phase).getPhysicalProperties().getKinematicViscosity(); } diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/FlowNodeInterface.java b/src/main/java/neqsim/fluidMechanics/flowNode/FlowNodeInterface.java index bd2ab53ff..1155757bc 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/FlowNodeInterface.java +++ b/src/main/java/neqsim/fluidMechanics/flowNode/FlowNodeInterface.java @@ -658,9 +658,9 @@ public interface FlowNodeInterface extends Cloneable { */ public DoubleCloneable getVelocityIn(int i); - // public double calcWallHeatTransferCoeffisient(int phase); + // public double calcWallHeatTransferCoefficient(int phase); - // public double calcWallMassTransferCoeffisient(double schmidtNumber, int phase); + // public double calcWallMassTransferCoefficient(double schmidtNumber, int phase); /** *

@@ -673,9 +673,9 @@ public interface FlowNodeInterface extends Cloneable { public double calcTotalHeatTransferCoefficient(int phase); // public double initVelocity(); - // public double calcInterphaseMassTransferCoeffisient(double schmidtNumber, int + // public double calcInterphaseMassTransferCoefficient(double schmidtNumber, int // phase); - // public double calcInterphaseHeatTransferCoeffisient(int phase); + // public double calcInterphaseHeatTransferCoefficient(int phase); // public double calcdPdz(); // public double calcdTdz(); // public double calcdVoiddz(); diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/NonEquilibriumFluidBoundary.java b/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/NonEquilibriumFluidBoundary.java index 61b988cdc..300241ebf 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/NonEquilibriumFluidBoundary.java +++ b/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/NonEquilibriumFluidBoundary.java @@ -120,10 +120,10 @@ public void setfvecMassTrans() { double sumx = 0, sumy = 0; for (int i = 0; i < bulkSystem.getPhases()[0].getNumberOfComponents(); i++) { fvec.set(i, 0, Math.log( - (interphaseSystem.getPhases()[0].getComponents()[i].getFugasityCoeffisient() + (interphaseSystem.getPhases()[0].getComponents()[i].getFugacityCoefficient() * interphaseSystem.getPhases()[0].getComponents()[i].getx())) - Math.log((interphaseSystem.getPhases()[1].getComponents()[i] - .getFugasityCoeffisient() + .getFugacityCoefficient() * interphaseSystem.getPhases()[1].getComponents()[i].getx()))); sumx += interphaseSystem.getPhases()[0].getComponents()[i].getx(); sumy += interphaseSystem.getPhases()[1].getComponents()[i].getx(); @@ -162,10 +162,10 @@ public void setfvecMassTrans2() { double sumx = 0.0, sumy = 0.0; for (int i = 0; i < bulkSystem.getPhases()[0].getNumberOfComponents(); i++) { fvec.set(i, 0, Math.log( - (interphaseSystem.getPhases()[0].getComponents()[i].getFugasityCoeffisient() + (interphaseSystem.getPhases()[0].getComponents()[i].getFugacityCoefficient() * interphaseSystem.getPhases()[0].getComponents()[i].getx())) - Math.log((interphaseSystem.getPhases()[1].getComponents()[i] - .getFugasityCoeffisient() + .getFugacityCoefficient() * interphaseSystem.getPhases()[1].getComponents()[i].getx()))); sumx += interphaseSystem.getPhases()[1].getComponents()[i].getx(); sumy += interphaseSystem.getPhases()[0].getComponents()[i].getx(); @@ -249,7 +249,7 @@ public void setJacMassTrans() { + interphaseSystem.getPhases()[0].getComponents()[i].getdfugdx(j); // tempJ= - // dij*interphaseSystem.getPhases()[0].getComponents()[i].getFugasityCoeffisient()+interphaseSystem.getPhases()[0].getComponents()[i].getx()*interphaseSystem.getPhases()[0].getComponents()[i].getdfugdx(j); + // dij*interphaseSystem.getPhases()[0].getComponents()[i].getFugacityCoefficient()+interphaseSystem.getPhases()[0].getComponents()[i].getx()*interphaseSystem.getPhases()[0].getComponents()[i].getdfugdx(j); Jac.set(i, j, tempJ); } } @@ -270,7 +270,7 @@ public void setJacMassTrans() { + interphaseSystem.getPhases()[1].getComponents()[i].getdfugdx(j); // tempJ= - // dij*interphaseSystem.getPhases()[1].getComponents()[i].getFugasityCoeffisient()+interphaseSystem.getPhases()[1].getComponents()[i].getx()*interphaseSystem.getPhases()[1].getComponents()[i].getdfugdx(j); + // dij*interphaseSystem.getPhases()[1].getComponents()[i].getFugacityCoefficient()+interphaseSystem.getPhases()[1].getComponents()[i].getx()*interphaseSystem.getPhases()[1].getComponents()[i].getdfugdx(j); Jac.set(i, j + bulkSystem.getPhases()[0].getNumberOfComponents(), -tempJ); } } @@ -448,12 +448,12 @@ public void calcMolFractionDifference() { /** *

- * calcHeatTransferCoeffisients. + * calcHeatTransferCoefficients. *

* * @param phase a int */ - public void calcHeatTransferCoeffisients(int phase) { + public void calcHeatTransferCoefficients(int phase) { prandtlNumber[phase] = getBulkSystem().getPhases()[phase].getCp() / getBulkSystem().getPhases()[phase].getNumberOfMolesInPhase() * getBulkSystem().getPhases()[phase].getPhysicalProperties().getViscosity() diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/KrishnaStandartFilmModel.java b/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/KrishnaStandartFilmModel.java index 9fd7da945..63981d90d 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/KrishnaStandartFilmModel.java +++ b/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/KrishnaStandartFilmModel.java @@ -10,7 +10,9 @@ import neqsim.thermodynamicOperations.ThermodynamicOperations; /** - *

KrishnaStandartFilmModel class.

+ *

+ * KrishnaStandartFilmModel class. + *

* * @author asmund * @version $Id: $Id @@ -26,12 +28,16 @@ public class KrishnaStandartFilmModel extends Matrix betaMatrix; /** - *

Constructor for KrishnaStandartFilmModel.

+ *

+ * Constructor for KrishnaStandartFilmModel. + *

*/ public KrishnaStandartFilmModel() {} /** - *

Constructor for KrishnaStandartFilmModel.

+ *

+ * Constructor for KrishnaStandartFilmModel. + *

* * @param system a {@link neqsim.thermo.system.SystemInterface} object */ @@ -48,7 +54,9 @@ public KrishnaStandartFilmModel(SystemInterface system) { } /** - *

Constructor for KrishnaStandartFilmModel.

+ *

+ * Constructor for KrishnaStandartFilmModel. + *

* * @param flowNode a {@link neqsim.fluidMechanics.flowNode.FlowNodeInterface} object */ @@ -83,7 +91,9 @@ public KrishnaStandartFilmModel clone() { } /** - *

calcBinarySchmidtNumbers.

+ *

+ * calcBinarySchmidtNumbers. + *

* * @param phase a int * @return a double @@ -94,10 +104,10 @@ public double calcBinarySchmidtNumbers(int phase) { binarySchmidtNumber[phase][i][j] = getBulkSystem().getPhases()[phase] .getPhysicalProperties().getKinematicViscosity() / getBulkSystem().getPhases()[phase].getPhysicalProperties() - .getDiffusionCoeffisient(i, j); + .getDiffusionCoefficient(i, j); // System.out.println("i j " + i +" j " + j); // System.out.println("phase " + phase + " diff" + - // getBulkSystem().getPhases()[phase].getPhysicalProperties().getDiffusionCoeffisient(i,j)); + // getBulkSystem().getPhases()[phase].getPhysicalProperties().getDiffusionCoefficient(i,j)); // System.out.println("phase " + phase + " visk" + // getBulkSystem().getPhases()[phase].getPhysicalProperties().getKinematicViscosity()); } @@ -106,7 +116,9 @@ public double calcBinarySchmidtNumbers(int phase) { } /** - *

calcBinaryMassTransferCoefficients.

+ *

+ * calcBinaryMassTransferCoefficients. + *

* * @param phase a int * @return a double @@ -123,12 +135,14 @@ public double calcBinaryMassTransferCoefficients(int phase) { } /** - *

calcMassTransferCoeffisients.

+ *

+ * calcMassTransferCoefficients. + *

* * @param phase a int * @return a double */ - public double calcMassTransferCoeffisients(int phase) { + public double calcMassTransferCoefficients(int phase) { int n = getBulkSystem().getPhases()[phase].getNumberOfComponents() - 1; for (int i = 0; i < getBulkSystem().getPhases()[phase].getNumberOfComponents() - 1; i++) { @@ -154,7 +168,9 @@ public double calcMassTransferCoeffisients(int phase) { } /** - *

calcPhiMatrix.

+ *

+ * calcPhiMatrix. + *

* * @param phase a int */ @@ -187,7 +203,9 @@ public void calcPhiMatrix(int phase) { } /** - *

calcRedPhiMatrix.

+ *

+ * calcRedPhiMatrix. + *

* * @param phase a int */ @@ -196,7 +214,9 @@ public void calcRedPhiMatrix(int phase) { } /** - *

calcRedCorrectionMatrix.

+ *

+ * calcRedCorrectionMatrix. + *

* * @param phase a int */ @@ -209,7 +229,9 @@ public void calcRedCorrectionMatrix(int phase) { } /** - *

calcCorrectionMatrix.

+ *

+ * calcCorrectionMatrix. + *

* * @param phase a int */ @@ -226,7 +248,9 @@ public void calcCorrectionMatrix(int phase) { } /** - *

calcTotalMassTransferCoefficientMatrix.

+ *

+ * calcTotalMassTransferCoefficientMatrix. + *

* * @param phase a int */ @@ -257,7 +281,9 @@ public void calcTotalMassTransferCoefficientMatrix(int phase) { } /** - *

initCorrections.

+ *

+ * initCorrections. + *

* * @param phase a int */ @@ -280,7 +306,7 @@ public void initMassTransferCalc() { for (int phase = 0; phase < 2; phase++) { this.calcBinarySchmidtNumbers(phase); this.calcBinaryMassTransferCoefficients(phase); - this.calcMassTransferCoeffisients(phase); + this.calcMassTransferCoefficients(phase); this.initCorrections(phase); this.calcNonIdealCorrections(phase); // this.calcFluxTypeCorrectionMatrix(phase,0); @@ -293,7 +319,7 @@ public void initMassTransferCalc() { public void initHeatTransferCalc() { super.initHeatTransferCalc(); for (int phase = 0; phase < 2; phase++) { - this.calcHeatTransferCoeffisients(phase); + this.calcHeatTransferCoefficients(phase); this.calcHeatTransferCorrection(phase); } } @@ -317,7 +343,9 @@ public void solve() { } /** - *

main.

+ *

+ * main. + *

* * @param args an array of {@link java.lang.String} objects */ diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/reactiveFilmModel/ReactiveFluidBoundary.java b/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/reactiveFilmModel/ReactiveFluidBoundary.java index 52eee6b9d..3052e4ce0 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/reactiveFilmModel/ReactiveFluidBoundary.java +++ b/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/reactiveFilmModel/ReactiveFluidBoundary.java @@ -104,10 +104,10 @@ public void setfvecMassTrans() { double sumx = 0, sumy = 0; for (int i = 0; i < bulkSystem.getPhases()[0].getNumberOfMolecularComponents(); i++) { fvec.set(i, 0, Math.log( - (interphaseSystem.getPhases()[0].getComponents()[i].getFugasityCoeffisient() + (interphaseSystem.getPhases()[0].getComponents()[i].getFugacityCoefficient() * interphaseSystem.getPhases()[0].getComponents()[i].getx())) - Math.log((interphaseSystem.getPhases()[1].getComponents()[i] - .getFugasityCoeffisient() + .getFugacityCoefficient() * interphaseSystem.getPhases()[1].getComponents()[i].getx()))); sumx += interphaseSystem.getPhases()[0].getComponents()[i].getx(); sumy += interphaseSystem.getPhases()[1].getComponents()[i].getx(); @@ -145,10 +145,10 @@ public void setfvecMassTrans2() { double sumx = 0.0, sumy = 0.0; for (int i = 0; i < bulkSystem.getPhases()[0].getNumberOfMolecularComponents(); i++) { fvec.set(i, 0, Math.log( - (interphaseSystem.getPhases()[0].getComponents()[i].getFugasityCoeffisient() + (interphaseSystem.getPhases()[0].getComponents()[i].getFugacityCoefficient() * interphaseSystem.getPhases()[0].getComponents()[i].getx())) - Math.log((interphaseSystem.getPhases()[1].getComponents()[i] - .getFugasityCoeffisient() + .getFugacityCoefficient() * interphaseSystem.getPhases()[1].getComponents()[i].getx()))); sumx += interphaseSystem.getPhases()[1].getComponents()[i].getx(); sumy += interphaseSystem.getPhases()[0].getComponents()[i].getx(); @@ -231,7 +231,7 @@ public void setJacMassTrans() { + interphaseSystem.getPhases()[0].getComponents()[i].getdfugdx(j); // tempJ= - // dij*interphaseSystem.getPhases()[0].getComponents()[i].getFugasityCoeffisient()+interphaseSystem.getPhases()[0].getComponents()[i].getx()*interphaseSystem.getPhases()[0].getComponents()[i].getdfugdx(j); + // dij*interphaseSystem.getPhases()[0].getComponents()[i].getFugacityCoefficient()+interphaseSystem.getPhases()[0].getComponents()[i].getx()*interphaseSystem.getPhases()[0].getComponents()[i].getdfugdx(j); Jac.set(i, j, tempJ); } } @@ -252,7 +252,7 @@ public void setJacMassTrans() { + interphaseSystem.getPhases()[1].getComponents()[i].getdfugdx(j); // tempJ= - // dij*interphaseSystem.getPhases()[1].getComponents()[i].getFugasityCoeffisient()+interphaseSystem.getPhases()[1].getComponents()[i].getx()*interphaseSystem.getPhases()[1].getComponents()[i].getdfugdx(j); + // dij*interphaseSystem.getPhases()[1].getComponents()[i].getFugacityCoefficient()+interphaseSystem.getPhases()[1].getComponents()[i].getx()*interphaseSystem.getPhases()[1].getComponents()[i].getdfugdx(j); Jac.set(i, j + bulkSystem.getPhases()[0].getNumberOfMolecularComponents(), -tempJ); } } @@ -425,7 +425,7 @@ public void calcMolFractionDifference() { /** {@inheritDoc} */ @Override - public void calcHeatTransferCoeffisients(int phase) { + public void calcHeatTransferCoefficients(int phase) { prandtlNumber[phase] = getBulkSystem().getPhases()[phase].getCp() * getBulkSystem().getPhases()[phase].getPhysicalProperties().getViscosity() / getBulkSystem().getPhases()[phase].getPhysicalProperties().getConductivity(); diff --git a/src/main/java/neqsim/fluidMechanics/flowSystem/FlowSystem.java b/src/main/java/neqsim/fluidMechanics/flowSystem/FlowSystem.java index 5c98b81cf..e708261a9 100644 --- a/src/main/java/neqsim/fluidMechanics/flowSystem/FlowSystem.java +++ b/src/main/java/neqsim/fluidMechanics/flowSystem/FlowSystem.java @@ -94,9 +94,9 @@ public void flowLegInit() { this.flowLeg[i].setOuterTemperatures(legOuterTemperatures[i], legOuterTemperatures[i + 1]); this.flowLeg[i].setLongitudionalCoordinates(legPositions[i], legPositions[i + 1]); - this.flowLeg[i].setOuterHeatTransferCOefficients(legOuterHeatTransferCoefficients[i], + this.flowLeg[i].setOuterHeatTransferCoefficients(legOuterHeatTransferCoefficients[i], legOuterHeatTransferCoefficients[i + 1]); - this.flowLeg[i].setWallHeatTransferCOefficients(legWallHeatTransferCoefficients[i], + this.flowLeg[i].setWallHeatTransferCoefficients(legWallHeatTransferCoefficients[i], legWallHeatTransferCoefficients[i + 1]); this.flowLeg[i].createFlowNodes(flowNode[0]); } diff --git a/src/main/java/neqsim/physicalProperties/interfaceProperties/solidAdsorption/PotentialTheoryAdsorption.java b/src/main/java/neqsim/physicalProperties/interfaceProperties/solidAdsorption/PotentialTheoryAdsorption.java index fb87a0cdc..3fcde2e56 100644 --- a/src/main/java/neqsim/physicalProperties/interfaceProperties/solidAdsorption/PotentialTheoryAdsorption.java +++ b/src/main/java/neqsim/physicalProperties/interfaceProperties/solidAdsorption/PotentialTheoryAdsorption.java @@ -76,7 +76,7 @@ public void calcAdorption(int phase) { for (int comp = 0; comp < system.getPhase(phase).getNumberOfComponents(); comp++) { bulkFug[comp] = system.getPhase(phase).getComponent(comp).getx() - * system.getPhase(phase).getComponent(comp).getFugasityCoefficient() + * system.getPhase(phase).getComponent(comp).getFugacityCoefficient() * system.getPhase(phase).getPressure(); deltaz[comp] = z0[comp] / (integrationSteps * 1.0); zField[comp][0] = z0[comp]; @@ -98,11 +98,11 @@ public void calcAdorption(int phase) { .exp(epsField[comp][i] / R / system.getPhase(phase).getTemperature()); fugacityField[comp][i] = correction * bulkFug[comp]; double fugComp = - tempSystem.getPhase(phase).getComponent(comp).getFugasityCoefficient() + tempSystem.getPhase(phase).getComponent(comp).getFugacityCoefficient() * tempSystem.getPhase(phase).getPressure(); corrx[comp] = fugacityField[comp][i] / fugComp; pressure += fugacityField[comp][i] / tempSystem.getPhase(phase) - .getComponent(comp).getFugasityCoefficient(); + .getComponent(comp).getFugacityCoefficient(); } for (int comp = 0; comp < system.getPhase(phase).getNumberOfComponents(); comp++) { tempSystem.getPhase(phase).getComponent(comp).setx(corrx[comp]); diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/diffusivity/CorrespondingStatesDiffusivity.java b/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/diffusivity/CorrespondingStatesDiffusivity.java index fd9e97f1d..817a1c1fa 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/diffusivity/CorrespondingStatesDiffusivity.java +++ b/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/diffusivity/CorrespondingStatesDiffusivity.java @@ -11,7 +11,7 @@ public class CorrespondingStatesDiffusivity extends Diffusivity { private static final long serialVersionUID = 1000; - double[][] binaryDiffusionCoeffisients, binaryLennardJonesOmega; + double[][] binaryDiffusionCoefficients, binaryLennardJonesOmega; /** *

@@ -32,7 +32,7 @@ public CorrespondingStatesDiffusivity() {} public CorrespondingStatesDiffusivity( neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface phase) { super(phase); - binaryDiffusionCoeffisients = new double[phase.getPhase().getNumberOfComponents()][phase + binaryDiffusionCoefficients = new double[phase.getPhase().getNumberOfComponents()][phase .getPhase().getNumberOfComponents()]; } @@ -40,7 +40,7 @@ public CorrespondingStatesDiffusivity( @Override public double calcBinaryDiffusionCoefficient(int i, int j, int method) { if (phase.getPhase().getPhaseType() == 0) { - binaryDiffusionCoeffisients[i][j] = 1.0e-4 * 9.89e-8 + binaryDiffusionCoefficients[i][j] = 1.0e-4 * 9.89e-8 * Math.pow(phase.getViscosity() * 1e3, -0.907) * Math.pow( 1.0 / phase.getPhase().getComponents()[i].getNormalLiquidDensity() @@ -51,14 +51,14 @@ public double calcBinaryDiffusionCoefficient(int i, int j, int method) { * phase.getPhase().getComponents()[j].getMolarMass() * 1000, 0.265) * phase.getPhase().getTemperature(); - // System.out.println("liq diffusivity " +binaryDiffusionCoeffisients[i][j] + // System.out.println("liq diffusivity " +binaryDiffusionCoefficients[i][j] // ); - return binaryDiffusionCoeffisients[i][j]; + return binaryDiffusionCoefficients[i][j]; } else { - binaryDiffusionCoeffisients[i][j] = 1.8e-5 / phase.getPhase().getPressure(); - // System.out.println("gas diffusivity " +binaryDiffusionCoeffisients[i][j] + binaryDiffusionCoefficients[i][j] = 1.8e-5 / phase.getPhase().getPressure(); + // System.out.println("gas diffusivity " +binaryDiffusionCoefficients[i][j] // ); - return binaryDiffusionCoeffisients[i][j]; + return binaryDiffusionCoefficients[i][j]; } } } diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/diffusivity/Diffusivity.java b/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/diffusivity/Diffusivity.java index a000a67b4..51397de95 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/diffusivity/Diffusivity.java +++ b/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/diffusivity/Diffusivity.java @@ -17,7 +17,7 @@ public class Diffusivity extends CommonPhysicalPropertyMethod implements private static final long serialVersionUID = 1000; static Logger logger = LogManager.getLogger(Diffusivity.class); - double[][] binaryDiffusionCoeffisients, binaryLennardJonesOmega; + double[][] binaryDiffusionCoefficients, binaryLennardJonesOmega; double[] effectiveDiffusionCoefficient; /** @@ -39,7 +39,7 @@ public Diffusivity() {} public Diffusivity( neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface phase) { super(phase); - binaryDiffusionCoeffisients = new double[phase.getPhase().getNumberOfComponents()][phase + binaryDiffusionCoefficients = new double[phase.getPhase().getNumberOfComponents()][phase .getPhase().getNumberOfComponents()]; binaryLennardJonesOmega = new double[phase.getPhase().getNumberOfComponents()][phase .getPhase().getNumberOfComponents()]; @@ -68,27 +68,27 @@ public double calcBinaryDiffusionCoefficient(int i, int j, int method) { /** {@inheritDoc} */ @Override - public double[][] calcDiffusionCoeffisients(int binaryDiffusionCoefficientMethod, + public double[][] calcDiffusionCoefficients(int binaryDiffusionCoefficientMethod, int multicomponentDiffusionMethod) { for (int i = 0; i < phase.getPhase().getNumberOfComponents(); i++) { for (int j = 0; j < phase.getPhase().getNumberOfComponents(); j++) { - binaryDiffusionCoeffisients[i][j] = + binaryDiffusionCoefficients[i][j] = calcBinaryDiffusionCoefficient(i, j, binaryDiffusionCoefficientMethod); - // System.out.println("diff gas " + binaryDiffusionCoeffisients[i][j]); + // System.out.println("diff gas " + binaryDiffusionCoefficients[i][j]); } } if (multicomponentDiffusionMethod == 0) { // ok use full matrix } else if (multicomponentDiffusionMethod == 0) { - // calcEffectiveDiffusionCoeffisients(); + // calcEffectiveDiffusionCoefficients(); } - return binaryDiffusionCoeffisients; + return binaryDiffusionCoefficients; } /** {@inheritDoc} */ @Override - public void calcEffectiveDiffusionCoeffisients() { + public void calcEffectiveDiffusionCoefficients() { double sum = 0; for (int i = 0; i < phase.getPhase().getNumberOfComponents(); i++) { @@ -97,7 +97,7 @@ public void calcEffectiveDiffusionCoeffisients() { if (i == j) { } else { sum += phase.getPhase().getComponents()[j].getx() - / binaryDiffusionCoeffisients[i][j]; + / binaryDiffusionCoefficients[i][j]; } } effectiveDiffusionCoefficient[i] = @@ -108,7 +108,7 @@ public void calcEffectiveDiffusionCoeffisients() { /** {@inheritDoc} */ @Override public double getFickBinaryDiffusionCoefficient(int i, int j) { - return binaryDiffusionCoeffisients[i][j]; + return binaryDiffusionCoefficients[i][j]; } /** {@inheritDoc} */ @@ -125,9 +125,9 @@ public double getMaxwellStefanBinaryDiffusionCoefficient(int i, int j) { * gasPhase.getPhase().getComponents()[i].getx() * * gasPhase.getPhase().getComponents()[i].getdfugdn(j) * * gasPhase.getPhase().getNumberOfMolesInPhase(); if (Double.isNaN(nonIdealCorrection)) - * nonIdealCorrection=1.0; return binaryDiffusionCoeffisients[i][j]/nonIdealCorrection; // + * nonIdealCorrection=1.0; return binaryDiffusionCoefficients[i][j]/nonIdealCorrection; // * shuld be divided by non ideality factor */ - return binaryDiffusionCoeffisients[i][j]; + return binaryDiffusionCoefficients[i][j]; } } diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/gasPhysicalProperties/diffusivity/Diffusivity.java b/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/gasPhysicalProperties/diffusivity/Diffusivity.java index 08260ea11..364b2e8c3 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/gasPhysicalProperties/diffusivity/Diffusivity.java +++ b/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/gasPhysicalProperties/diffusivity/Diffusivity.java @@ -18,7 +18,7 @@ public class Diffusivity extends private static final long serialVersionUID = 1000; static Logger logger = LogManager.getLogger(Diffusivity.class); - double[][] binaryDiffusionCoeffisients, binaryLennardJonesOmega; + double[][] binaryDiffusionCoefficients, binaryLennardJonesOmega; double[] effectiveDiffusionCoefficient; /** @@ -40,7 +40,7 @@ public Diffusivity() {} public Diffusivity( neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface gasPhase) { super(gasPhase); - binaryDiffusionCoeffisients = new double[gasPhase.getPhase() + binaryDiffusionCoefficients = new double[gasPhase.getPhase() .getNumberOfComponents()][gasPhase.getPhase().getNumberOfComponents()]; binaryLennardJonesOmega = new double[gasPhase.getPhase().getNumberOfComponents()][gasPhase .getPhase().getNumberOfComponents()]; @@ -58,10 +58,10 @@ public Diffusivity clone() { logger.error("Cloning failed.", e); } - properties.binaryDiffusionCoeffisients = this.binaryDiffusionCoeffisients.clone(); + properties.binaryDiffusionCoefficients = this.binaryDiffusionCoefficients.clone(); for (int i = 0; i < gasPhase.getPhase().getNumberOfComponents(); i++) { - System.arraycopy(this.binaryDiffusionCoeffisients[i], 0, - properties.binaryDiffusionCoeffisients[i], 0, + System.arraycopy(this.binaryDiffusionCoefficients[i], 0, + properties.binaryDiffusionCoefficients[i], 0, gasPhase.getPhase().getNumberOfComponents()); } return properties; @@ -77,37 +77,37 @@ public double calcBinaryDiffusionCoefficient(int i, int j, int method) { double tempVar2 = gasPhase.getPhase().getTemperature() / binaryEnergyParameter[i][j]; binaryLennardJonesOmega[i][j] = A2 / Math.pow(tempVar2, B2) + C2 / Math.exp(D2 * tempVar2) + E2 / Math.exp(F2 * tempVar2) + G2 / Math.exp(H2 * tempVar2); - binaryDiffusionCoeffisients[i][j] = + binaryDiffusionCoefficients[i][j] = 0.00266 * Math.pow(gasPhase.getPhase().getTemperature(), 1.5) / (gasPhase.getPhase().getPressure() * Math.sqrt(binaryMolecularMass[i][j]) * Math.pow(binaryMolecularDiameter[i][j], 2) * binaryLennardJonesOmega[i][j]); - return binaryDiffusionCoeffisients[i][j] *= 1e-4; + return binaryDiffusionCoefficients[i][j] *= 1e-4; } /** {@inheritDoc} */ @Override - public double[][] calcDiffusionCoeffisients(int binaryDiffusionCoefficientMethod, + public double[][] calcDiffusionCoefficients(int binaryDiffusionCoefficientMethod, int multicomponentDiffusionMethod) { for (int i = 0; i < gasPhase.getPhase().getNumberOfComponents(); i++) { for (int j = i; j < gasPhase.getPhase().getNumberOfComponents(); j++) { - binaryDiffusionCoeffisients[i][j] = + binaryDiffusionCoefficients[i][j] = calcBinaryDiffusionCoefficient(i, j, binaryDiffusionCoefficientMethod); - binaryDiffusionCoeffisients[j][i] = binaryDiffusionCoeffisients[i][j]; + binaryDiffusionCoefficients[j][i] = binaryDiffusionCoefficients[i][j]; } } if (multicomponentDiffusionMethod == 0) { // ok use full matrix } else if (multicomponentDiffusionMethod == 0) { - // calcEffectiveDiffusionCoeffisients(); + // calcEffectiveDiffusionCoefficients(); } - return binaryDiffusionCoeffisients; + return binaryDiffusionCoefficients; } /** {@inheritDoc} */ @Override - public void calcEffectiveDiffusionCoeffisients() { + public void calcEffectiveDiffusionCoefficients() { double sum = 0; for (int i = 0; i < gasPhase.getPhase().getNumberOfComponents(); i++) { @@ -116,7 +116,7 @@ public void calcEffectiveDiffusionCoeffisients() { if (i == j) { } else { sum += gasPhase.getPhase().getComponents()[j].getx() - / binaryDiffusionCoeffisients[i][j]; + / binaryDiffusionCoefficients[i][j]; } } effectiveDiffusionCoefficient[i] = @@ -127,7 +127,7 @@ public void calcEffectiveDiffusionCoeffisients() { /** {@inheritDoc} */ @Override public double getFickBinaryDiffusionCoefficient(int i, int j) { - return binaryDiffusionCoeffisients[i][j]; + return binaryDiffusionCoefficients[i][j]; } /** {@inheritDoc} */ @@ -144,9 +144,9 @@ public double getMaxwellStefanBinaryDiffusionCoefficient(int i, int j) { * gasPhase.getPhase().getComponents()[i].getx() * * gasPhase.getPhase().getComponents()[i].getdfugdn(j) * * gasPhase.getPhase().getNumberOfMolesInPhase(); if (Double.isNaN(nonIdealCorrection)) - * nonIdealCorrection=1.0; return binaryDiffusionCoeffisients[i][j]/nonIdealCorrection; // + * nonIdealCorrection=1.0; return binaryDiffusionCoefficients[i][j]/nonIdealCorrection; // * shuld be divided by non ideality factor */ - return binaryDiffusionCoeffisients[i][j]; + return binaryDiffusionCoefficients[i][j]; } } diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/gasPhysicalProperties/diffusivity/WilkeLeeDiffusivity.java b/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/gasPhysicalProperties/diffusivity/WilkeLeeDiffusivity.java index 089801948..e9890dcd5 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/gasPhysicalProperties/diffusivity/WilkeLeeDiffusivity.java +++ b/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/gasPhysicalProperties/diffusivity/WilkeLeeDiffusivity.java @@ -11,7 +11,7 @@ public class WilkeLeeDiffusivity extends Diffusivity { private static final long serialVersionUID = 1000; - double[][] binaryDiffusionCoeffisients, binaryLennardJonesOmega; + double[][] binaryDiffusionCoefficients, binaryLennardJonesOmega; /** *

@@ -32,7 +32,7 @@ public WilkeLeeDiffusivity() {} public WilkeLeeDiffusivity( neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface gasPhase) { super(gasPhase); - binaryDiffusionCoeffisients = new double[gasPhase.getPhase() + binaryDiffusionCoefficients = new double[gasPhase.getPhase() .getNumberOfComponents()][gasPhase.getPhase().getNumberOfComponents()]; binaryLennardJonesOmega = new double[gasPhase.getPhase().getNumberOfComponents()][gasPhase .getPhase().getNumberOfComponents()]; @@ -50,11 +50,11 @@ public double calcBinaryDiffusionCoefficient(int i, int j, int method) { double tempVar2 = gasPhase.getPhase().getTemperature() / binaryEnergyParameter[i][j]; binaryLennardJonesOmega[i][j] = A2 / Math.pow(tempVar2, B2) + C2 / Math.exp(D2 * tempVar2) + E2 / Math.exp(F2 * tempVar2) + G2 / Math.exp(H2 * tempVar2); - binaryDiffusionCoeffisients[i][j] = (3.03 - (0.98 / Math.sqrt(binaryMolecularMass[i][j])) + binaryDiffusionCoefficients[i][j] = (3.03 - (0.98 / Math.sqrt(binaryMolecularMass[i][j])) * 1.0e-3 * Math.pow(gasPhase.getPhase().getTemperature(), 1.5)) / (gasPhase.getPhase().getPressure() * Math.sqrt(binaryMolecularMass[i][j]) * Math.pow(binaryMolecularDiameter[i][j], 2.0) * binaryLennardJonesOmega[i][j]); - return binaryDiffusionCoeffisients[i][j] * 1e-4; + return binaryDiffusionCoefficients[i][j] * 1e-4; } } diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/diffusivity/AmineDiffusivity.java b/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/diffusivity/AmineDiffusivity.java index 69be58eab..54e949e89 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/diffusivity/AmineDiffusivity.java +++ b/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/diffusivity/AmineDiffusivity.java @@ -38,8 +38,8 @@ public AmineDiffusivity( /** {@inheritDoc} */ @Override - public void calcEffectiveDiffusionCoeffisients() { - super.calcEffectiveDiffusionCoeffisients(); + public void calcEffectiveDiffusionCoefficients() { + super.calcEffectiveDiffusionCoefficients(); double co2waterdiff = 0.03389 * Math.exp(-2213.7 / liquidPhase.getPhase().getTemperature()) * 1e-4; // Tammi // (1994) @@ -68,7 +68,7 @@ public void calcEffectiveDiffusionCoeffisients() { /** {@inheritDoc} */ @Override public double calcBinaryDiffusionCoefficient(int i, int j, int method) { - calcEffectiveDiffusionCoeffisients(); + calcEffectiveDiffusionCoefficients(); if (liquidPhase.getPhase().getComponent(i).getComponentName().equals("MDEA")) { return effectiveDiffusionCoefficient[liquidPhase.getPhase().getComponent("MDEA") .getComponentNumber()]; @@ -80,20 +80,20 @@ public double calcBinaryDiffusionCoefficient(int i, int j, int method) { /** {@inheritDoc} */ @Override - public double[][] calcDiffusionCoeffisients(int binaryDiffusionCoefficientMethod, + public double[][] calcDiffusionCoefficients(int binaryDiffusionCoefficientMethod, int multicomponentDiffusionMethod) { - calcEffectiveDiffusionCoeffisients(); + calcEffectiveDiffusionCoefficients(); for (int i = 0; i < liquidPhase.getPhase().getNumberOfComponents(); i++) { for (int j = 0; j < liquidPhase.getPhase().getNumberOfComponents(); j++) { if (liquidPhase.getPhase().getComponent(i).getComponentName().equals("MDEA")) { - binaryDiffusionCoeffisients[i][j] = effectiveDiffusionCoefficient[liquidPhase + binaryDiffusionCoefficients[i][j] = effectiveDiffusionCoefficient[liquidPhase .getPhase().getComponent("MDEA").getComponentNumber()]; } else { - binaryDiffusionCoeffisients[i][j] = effectiveDiffusionCoefficient[liquidPhase + binaryDiffusionCoefficients[i][j] = effectiveDiffusionCoefficient[liquidPhase .getPhase().getComponent("CO2").getComponentNumber()]; } } } - return binaryDiffusionCoeffisients; + return binaryDiffusionCoefficients; } } diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/diffusivity/CO2water.java b/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/diffusivity/CO2water.java index e254532f1..b7532c299 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/diffusivity/CO2water.java +++ b/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/diffusivity/CO2water.java @@ -36,11 +36,11 @@ public CO2water( /** {@inheritDoc} */ @Override public double calcBinaryDiffusionCoefficient(int i, int j, int method) { - binaryDiffusionCoeffisients[i][j] = + binaryDiffusionCoefficients[i][j] = 0.03389 * Math.exp(-2213.7 / liquidPhase.getPhase().getTemperature()) * 1e-4; // Tammi // (1994) // - // Pcheco - return binaryDiffusionCoeffisients[i][j]; + return binaryDiffusionCoefficients[i][j]; } } diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/diffusivity/Diffusivity.java b/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/diffusivity/Diffusivity.java index d9c463e00..c98bb8184 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/diffusivity/Diffusivity.java +++ b/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/diffusivity/Diffusivity.java @@ -14,7 +14,7 @@ abstract class Diffusivity extends private static final long serialVersionUID = 1000; static Logger logger = LogManager.getLogger(Diffusivity.class); - double[][] binaryDiffusionCoeffisients; + double[][] binaryDiffusionCoefficients; double[] effectiveDiffusionCoefficient; /** @@ -36,7 +36,7 @@ public Diffusivity() {} public Diffusivity( neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface liquidPhase) { super(liquidPhase); - binaryDiffusionCoeffisients = new double[liquidPhase.getPhase() + binaryDiffusionCoefficients = new double[liquidPhase.getPhase() .getNumberOfComponents()][liquidPhase.getPhase().getNumberOfComponents()]; effectiveDiffusionCoefficient = new double[liquidPhase.getPhase().getNumberOfComponents()]; } @@ -52,10 +52,10 @@ public Diffusivity clone() { logger.error("Cloning failed.", e); } - properties.binaryDiffusionCoeffisients = this.binaryDiffusionCoeffisients.clone(); + properties.binaryDiffusionCoefficients = this.binaryDiffusionCoefficients.clone(); for (int i = 0; i < liquidPhase.getPhase().getNumberOfComponents(); i++) { - System.arraycopy(this.binaryDiffusionCoeffisients[i], 0, - properties.binaryDiffusionCoeffisients[i], 0, + System.arraycopy(this.binaryDiffusionCoefficients[i], 0, + properties.binaryDiffusionCoefficients[i], 0, liquidPhase.getPhase().getNumberOfComponents()); } return properties; @@ -63,11 +63,11 @@ public Diffusivity clone() { /** {@inheritDoc} */ @Override - public double[][] calcDiffusionCoeffisients(int binaryDiffusionCoefficientMethod, + public double[][] calcDiffusionCoefficients(int binaryDiffusionCoefficientMethod, int multicomponentDiffusionMethod) { for (int i = 0; i < liquidPhase.getPhase().getNumberOfComponents(); i++) { for (int j = 0; j < liquidPhase.getPhase().getNumberOfComponents(); j++) { - binaryDiffusionCoeffisients[i][j] = + binaryDiffusionCoefficients[i][j] = calcBinaryDiffusionCoefficient(i, j, binaryDiffusionCoefficientMethod); } } @@ -76,20 +76,20 @@ public double[][] calcDiffusionCoeffisients(int binaryDiffusionCoefficientMethod for (int i = 0; i < liquidPhase.getPhase().getNumberOfComponents(); i++) { for (int j = 0; j < liquidPhase.getPhase().getNumberOfComponents(); j++) { if (i != j) { - binaryDiffusionCoeffisients[i][j] = Math.pow(binaryDiffusionCoeffisients[i][j], + binaryDiffusionCoefficients[i][j] = Math.pow(binaryDiffusionCoefficients[i][j], liquidPhase.getPhase().getComponents()[j].getx()) - * Math.pow(binaryDiffusionCoeffisients[j][i], + * Math.pow(binaryDiffusionCoefficients[j][i], liquidPhase.getPhase().getComponents()[i].getx()); } - // System.out.println("diff liq " + binaryDiffusionCoeffisients[i][j] ); + // System.out.println("diff liq " + binaryDiffusionCoefficients[i][j] ); } } - return binaryDiffusionCoeffisients; + return binaryDiffusionCoefficients; } /** {@inheritDoc} */ @Override - public void calcEffectiveDiffusionCoeffisients() { + public void calcEffectiveDiffusionCoefficients() { double sum = 0; for (int i = 0; i < liquidPhase.getPhase().getNumberOfComponents(); i++) { @@ -98,7 +98,7 @@ public void calcEffectiveDiffusionCoeffisients() { if (i == j) { } else { sum += liquidPhase.getPhase().getComponents()[j].getx() - / binaryDiffusionCoeffisients[i][j]; + / binaryDiffusionCoefficients[i][j]; } } effectiveDiffusionCoefficient[i] = @@ -109,7 +109,7 @@ public void calcEffectiveDiffusionCoeffisients() { /** {@inheritDoc} */ @Override public double getMaxwellStefanBinaryDiffusionCoefficient(int i, int j) { - return binaryDiffusionCoeffisients[i][j]; + return binaryDiffusionCoefficients[i][j]; } /** {@inheritDoc} */ @@ -128,7 +128,7 @@ public double getFickBinaryDiffusionCoefficient(int i, int j) { if (Double.isNaN(nonIdealCorrection)) { nonIdealCorrection = 1.0; } - return binaryDiffusionCoeffisients[i][j] * nonIdealCorrection; // shuld be divided by non + return binaryDiffusionCoefficients[i][j] * nonIdealCorrection; // shuld be divided by non // ideality factor } } diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/diffusivity/SiddiqiLucasMethod.java b/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/diffusivity/SiddiqiLucasMethod.java index 5b29d2f48..60932acc7 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/diffusivity/SiddiqiLucasMethod.java +++ b/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/diffusivity/SiddiqiLucasMethod.java @@ -39,14 +39,14 @@ public double calcBinaryDiffusionCoefficient(int i, int j, int method) { // method - estimation method // if(method==? then) // remember this is the Maxwell-Stefan diffusion coefficients - binaryDiffusionCoeffisients[i][j] = 1.0e-4 * 2.98e-7 + binaryDiffusionCoefficients[i][j] = 1.0e-4 * 2.98e-7 * Math.pow(liquidPhase.getPureComponentViscosity(j), -1.026) * Math.pow( 1.0 / liquidPhase.getPhase().getComponents()[i].getNormalLiquidDensity() * liquidPhase.getPhase().getComponents()[i].getMolarMass() * 1000, -0.5473) * liquidPhase.getPhase().getTemperature(); - return binaryDiffusionCoeffisients[i][j]; + return binaryDiffusionCoefficients[i][j]; } // non-aqueous correlation @@ -64,7 +64,7 @@ public double calcBinaryDiffusionCoefficient2(int i, int j, int method) { // method - estimation method // if(method==? then) // remember this is the Maxwell-Stefan diffusion coefficients - binaryDiffusionCoeffisients[i][j] = 1.0e-4 * 9.89e-8 + binaryDiffusionCoefficients[i][j] = 1.0e-4 * 9.89e-8 * Math.pow(liquidPhase.getPureComponentViscosity(j), -0.907) * Math.pow( 1.0 / liquidPhase.getPhase().getComponents()[i].getNormalLiquidDensity() @@ -75,6 +75,6 @@ public double calcBinaryDiffusionCoefficient2(int i, int j, int method) { * liquidPhase.getPhase().getComponents()[j].getMolarMass() * 1000, 0.265) * liquidPhase.getPhase().getTemperature(); - return binaryDiffusionCoeffisients[i][j]; + return binaryDiffusionCoefficients[i][j]; } } diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/methodInterface/DiffusivityInterface.java b/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/methodInterface/DiffusivityInterface.java index c15d8c36e..68b5ef73e 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/methodInterface/DiffusivityInterface.java +++ b/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/methodInterface/DiffusivityInterface.java @@ -3,7 +3,9 @@ import neqsim.thermo.ThermodynamicConstantsInterface; /** - *

DiffusivityInterface interface.

+ *

+ * DiffusivityInterface interface. + *

* * @author Even Solbraa * @version $Id: $Id @@ -11,7 +13,9 @@ public interface DiffusivityInterface extends ThermodynamicConstantsInterface, neqsim.physicalProperties.physicalPropertyMethods.PhysicalPropertyMethodInterface { /** - *

calcBinaryDiffusionCoefficient.

+ *

+ * calcBinaryDiffusionCoefficient. + *

* * @param i a int * @param j a int @@ -21,17 +25,21 @@ public interface DiffusivityInterface extends ThermodynamicConstantsInterface, public double calcBinaryDiffusionCoefficient(int i, int j, int method); /** - *

calcDiffusionCoeffisients.

+ *

+ * calcDiffusionCoefficients. + *

* * @param binaryDiffusionCoefficientMethod a int * @param multicomponentDiffusionMethod a int * @return an array of {@link double} objects */ - public double[][] calcDiffusionCoeffisients(int binaryDiffusionCoefficientMethod, + public double[][] calcDiffusionCoefficients(int binaryDiffusionCoefficientMethod, int multicomponentDiffusionMethod); /** - *

getFickBinaryDiffusionCoefficient.

+ *

+ * getFickBinaryDiffusionCoefficient. + *

* * @param i a int * @param j a int @@ -40,7 +48,9 @@ public double[][] calcDiffusionCoeffisients(int binaryDiffusionCoefficientMethod public double getFickBinaryDiffusionCoefficient(int i, int j); /** - *

getMaxwellStefanBinaryDiffusionCoefficient.

+ *

+ * getMaxwellStefanBinaryDiffusionCoefficient. + *

* * @param i a int * @param j a int @@ -49,7 +59,9 @@ public double[][] calcDiffusionCoeffisients(int binaryDiffusionCoefficientMethod public double getMaxwellStefanBinaryDiffusionCoefficient(int i, int j); /** - *

getEffectiveDiffusionCoefficient.

+ *

+ * getEffectiveDiffusionCoefficient. + *

* * @param i a int * @return a double @@ -57,9 +69,11 @@ public double[][] calcDiffusionCoeffisients(int binaryDiffusionCoefficientMethod public double getEffectiveDiffusionCoefficient(int i); /** - *

calcEffectiveDiffusionCoeffisients.

+ *

+ * calcEffectiveDiffusionCoefficients. + *

*/ - public void calcEffectiveDiffusionCoeffisients(); + public void calcEffectiveDiffusionCoefficients(); /** {@inheritDoc} */ @Override diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/solidPhysicalProperties/diffusivity/Diffusivity.java b/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/solidPhysicalProperties/diffusivity/Diffusivity.java index afa08a266..d12ded77b 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/solidPhysicalProperties/diffusivity/Diffusivity.java +++ b/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/solidPhysicalProperties/diffusivity/Diffusivity.java @@ -18,7 +18,7 @@ public class Diffusivity extends private static final long serialVersionUID = 1000; static Logger logger = LogManager.getLogger(Diffusivity.class); - double[][] binaryDiffusionCoeffisients; + double[][] binaryDiffusionCoefficients; double[] effectiveDiffusionCoefficient; /** @@ -40,7 +40,7 @@ public Diffusivity() {} public Diffusivity( neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface solidPhase) { super(solidPhase); - binaryDiffusionCoeffisients = new double[solidPhase.getPhase() + binaryDiffusionCoefficients = new double[solidPhase.getPhase() .getNumberOfComponents()][solidPhase.getPhase().getNumberOfComponents()]; effectiveDiffusionCoefficient = new double[solidPhase.getPhase().getNumberOfComponents()]; } @@ -56,10 +56,10 @@ public Diffusivity clone() { logger.error("Cloning failed.", e); } - properties.binaryDiffusionCoeffisients = this.binaryDiffusionCoeffisients.clone(); + properties.binaryDiffusionCoefficients = this.binaryDiffusionCoefficients.clone(); for (int i = 0; i < solidPhase.getPhase().getNumberOfComponents(); i++) { - System.arraycopy(this.binaryDiffusionCoeffisients[i], 0, - properties.binaryDiffusionCoeffisients[i], 0, + System.arraycopy(this.binaryDiffusionCoefficients[i], 0, + properties.binaryDiffusionCoefficients[i], 0, solidPhase.getPhase().getNumberOfComponents()); } return properties; @@ -67,19 +67,19 @@ public Diffusivity clone() { /** {@inheritDoc} */ @Override - public double[][] calcDiffusionCoeffisients(int binaryDiffusionCoefficientMethod, + public double[][] calcDiffusionCoefficients(int binaryDiffusionCoefficientMethod, int multicomponentDiffusionMethod) { - return binaryDiffusionCoeffisients; + return binaryDiffusionCoefficients; } /** {@inheritDoc} */ @Override - public void calcEffectiveDiffusionCoeffisients() {} + public void calcEffectiveDiffusionCoefficients() {} /** {@inheritDoc} */ @Override public double getMaxwellStefanBinaryDiffusionCoefficient(int i, int j) { - return binaryDiffusionCoeffisients[i][j]; + return binaryDiffusionCoefficients[i][j]; } /** {@inheritDoc} */ @@ -92,7 +92,7 @@ public double getEffectiveDiffusionCoefficient(int i) { @Override public double getFickBinaryDiffusionCoefficient(int i, int j) { double nonIdealCorrection = 1.0; - return binaryDiffusionCoeffisients[i][j] * nonIdealCorrection; // shuld be divided by non + return binaryDiffusionCoefficients[i][j] * nonIdealCorrection; // shuld be divided by non // ideality factor } diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertySystem/PhysicalProperties.java b/src/main/java/neqsim/physicalProperties/physicalPropertySystem/PhysicalProperties.java index 1def48c38..d2e95208c 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertySystem/PhysicalProperties.java +++ b/src/main/java/neqsim/physicalProperties/physicalPropertySystem/PhysicalProperties.java @@ -245,9 +245,9 @@ public void init(PhaseInterface phase) { density = densityCalc.calcDensity(); viscosity = viscosityCalc.calcViscosity(); kinematicViscosity = this.calcKinematicViscosity(); - diffusivityCalc.calcDiffusionCoeffisients(binaryDiffusionCoefficientMethod, + diffusivityCalc.calcDiffusionCoefficients(binaryDiffusionCoefficientMethod, multicomponentDiffusionMethod); - // diffusivityCalc.calcEffectiveDiffusionCoeffisients(); + // diffusivityCalc.calcEffectiveDiffusionCoefficients(); conductivity = conductivityCalc.calcConductivity(); } catch (Exception e) { // might be a chance that entering here ends in an infinite loop... @@ -330,12 +330,6 @@ public double getKinematicViscosity() { return kinematicViscosity; } - /** {@inheritDoc} */ - @Override - public double getDiffusionCoeffisient(int i, int j) { - return diffusivityCalc.getMaxwellStefanBinaryDiffusionCoefficient(i, j); - } - /** *

* getDiffusionCoefficient. @@ -359,7 +353,7 @@ public double getDiffusionCoefficient(String comp1, String comp2) { /** {@inheritDoc} */ @Override - public double getFickDiffusionCoeffisient(int i, int j) { + public double getFickDiffusionCoefficient(int i, int j) { return diffusivityCalc.getFickBinaryDiffusionCoefficient(i, j); } @@ -367,7 +361,7 @@ public double getFickDiffusionCoeffisient(int i, int j) { @Override public void calcEffectiveDiffusionCoefficients() { this.init(phase); - diffusivityCalc.calcEffectiveDiffusionCoeffisients(); + diffusivityCalc.calcEffectiveDiffusionCoefficients(); } /** {@inheritDoc} */ diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertySystem/PhysicalPropertiesInterface.java b/src/main/java/neqsim/physicalProperties/physicalPropertySystem/PhysicalPropertiesInterface.java index 480b9fd32..da8c2dbbc 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertySystem/PhysicalPropertiesInterface.java +++ b/src/main/java/neqsim/physicalProperties/physicalPropertySystem/PhysicalPropertiesInterface.java @@ -180,14 +180,14 @@ public void setMixingRule( /** *

- * getDiffusionCoeffisient. + * getDiffusionCoefficient. *

* * @param i a int * @param j a int * @return a double */ - public double getDiffusionCoeffisient(int i, int j); + public double getDiffusionCoefficient(int i, int j); /** *

@@ -208,14 +208,14 @@ public void setMixingRule( /** *

- * getFickDiffusionCoeffisient. + * getFickDiffusionCoefficient. *

* * @param i a int * @param j a int * @return a double */ - public double getFickDiffusionCoeffisient(int i, int j); + public double getFickDiffusionCoefficient(int i, int j); /** *

diff --git a/src/main/java/neqsim/physicalProperties/util/parameterFitting/binaryComponentParameterFitting/diffusivity/DiffusivityFunction.java b/src/main/java/neqsim/physicalProperties/util/parameterFitting/binaryComponentParameterFitting/diffusivity/DiffusivityFunction.java index f4a80f8f9..feab43e19 100644 --- a/src/main/java/neqsim/physicalProperties/util/parameterFitting/binaryComponentParameterFitting/diffusivity/DiffusivityFunction.java +++ b/src/main/java/neqsim/physicalProperties/util/parameterFitting/binaryComponentParameterFitting/diffusivity/DiffusivityFunction.java @@ -23,7 +23,7 @@ public DiffusivityFunction() {} public double calcValue(double[] dependentValues) { system.init(1); system.initPhysicalProperties(); - return system.getPhase(1).getPhysicalProperties().getDiffusionCoeffisient(0, 1) * 1e9; + return system.getPhase(1).getPhysicalProperties().getDiffusionCoefficient(0, 1) * 1e9; } /** {@inheritDoc} */ diff --git a/src/main/java/neqsim/processSimulation/processEquipment/absorber/SimpleTEGAbsorber.java b/src/main/java/neqsim/processSimulation/processEquipment/absorber/SimpleTEGAbsorber.java index 7494f5f93..a1161086c 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/absorber/SimpleTEGAbsorber.java +++ b/src/main/java/neqsim/processSimulation/processEquipment/absorber/SimpleTEGAbsorber.java @@ -286,12 +286,12 @@ public double calcY0() { // double xrel = // mixedStream.getFluid().getPhase(0).getComponent("water").getx()/solventInStream.getFluid().getPhase(0).getComponent("water").getx(); // double y0 = - // xrel*fugacityWaterLiquid/(mixedStream.getFluid().getPhase(0).getComponent("water").getFugasityCoefficient()*mixedStream.getFluid().getPressure()); + // xrel*fugacityWaterLiquid/(mixedStream.getFluid().getPhase(0).getComponent("water").getFugacityCoefficient()*mixedStream.getFluid().getPressure()); double fugCoefRef = mixedStream.getThermoSystem().getPhase(1).getComponent("water") - .getFugasityCoefficient(); + .getFugacityCoefficient(); double y0 = solventInStream.getFluid().getPhase(0).getComponent("water").getx() * fugCoefRef / (mixedStream.getThermoSystem().getPhase(0).getComponent("water") - .getFugasityCoefficient()); + .getFugacityCoefficient()); return y0; } diff --git a/src/main/java/neqsim/processSimulation/processEquipment/distillation/DistillationColumn.java b/src/main/java/neqsim/processSimulation/processEquipment/distillation/DistillationColumn.java index 630f4b0fc..36431866f 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/distillation/DistillationColumn.java +++ b/src/main/java/neqsim/processSimulation/processEquipment/distillation/DistillationColumn.java @@ -25,7 +25,7 @@ public class DistillationColumn extends ProcessEquipmentBaseClass implements Dis protected ArrayList trays = new ArrayList(0); double condenserCoolingDuty = 10.0; private double reboilerTemperature = 273.15; - private double condeserTemperature = 270.15; + private double condenserTemperature = 270.15; double topTrayPressure = -1.0, bottomTrayPressure = -1.0; int numberOfTrays = 1; private int feedTrayNumber = 1; @@ -123,22 +123,22 @@ public void init() { // ((Runnable) trays.get(numberOfTrays - 1)).run(); ((Runnable) trays.get(0)).run(); - condeserTemperature = + condenserTemperature = ((MixerInterface) trays.get(numberOfTrays - 1)).getThermoSystem().getTemperature(); reboilerTemperature = ((MixerInterface) trays.get(0)).getThermoSystem().getTemperature(); - // double deltaTemp = (reboilerTemperature - condeserTemperature) / (numberOfTrays * 1.0); + // double deltaTemp = (reboilerTemperature - condenserTemperature) / (numberOfTrays * 1.0); double feedTrayTemperature = getTray(getFeedTrayNumber()).getThermoSystem().getTemperature(); - double deltaTempCondeser = (feedTrayTemperature - condeserTemperature) + double deltaTempCondenser = (feedTrayTemperature - condenserTemperature) / (numberOfTrays * 1.0 - feedTrayNumber - 1); double deltaTempReboiler = (reboilerTemperature - feedTrayTemperature) / (feedTrayNumber * 1.0); double delta = 0; for (int i = feedTrayNumber + 1; i < numberOfTrays; i++) { - delta += deltaTempCondeser; + delta += deltaTempCondenser; ((Mixer) trays.get(i)).setTemperature( getTray(getFeedTrayNumber()).getThermoSystem().getTemperature() - delta); } @@ -239,12 +239,12 @@ public void setNumberOfTrays(int number) { /** *

- * setTopCondeserDuty. + * setTopCondenserDuty. *

* * @param duty a double */ - public void setTopCondeserDuty(double duty) { + public void setTopCondenserDuty(double duty) { condenserCoolingDuty = duty; } @@ -483,7 +483,7 @@ public static void main(String[] args) { column.displayResult(); System.out.println("reboiler duty" + ((Reboiler) column.getReboiler()).getDuty()); - System.out.println("condeser duty" + ((Condenser) column.getCondenser()).getDuty()); + System.out.println("condenser duty" + ((Condenser) column.getCondenser()).getDuty()); } /** @@ -535,10 +535,10 @@ public void setReboilerTemperature(double reboilerTemperature) { * getCondenserTemperature. *

* - * @return the condeserTemperature + * @return the condenserTemperature */ public double getCondenserTemperature() { - return condeserTemperature; + return condenserTemperature; } /** @@ -546,10 +546,10 @@ public double getCondenserTemperature() { * setCondenserTemperature. *

* - * @param condeserTemperature the condeserTemperature to set + * @param condenserTemperature the condenserTemperature to set */ - public void setCondenserTemperature(double condeserTemperature) { - this.condeserTemperature = condeserTemperature; + public void setCondenserTemperature(double condenserTemperature) { + this.condenserTemperature = condenserTemperature; } /** diff --git a/src/main/java/neqsim/processSimulation/processEquipment/separator/sectionType/SeparatorSection.java b/src/main/java/neqsim/processSimulation/processEquipment/separator/sectionType/SeparatorSection.java index 0a8faa5e2..66002db94 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/separator/sectionType/SeparatorSection.java +++ b/src/main/java/neqsim/processSimulation/processEquipment/separator/sectionType/SeparatorSection.java @@ -118,7 +118,7 @@ public void setCalcEfficiency(boolean calcEfficiency) { * @return a double */ public double getMinimumLiquidSealHeight() { - return getPresureDrop() * 1e5 / neqsim.thermo.ThermodynamicConstantsInterface.gravity + return getPressureDrop() * 1e5 / neqsim.thermo.ThermodynamicConstantsInterface.gravity / (getSeparator().getThermoSystem().getPhase(1).getPhysicalProperties().getDensity() - getSeparator().getThermoSystem().getPhase(0).getPhysicalProperties() .getDensity()); @@ -126,24 +126,24 @@ public double getMinimumLiquidSealHeight() { /** *

- * getPresureDrop. + * getPressureDrop. *

* - * @return the presureDrop + * @return the pressureDrop */ - public double getPresureDrop() { + public double getPressureDrop() { return pressureDrop; } /** *

- * setPresureDrop. + * setPressureDrop. *

* - * @param presureDrop the presureDrop to set + * @param pressureDrop the pressureDrop to set */ - public void setPresureDrop(double presureDrop) { - this.pressureDrop = presureDrop; + public void setPressureDrop(double pressureDrop) { + this.pressureDrop = pressureDrop; } /** diff --git a/src/main/java/neqsim/processSimulation/processSystem/processModules/GlycolDehydrationlModule.java b/src/main/java/neqsim/processSimulation/processSystem/processModules/GlycolDehydrationlModule.java index 277dd5795..5822a2032 100644 --- a/src/main/java/neqsim/processSimulation/processSystem/processModules/GlycolDehydrationlModule.java +++ b/src/main/java/neqsim/processSimulation/processSystem/processModules/GlycolDehydrationlModule.java @@ -353,9 +353,9 @@ public void calcDesign() { double yN = gasStreamToAbsorber.getThermoSystem().getPhase(0).getComponent("water").getx(); // Estimates K value - double K = calcKglycol();// gasStreamToAbsorber.getThermoSystem().getPhase(1).getComponent("water").getFugasityCoefficient() + double K = calcKglycol();// gasStreamToAbsorber.getThermoSystem().getPhase(1).getComponent("water").getFugacityCoefficient() // / - // gasStreamToAbsorber.getThermoSystem().getPhase(0).getComponent("water").getFugasityCoefficient(); + // gasStreamToAbsorber.getThermoSystem().getPhase(0).getComponent("water").getFugacityCoefficient(); gasStreamFromAbsorber = gasStreamToAbsorber.clone(); // gasStreamFromAbsorber.getThermoSystem().addComponent("water", 1.0); gasStreamFromAbsorber.getThermoSystem().setTemperature(waterDewPontSpecification); diff --git a/src/main/java/neqsim/statistics/parameterFitting/StatisticsInterface.java b/src/main/java/neqsim/statistics/parameterFitting/StatisticsInterface.java index 7354fbb44..ca40abed2 100644 --- a/src/main/java/neqsim/statistics/parameterFitting/StatisticsInterface.java +++ b/src/main/java/neqsim/statistics/parameterFitting/StatisticsInterface.java @@ -101,7 +101,7 @@ public interface StatisticsInterface { * runMonteCarloSimulation. *

* - * @param numerOfRuns a int + * @param numberOfRuns a int */ - public void runMonteCarloSimulation(int numerOfRuns); + public void runMonteCarloSimulation(int numberOfRuns); } diff --git a/src/main/java/neqsim/thermo/ThermodynamicModelTest.java b/src/main/java/neqsim/thermo/ThermodynamicModelTest.java index d79bfe1c2..2440f873d 100644 --- a/src/main/java/neqsim/thermo/ThermodynamicModelTest.java +++ b/src/main/java/neqsim/thermo/ThermodynamicModelTest.java @@ -48,45 +48,45 @@ public ThermodynamicModelTest(SystemInterface system) { public void runTest() { // system.init(0); system.init(3); - logger.info("testing fugasitycoefs..." + checkFugasityCoeffisients()); - logger.info("testing fugasity der composition..." + checkFugasityCoeffisientsDn()); - logger.info("testing fugasity der composition2..." + checkFugasityCoeffisientsDn2()); - logger.info("testing fugasity der pressure..." + checkFugasityCoeffisientsDP()); - logger.info("testing fugasity der temperature..." + checkFugasityCoeffisientsDT()); + logger.info("testing fugacitycoefs..." + checkFugacityCoefficients()); + logger.info("testing fugacity der composition..." + checkFugacityCoefficientsDn()); + logger.info("testing fugacity der composition2..." + checkFugacityCoefficientsDn2()); + logger.info("testing fugacity der pressure..." + checkFugacityCoefficientsDP()); + logger.info("testing fugacity der temperature..." + checkFugacityCoefficientsDT()); logger.info("comparing to numerical derivatives..." + checkNumerically()); - // System.out.println("testing fugasitycoefs..." + checkFugasityCoeffisients()); - // System.out.println("testing fugasity der composition..." + - // checkFugasityCoeffisientsDn()); - // System.out.println("testing fugasity der composition2..." + - // checkFugasityCoeffisientsDn2()); - // System.out.println("testing fugasity der pressure..." + - // checkFugasityCoeffisientsDP()); - // System.out.println("testing fugasity der temperature..." + - // checkFugasityCoeffisientsDT()); + // System.out.println("testing fugacitycoefs..." + checkFugacityCoefficients()); + // System.out.println("testing fugacity der composition..." + + // checkFugacityCoefficientsDn()); + // System.out.println("testing fugacity der composition2..." + + // checkFugacityCoefficientsDn2()); + // System.out.println("testing fugacity der pressure..." + + // checkFugacityCoefficientsDP()); + // System.out.println("testing fugacity der temperature..." + + // checkFugacityCoefficientsDT()); // System.out.println("comparing to numerical derivatives..." + // checkNumerically()); } /** *

- * checkFugasityCoeffisients. + * checkFugacityCoefficients. *

* * @return a boolean */ - public boolean checkFugasityCoeffisients() { + public boolean checkFugacityCoefficients() { double temp1 = 0, temp2 = 0; for (int i = 0; i < system.getPhases()[0].getNumberOfComponents(); i++) { temp1 += system.getPhases()[0].getComponents()[i].getNumberOfMolesInPhase() - * Math.log(system.getPhases()[0].getComponents()[i].getFugasityCoeffisient()); + * Math.log(system.getPhases()[0].getComponents()[i].getFugacityCoefficient()); temp2 += system.getPhases()[1].getComponents()[i].getNumberOfMolesInPhase() - * Math.log(system.getPhases()[1].getComponents()[i].getFugasityCoeffisient()); + * Math.log(system.getPhases()[1].getComponents()[i].getFugacityCoefficient()); } - logger.info("Testing fugasity coefficients..................."); + logger.info("Testing fugacity coefficients..................."); logger.info("Total fug gas : " + temp1); logger.info("Total fug liq : " + temp2); - // System.out.println("Testing fugasity coefficients..................."); + // System.out.println("Testing fugacity coefficients..................."); // System.out.println("Total fug gas : " + temp1); // System.out.println("Total fug liq : " + temp2); temp1 -= system.getPhases()[0].getGresTP() / (R * system.getTemperature()); @@ -101,12 +101,12 @@ public boolean checkFugasityCoeffisients() { /** *

- * checkFugasityCoeffisientsDn. + * checkFugacityCoefficientsDn. *

* * @return a boolean */ - public boolean checkFugasityCoeffisientsDn() { + public boolean checkFugacityCoefficientsDn() { double temp1 = 0, temp2 = 0; double sum = 0; @@ -114,9 +114,9 @@ public boolean checkFugasityCoeffisientsDn() { temp1 = 0; temp2 = 0; // temp1 += - // Math.log(system.getPhases()[0].getComponents()[j].getFugasityCoeffisient()); + // Math.log(system.getPhases()[0].getComponents()[j].getFugacityCoefficient()); // temp2 += - // Math.log(system.getPhases()[1].getComponents()[j].getFugasityCoeffisient()); + // Math.log(system.getPhases()[1].getComponents()[j].getFugacityCoefficient()); for (int i = 0; i < system.getPhases()[0].getNumberOfComponents(); i++) { temp1 += system.getPhases()[0].getComponents()[i].getNumberOfMolesInPhase() * system.getPhases()[0].getComponents()[i].getdfugdn(j); @@ -131,9 +131,9 @@ public boolean checkFugasityCoeffisientsDn() { // system.getPhases()[0].getComponents()[j].getComponentName()); // System.out.println("test fugdn liq : " + j + " " + temp2); } - logger.info("Testing composition derivatives of fugasity coefficients..................."); + logger.info("Testing composition derivatives of fugacity coefficients..................."); logger.info("Diffference : " + sum); - // System.out.println("Testing composition derivatives of fugasity + // System.out.println("Testing composition derivatives of fugacity // coefficients..................."); // System.out.println("Diffference : " + sum); return Math.abs(sum) < 1e-10; @@ -141,12 +141,12 @@ public boolean checkFugasityCoeffisientsDn() { /** *

- * checkFugasityCoeffisientsDn2. + * checkFugacityCoefficientsDn2. *

* * @return a boolean */ - public boolean checkFugasityCoeffisientsDn2() { + public boolean checkFugacityCoefficientsDn2() { // boolean test1 = false, test2 = false; double temp1 = 0, temp2 = 0; double sum = 0; @@ -155,9 +155,9 @@ public boolean checkFugasityCoeffisientsDn2() { temp1 = 0; temp2 = 0; // temp1 += - // Math.log(system.getPhases()[0].getComponents()[j].getFugasityCoeffisient()); + // Math.log(system.getPhases()[0].getComponents()[j].getFugacityCoefficient()); // temp2 += - // Math.log(system.getPhases()[1].getComponents()[j].getFugasityCoeffisient()); + // Math.log(system.getPhases()[1].getComponents()[j].getFugacityCoefficient()); for (int i = 0; i < system.getPhases()[0].getNumberOfComponents(); i++) { temp1 += system.getPhases()[0].getComponents()[i].getdfugdn(j) - system.getPhases()[0].getComponents()[j].getdfugdn(i); @@ -168,9 +168,9 @@ public boolean checkFugasityCoeffisientsDn2() { // System.out.println("test fugdn gas : " + j + " " + temp1); // System.out.println("test fugdn liq : " + j + " " + temp2); } - logger.info("Testing composition derivatives2 of fugasity coefficients..................."); + logger.info("Testing composition derivatives2 of fugacity coefficients..................."); logger.info("Diffference : " + sum); - // System.out.println("Testing composition derivatives2 of fugasity + // System.out.println("Testing composition derivatives2 of fugacity // coefficients..................."); // System.out.println("Diffference : " + sum); @@ -179,12 +179,12 @@ public boolean checkFugasityCoeffisientsDn2() { /** *

- * checkFugasityCoeffisientsDP. + * checkFugacityCoefficientsDP. *

* * @return a boolean */ - public boolean checkFugasityCoeffisientsDP() { + public boolean checkFugacityCoefficientsDP() { // boolean test1 = false, test2 = false; double temp1 = 0, temp2 = 0; double sum = 0; @@ -204,9 +204,9 @@ public boolean checkFugasityCoeffisientsDP() { sum = Math.abs(temp1) + Math.abs(temp2); // System.out.println("test fugdp gas : " + temp1); // System.out.println("test fugdp liq : " + temp2); - logger.info("Testing pressure derivatives of fugasity coefficients..................."); + logger.info("Testing pressure derivatives of fugacity coefficients..................."); logger.info("Error : " + sum); - // System.out.println("Testing pressure derivatives of fugasity + // System.out.println("Testing pressure derivatives of fugacity // coefficients..................."); // System.out.println("Error : " + sum); @@ -215,12 +215,12 @@ public boolean checkFugasityCoeffisientsDP() { /** *

- * checkFugasityCoeffisientsDT. + * checkFugacityCoefficientsDT. *

* * @return a boolean */ - public boolean checkFugasityCoeffisientsDT() { + public boolean checkFugacityCoefficientsDT() { // boolean test1 = false, test2 = false; double temp1 = 0, temp2 = 0; double sum = 0; @@ -236,9 +236,9 @@ public boolean checkFugasityCoeffisientsDT() { sum = Math.abs(temp1) + Math.abs(temp2); // System.out.println("test fugdp gas : " + system.getPhases()[0].getHresTP()); // System.out.println("test fugdp liq : " + temp2); - logger.info("Testing temperature derivatives of fugasity coefficients..................."); + logger.info("Testing temperature derivatives of fugacity coefficients..................."); logger.info("Error : " + sum); - // System.out.println("Testing temperature derivatives of fugasity + // System.out.println("Testing temperature derivatives of fugacity // coefficients..................."); // System.out.println("Error : " + sum); return Math.abs(sum) < 1e-10; @@ -281,9 +281,9 @@ public boolean checkNumerically() { for (int i = 0; i < system.getPhases()[0].getNumberOfComponents(); i++) { gasfug[0][i] = - Math.log(system.getPhases()[0].getComponents()[i].getFugasityCoeffisient()); + Math.log(system.getPhases()[0].getComponents()[i].getFugacityCoefficient()); liqfug[0][i] = - Math.log(system.getPhases()[1].getComponents()[i].getFugasityCoeffisient()); + Math.log(system.getPhases()[1].getComponents()[i].getFugacityCoefficient()); } system.setTemperature(system.getTemperature() - 2 * dt); @@ -291,9 +291,9 @@ public boolean checkNumerically() { for (int i = 0; i < system.getPhases()[0].getNumberOfComponents(); i++) { gasfug[1][i] = - Math.log(system.getPhases()[0].getComponents()[i].getFugasityCoeffisient()); + Math.log(system.getPhases()[0].getComponents()[i].getFugacityCoefficient()); liqfug[1][i] = - Math.log(system.getPhases()[1].getComponents()[i].getFugasityCoeffisient()); + Math.log(system.getPhases()[1].getComponents()[i].getFugacityCoefficient()); } for (int i = 0; i < system.getPhases()[0].getNumberOfComponents(); i++) { @@ -318,9 +318,9 @@ public boolean checkNumerically() { for (int i = 0; i < system.getPhases()[0].getNumberOfComponents(); i++) { gasfug[0][i] = - Math.log(system.getPhases()[0].getComponents()[i].getFugasityCoeffisient()); + Math.log(system.getPhases()[0].getComponents()[i].getFugacityCoefficient()); liqfug[0][i] = - Math.log(system.getPhases()[1].getComponents()[i].getFugasityCoeffisient()); + Math.log(system.getPhases()[1].getComponents()[i].getFugacityCoefficient()); } system.setPressure(system.getPressure() - 2 * dp); @@ -328,9 +328,9 @@ public boolean checkNumerically() { for (int i = 0; i < system.getPhases()[0].getNumberOfComponents(); i++) { gasfug[1][i] = - Math.log(system.getPhases()[0].getComponents()[i].getFugasityCoeffisient()); + Math.log(system.getPhases()[0].getComponents()[i].getFugacityCoefficient()); liqfug[1][i] = - Math.log(system.getPhases()[1].getComponents()[i].getFugasityCoeffisient()); + Math.log(system.getPhases()[1].getComponents()[i].getFugacityCoefficient()); } for (int i = 0; i < system.getPhases()[0].getNumberOfComponents(); i++) { @@ -369,9 +369,9 @@ public boolean checkNumerically() { for (int i = 0; i < system.getPhases()[0].getNumberOfComponents(); i++) { // gasfug[0][i] = - // Math.log(system.getPhases()[0].getComponents()[i].getFugasityCoeffisient()); + // Math.log(system.getPhases()[0].getComponents()[i].getFugacityCoefficient()); liqfug[0][i] = Math.log( - system.getPhases()[phase].getComponents()[i].getFugasityCoeffisient()); + system.getPhases()[phase].getComponents()[i].getFugacityCoefficient()); } system.addComponent(k, -2.0 * dn, phase); @@ -381,9 +381,9 @@ public boolean checkNumerically() { for (int i = 0; i < system.getPhases()[0].getNumberOfComponents(); i++) { // gasfug[1][i] = - // Math.log(system.getPhases()[0].getComponents()[i].getFugasityCoeffisient()); + // Math.log(system.getPhases()[0].getComponents()[i].getFugacityCoefficient()); liqfug[1][i] = Math.log( - system.getPhases()[phase].getComponents()[i].getFugasityCoeffisient()); + system.getPhases()[phase].getComponents()[i].getFugacityCoefficient()); } for (int i = 0; i < system.getPhases()[0].getNumberOfComponents(); i++) { diff --git a/src/main/java/neqsim/thermo/component/Component.java b/src/main/java/neqsim/thermo/component/Component.java index 10427a538..1cc8bb906 100644 --- a/src/main/java/neqsim/thermo/component/Component.java +++ b/src/main/java/neqsim/thermo/component/Component.java @@ -18,7 +18,7 @@ abstract class Component implements ComponentInterface { double[] surfTensInfluenceParam = {0.28367, -0.05164, -0.81594, 1.06810, -1.1147}; protected int index, componentNumber, attractiveTermNumber = 0, numberOfAssociationSites = 0; - protected double logFugasityCoeffisient = 0.0, associationVolume = 0.0, associationEnergy = 0.0, + protected double logFugacityCoefficient = 0.0, associationVolume = 0.0, associationEnergy = 0.0, aCPA = 0.0, bCPA = 0.0, mCPA = 0.0, srkacentricFactor = 0.0; protected String componentName = "default", referenceStateType = "solvent", associationScheme = "0", antoineLiqVapPresType = null; @@ -39,7 +39,7 @@ abstract class Component implements ComponentInterface { volumeCorrectionT_CPA = 0.0; protected double criticalPressure, criticalTemperature, molarMass, acentricFactor, numberOfMoles = 0.0, numberOfMolesInPhase = 0.0, normalLiquidDensity = 0; - protected double reducedPressure, reducedTemperature, fugasityCoeffisient, + protected double reducedPressure, reducedTemperature, fugacityCoefficient, debyeDipoleMoment = 0, viscosityCorrectionFactor = 0, criticalVolume = 0, racketZ = 0; protected double gibbsEnergyOfFormation = 0, criticalViscosity = 0.0; protected double referencePotential = 0, viscosityFrictionK = 1.0; @@ -972,24 +972,18 @@ public final void setK(double newK) { /** {@inheritDoc} */ @Override - public final double getFugasityCoeffisient() { - return fugasityCoeffisient; - } - - /** {@inheritDoc} */ - @Override - public final double getFugasityCoefficient() { - return getFugasityCoeffisient(); + public final double getFugacityCoefficient() { + return fugacityCoefficient; } /** {@inheritDoc} */ @Override public double fugcoef(PhaseInterface phase) { - fugasityCoeffisient = 1.0;// this.fugcoef(phase, phase.getNumberOfComponents(), + fugacityCoefficient = 1.0;// this.fugcoef(phase, phase.getNumberOfComponents(), // phase.getTemperature(), // phase.getPressure()); - logFugasityCoeffisient = Math.log(fugasityCoeffisient); - return fugasityCoeffisient; + logFugacityCoefficient = Math.log(fugacityCoefficient); + return fugacityCoefficient; } /** {@inheritDoc} */ @@ -1256,7 +1250,7 @@ public final double getHresTP(double temperature) { /** {@inheritDoc} */ @Override public final double getGresTP(double temperature) { - return R * temperature * (Math.log(getFugasityCoeffisient())); + return R * temperature * (Math.log(getFugacityCoefficient())); } /** {@inheritDoc} */ @@ -1392,12 +1386,12 @@ public double fugcoefDiffPresNumeric(PhaseInterface phase, int numberOfComponent double temperature, double pressure) { double temp1 = 0.0, temp2 = 0.0; double dp = phase.getPressure() / 1.0e5; - temp1 = phase.getComponents()[componentNumber].getFugasityCoeffisient(); + temp1 = phase.getComponents()[componentNumber].getFugacityCoefficient(); phase.setPressure(phase.getPressure() - dp); phase.init(numberOfMolesInPhase, numberOfComponents, 1, phase.getPhaseType(), phase.getBeta()); phase.getComponents()[componentNumber].fugcoef(phase); - temp2 = phase.getComponents()[componentNumber].getFugasityCoeffisient(); + temp2 = phase.getComponents()[componentNumber].getFugacityCoefficient(); phase.setPressure(phase.getPressure() + dp); phase.init(numberOfMolesInPhase, numberOfComponents, 1, phase.getPhaseType(), phase.getBeta()); @@ -1412,12 +1406,12 @@ public double fugcoefDiffTempNumeric(PhaseInterface phase, int numberOfComponent double temperature, double pressure) { double temp1 = 0.0, temp2 = 0.0; double dt = phase.getTemperature() / 1.0e6; - temp1 = phase.getComponents()[componentNumber].getFugasityCoeffisient(); + temp1 = phase.getComponents()[componentNumber].getFugacityCoefficient(); phase.setTemperature(phase.getTemperature() - dt); phase.init(numberOfMolesInPhase, numberOfComponents, 1, phase.getPhaseType(), phase.getBeta()); phase.getComponents()[componentNumber].fugcoef(phase); - temp2 = phase.getComponents()[componentNumber].getFugasityCoeffisient(); + temp2 = phase.getComponents()[componentNumber].getFugacityCoefficient(); // phase.setTemperature(phase.getTemperature()+dt); // System.out.println("temp " + phase.getTemperature()); // phase.init(numberOfMolesInPhase, numberOfComponents, 1,phase.getPhaseType(), @@ -1487,11 +1481,11 @@ public void setPaulingAnionicDiameter(double paulingAnionicDiameter) { /** * {@inheritDoc} * - * Getter for property logFugasityCoeffisient. + * Getter for property logFugacityCoefficient. */ @Override - public final double getLogFugasityCoeffisient() { - return logFugasityCoeffisient; + public final double getLogFugacityCoefficient() { + return logFugacityCoefficient; } /** @@ -1587,8 +1581,8 @@ public void setMatiascopemanParams(double[] matiascopemanParams) { /** {@inheritDoc} */ @Override public void setFugacityCoefficient(double val) { - fugasityCoeffisient = val; - logFugasityCoeffisient = Math.log(fugasityCoeffisient); + fugacityCoefficient = val; + logFugacityCoefficient = Math.log(fugacityCoefficient); } /** @@ -2033,7 +2027,7 @@ public java.lang.String getComponentType() { /** * {@inheritDoc} * - * Getter for property Henrys Coeffisient. Unit is bar. ln H = C1 + C2/T + C3lnT + C4*T + * Getter for property Henrys Coefficient. Unit is bar. ln H = C1 + C2/T + C3lnT + C4*T */ @Override public double getHenryCoef(double temperature) { diff --git a/src/main/java/neqsim/thermo/component/ComponentDesmukhMather.java b/src/main/java/neqsim/thermo/component/ComponentDesmukhMather.java index 142c82b32..28a41f4c3 100644 --- a/src/main/java/neqsim/thermo/component/ComponentDesmukhMather.java +++ b/src/main/java/neqsim/thermo/component/ComponentDesmukhMather.java @@ -135,24 +135,24 @@ public double fugcoef(PhaseInterface phase) { if (componentName.equals("water")) { double watervol = 1.0 / 1000.0 * getMolarMass(); double watervappres = getAntoineVaporPressure(phase.getTemperature()); - fugasityCoeffisient = + fugacityCoefficient = gamma * watervappres * Math.exp(watervol / (R * phase.getTemperature()) * (phase.getPressure() - watervappres) * 1e5) / phase.getPressure(); } else if (ionicCharge == 0 && referenceStateType.equals("solvent")) { - fugasityCoeffisient = + fugacityCoefficient = gamma * getAntoineVaporPressure(phase.getTemperature()) / phase.getPressure(); } else if (ionicCharge == 0 && referenceStateType.equals("solute")) { - fugasityCoeffisient = + fugacityCoefficient = gamma * getHenryCoef(phase.getTemperature()) / phase.getPressure(); // sjekke // denne } else { - fugasityCoeffisient = 1e-15; - // System.out.println("fug " + fugasityCoeffisient); + fugacityCoefficient = 1e-15; + // System.out.println("fug " + fugacityCoefficient); } - logFugasityCoeffisient = Math.log(fugasityCoeffisient); - return fugasityCoeffisient; + logFugacityCoefficient = Math.log(fugacityCoefficient); + return fugacityCoefficient; } /** diff --git a/src/main/java/neqsim/thermo/component/ComponentEos.java b/src/main/java/neqsim/thermo/component/ComponentEos.java index d9fd4dad2..418627cf6 100644 --- a/src/main/java/neqsim/thermo/component/ComponentEos.java +++ b/src/main/java/neqsim/thermo/component/ComponentEos.java @@ -309,10 +309,10 @@ public double getaT() { @Override public double fugcoef(PhaseInterface phase) { double temperature = phase.getTemperature(), pressure = phase.getPressure(); - logFugasityCoeffisient = dFdN(phase, phase.getNumberOfComponents(), temperature, pressure) + logFugacityCoefficient = dFdN(phase, phase.getNumberOfComponents(), temperature, pressure) - Math.log(pressure * phase.getMolarVolume() / (R * temperature)); - fugasityCoeffisient = Math.exp(logFugasityCoeffisient); - return fugasityCoeffisient; + fugacityCoefficient = Math.exp(logFugacityCoefficient); + return fugacityCoefficient; } /** {@inheritDoc} */ diff --git a/src/main/java/neqsim/thermo/component/ComponentGE.java b/src/main/java/neqsim/thermo/component/ComponentGE.java index 2a56a1e1e..321fac350 100644 --- a/src/main/java/neqsim/thermo/component/ComponentGE.java +++ b/src/main/java/neqsim/thermo/component/ComponentGE.java @@ -50,7 +50,7 @@ public double fugcoef(PhaseInterface phase) { logger.info("fug coef " + gamma * getAntoineVaporPressure(phase.getTemperature()) / phase.getPressure()); if (referenceStateType.equals("solvent")) { - fugasityCoeffisient = + fugacityCoefficient = gamma * getAntoineVaporPressure(phase.getTemperature()) / phase.getPressure(); gammaRefCor = gamma; } else { @@ -62,15 +62,15 @@ public double fugcoef(PhaseInterface phase) { } else { activinf = gamma / ((PhaseGE) phase).getActivityCoefficientInfDil(componentNumber); } - fugasityCoeffisient = + fugacityCoefficient = activinf * getHenryCoef(phase.getTemperature()) / phase.getPressure();// gamma* // benyttes // ikke gammaRefCor = activinf; } - logFugasityCoeffisient = Math.log(fugasityCoeffisient); + logFugacityCoefficient = Math.log(fugacityCoefficient); - return fugasityCoeffisient; + return fugacityCoefficient; } /** diff --git a/src/main/java/neqsim/thermo/component/ComponentGERG2004.java b/src/main/java/neqsim/thermo/component/ComponentGERG2004.java index a491f56a2..84f5e432f 100644 --- a/src/main/java/neqsim/thermo/component/ComponentGERG2004.java +++ b/src/main/java/neqsim/thermo/component/ComponentGERG2004.java @@ -103,7 +103,7 @@ public double calcb() { /** {@inheritDoc} */ @Override public double fugcoef(PhaseInterface phase) { - return fugasityCoeffisient; + return fugacityCoefficient; } /** {@inheritDoc} */ diff --git a/src/main/java/neqsim/thermo/component/ComponentGEUnifac.java b/src/main/java/neqsim/thermo/component/ComponentGEUnifac.java index f537239a9..f6580254d 100644 --- a/src/main/java/neqsim/thermo/component/ComponentGEUnifac.java +++ b/src/main/java/neqsim/thermo/component/ComponentGEUnifac.java @@ -144,10 +144,10 @@ public double getR() { @Override public double fugcoef(PhaseInterface phase, int numberOfComponents, double temperature, double pressure, int phasetype) { - fugasityCoeffisient = + fugacityCoefficient = (this.getGamma(phase, numberOfComponents, temperature, pressure, phasetype) * this.getAntoineVaporPressure(temperature) / pressure); - return fugasityCoeffisient; + return fugacityCoefficient; } /** diff --git a/src/main/java/neqsim/thermo/component/ComponentGEUniquac.java b/src/main/java/neqsim/thermo/component/ComponentGEUniquac.java index f41a445d0..82d256840 100644 --- a/src/main/java/neqsim/thermo/component/ComponentGEUniquac.java +++ b/src/main/java/neqsim/thermo/component/ComponentGEUniquac.java @@ -94,10 +94,10 @@ public ComponentGEUniquac(String component_name, double moles, double molesInPha */ public double fugcoef(PhaseInterface phase, int numberOfComponents, double temperature, double pressure, int phasetype) { - fugasityCoeffisient = + fugacityCoefficient = (this.getGamma(phase, numberOfComponents, temperature, pressure, phasetype) * this.getAntoineVaporPressure(temperature) / pressure); - return fugasityCoeffisient; + return fugacityCoefficient; } /** {@inheritDoc} */ diff --git a/src/main/java/neqsim/thermo/component/ComponentGEWilson.java b/src/main/java/neqsim/thermo/component/ComponentGEWilson.java index bfecb461d..a19311f52 100644 --- a/src/main/java/neqsim/thermo/component/ComponentGEWilson.java +++ b/src/main/java/neqsim/thermo/component/ComponentGEWilson.java @@ -50,10 +50,10 @@ public ComponentGEWilson(String component_name, double moles, double molesInPhas */ public double fugcoef(PhaseInterface phase, int numberOfComponents, double temperature, double pressure, int phasetype) { - fugasityCoeffisient = + fugacityCoefficient = (this.getGamma(phase, numberOfComponents, temperature, pressure, phasetype) * this.getAntoineVaporPressure(temperature) / pressure); - return fugasityCoeffisient; + return fugacityCoefficient; } /** @@ -70,7 +70,7 @@ public double fugcoef(PhaseInterface phase, int numberOfComponents, double tempe */ public double getGamma(PhaseInterface phase, int numberOfComponents, double temperature, double pressure, int phasetype) { - return getWilsonActivityCoeffisient(phase); + return getWilsonActivityCoefficient(phase); } /** {@inheritDoc} */ @@ -83,13 +83,13 @@ public double getGamma(PhaseInterface phase, int numberOfComponents, double temp /** *

- * getWilsonActivityCoeffisient. + * getWilsonActivityCoefficient. *

* * @param phase1 a {@link neqsim.thermo.phase.PhaseInterface} object * @return a double */ - public double getWilsonActivityCoeffisient(PhaseInterface phase1) { + public double getWilsonActivityCoefficient(PhaseInterface phase1) { double sum1 = 0.0; double sum2 = 0.0; double tempSum = 0.0; diff --git a/src/main/java/neqsim/thermo/component/ComponentGeDuanSun.java b/src/main/java/neqsim/thermo/component/ComponentGeDuanSun.java index 0bdac0843..43fce01ff 100644 --- a/src/main/java/neqsim/thermo/component/ComponentGeDuanSun.java +++ b/src/main/java/neqsim/thermo/component/ComponentGeDuanSun.java @@ -289,7 +289,7 @@ public double fugcoef(PhaseInterface phase) { logger.info("fug coef " + gamma * getAntoineVaporPressure(phase.getTemperature()) / phase.getPressure()); if (referenceStateType.equals("solvent")) { - fugasityCoeffisient = + fugacityCoefficient = gamma * getAntoineVaporPressure(phase.getTemperature()) / phase.getPressure(); gammaRefCor = gamma; } else { @@ -417,28 +417,28 @@ public double fugcoef(PhaseInterface phase) { / (1000.0 * (R / 100.0) * phase.getTemperature())); if (componentName.equals("CO2")) { - fugasityCoeffisient = + fugacityCoefficient = activinf * K[0] * gamma * (1000 / 18.02) / phase.getPressure();// +25.689/(gamma*K[0]))/ // phase.getPressure(); } else if (componentName.equals("nitrogen")) { - fugasityCoeffisient = + fugacityCoefficient = activinf * K[1] * gamma * (1000 / 18.02) / phase.getPressure();// +50.585/(gamma*K[1]))/ // phase.getPressure(); } else if (componentName.equals("oxygen")) { - fugasityCoeffisient = + fugacityCoefficient = activinf * K[2] * gamma * (1000 / 18.02) / phase.getPressure();// +46.9157/(gamma*K[2]))/ // phase.getPressure(); } else if (componentName.contentEquals("water")) { - fugasityCoeffisient = activinf * K[3] * (1000 / 18.02) / phase.getPressure(); + fugacityCoefficient = activinf * K[3] * (1000 / 18.02) / phase.getPressure(); } else { - fugasityCoeffisient = activinf * K[3] / phase.getPressure(); + fugacityCoefficient = activinf * K[3] / phase.getPressure(); } - // fugasityCoeffisient = activinf * getHenryCoef(phase.getTemperature()) / + // fugacityCoefficient = activinf * getHenryCoef(phase.getTemperature()) / // phase.getPressure();//gamma* benyttes ikke gammaRefCor = activinf; } - logFugasityCoeffisient = Math.log(fugasityCoeffisient); - return fugasityCoeffisient; + logFugacityCoefficient = Math.log(fugacityCoefficient); + return fugacityCoefficient; } ///////////////////////////////////////////////////// diff --git a/src/main/java/neqsim/thermo/component/ComponentHydrate.java b/src/main/java/neqsim/thermo/component/ComponentHydrate.java index 34c8f62c2..8d60d2aad 100644 --- a/src/main/java/neqsim/thermo/component/ComponentHydrate.java +++ b/src/main/java/neqsim/thermo/component/ComponentHydrate.java @@ -176,7 +176,7 @@ public int getHydrateStructure() { */ public double fugcoef(PhaseInterface phase, int numberOfComps, double temp, double pres) { if (componentName.equals("water")) { - fugasityCoeffisient = -1e50; + fugacityCoefficient = -1e50; double val = 1.0; double tempy = 1.0; double fugold = 0.0; @@ -184,7 +184,7 @@ public double fugcoef(PhaseInterface phase, int numberOfComps, double temp, doub do { val = 0; tempy = 0.0; - fugold = fugasityCoeffisient; + fugold = fugacityCoefficient; if (hydrateStructure >= 0) { for (int cavType = 0; cavType < 2; cavType++) { tempy = 0.0; @@ -199,9 +199,9 @@ public double fugcoef(PhaseInterface phase, int numberOfComps, double temp, doub } } // System.out.println("val " +(val)); - // System.out.println("fugasityCoeffisient bef " + fugasityCoeffisient); + // System.out.println("fugacityCoefficient bef " + fugacityCoefficient); double solvol = 1.0 / 906.0 * getMolarMass(); - fugasityCoeffisient = Math.exp(val) + fugacityCoefficient = Math.exp(val) * getEmptyHydrateStructureVapourPressure(hydrateStructure, temp) * Math.exp(solvol / (R * temp) * ((pres - getEmptyHydrateStructureVapourPressure(hydrateStructure, temp))) @@ -210,20 +210,20 @@ public double fugcoef(PhaseInterface phase, int numberOfComps, double temp, doub // System.out.println("struct " + hydrateStruct + " fug " + tempfugcoef + " val // "+ val); - // fugasityCoeffisient = + // fugacityCoefficient = // Math.exp(val)*getEmptyHydrateStructureVapourPressure(hydrateStructure,temp)*Math.exp(solvol/(R*temp)*((pres-getEmptyHydrateStructureVapourPressure(hydrateStructure,temp)))*1e5)/pres; - // fugasityCoeffisient = getAntoineVaporPressure(temp)/pres; - // logFugasityCoeffisient = Math.log(fugasityCoeffisient); - // logFugasityCoeffisient += val*boltzmannConstant/R; - // fugasityCoeffisient = Math.exp(logFugasityCoeffisient); - // System.out.println("fugasityCoeffisient " + fugasityCoeffisient); - } while (Math.abs((fugasityCoeffisient - fugold) / fugold) > 1e-6); + // fugacityCoefficient = getAntoineVaporPressure(temp)/pres; + // logFugacityCoefficient = Math.log(fugacityCoefficient); + // logFugacityCoefficient += val*boltzmannConstant/R; + // fugacityCoefficient = Math.exp(logFugacityCoefficient); + // System.out.println("fugacityCoefficient " + fugacityCoefficient); + } while (Math.abs((fugacityCoefficient - fugold) / fugold) > 1e-6); } else { - fugasityCoeffisient = 1e5; + fugacityCoefficient = 1e5; } - logFugasityCoeffisient = Math.log(fugasityCoeffisient); - // System.out.println("fug " + fugasityCoeffisient); - return fugasityCoeffisient; + logFugacityCoefficient = Math.log(fugacityCoefficient); + // System.out.println("fug " + fugacityCoefficient); + return fugacityCoefficient; } /** diff --git a/src/main/java/neqsim/thermo/component/ComponentHydrateBallard.java b/src/main/java/neqsim/thermo/component/ComponentHydrateBallard.java index aa44a6f43..3a296d125 100644 --- a/src/main/java/neqsim/thermo/component/ComponentHydrateBallard.java +++ b/src/main/java/neqsim/thermo/component/ComponentHydrateBallard.java @@ -73,7 +73,7 @@ public double fugcoef(PhaseInterface phase, int numberOfComps, double temp, doub double alphaWater = reffug[getComponentNumber()]; double wateralphaRef = Math.log(refWaterFugacity / alphaWater); - fugasityCoeffisient = -1e50; + fugacityCoefficient = -1e50; double val = 0.0; double tempy = 1.0; @@ -90,7 +90,7 @@ public double fugcoef(PhaseInterface phase, int numberOfComps, double temp, doub + " calcChemPotEmpty(phase, numberOfComps, temp, pres, hydrateStructure) " + calcChemPotEmpty(phase, numberOfComps, temp, pres, hydrateStructure) + " " + calcChemPotIdealWater(phase, numberOfComps, temp, pres, hydrateStructure)); - fugasityCoeffisient = alphaWater * Math.exp(wateralphaRef + val + fugacityCoefficient = alphaWater * Math.exp(wateralphaRef + val + calcChemPotEmpty(phase, numberOfComps, temp, pres, hydrateStructure) - calcChemPotIdealWater(phase, numberOfComps, temp, pres, hydrateStructure)) / (pres); @@ -99,11 +99,11 @@ public double fugcoef(PhaseInterface phase, int numberOfComps, double temp, doub logger.info("structure " + (hydrateStructure + 1)); } else { - fugasityCoeffisient = 1e50; + fugacityCoefficient = 1e50; } - logFugasityCoeffisient = Math.log(fugasityCoeffisient); + logFugacityCoefficient = Math.log(fugacityCoefficient); - return fugasityCoeffisient; + return fugacityCoefficient; } /** {@inheritDoc} */ diff --git a/src/main/java/neqsim/thermo/component/ComponentHydrateGF.java b/src/main/java/neqsim/thermo/component/ComponentHydrateGF.java index 8a89ba611..604c509b5 100644 --- a/src/main/java/neqsim/thermo/component/ComponentHydrateGF.java +++ b/src/main/java/neqsim/thermo/component/ComponentHydrateGF.java @@ -104,7 +104,7 @@ public double fugcoef2(PhaseInterface phase, int numberOfComps, double temp, dou // this is the empty hydrate fugacity devited by pressure (why??) double solvol = getMolarVolumeHydrate(hydrateStructure, temp); if (hydrateStructure == -1) { - fugasityCoeffisient = getEmptyHydrateStructureVapourPressure(hydrateStructure, temp) + fugacityCoefficient = getEmptyHydrateStructureVapourPressure(hydrateStructure, temp) * Math.exp(solvol / (R * temp) * (pres - getEmptyHydrateStructureVapourPressure(hydrateStructure, temp)) * 1e5) @@ -138,7 +138,7 @@ public double fugcoef2(PhaseInterface phase, int numberOfComps, double temp, dou // System.out.println("pointing " // +(Math.exp(solvol/(R*temp)*((pres-getEmptyHydrateStructureVapourPressure(hydrateStruct,temp))*1e5)))); - fugasityCoeffisient = Math.exp(val) + fugacityCoefficient = Math.exp(val) * getEmptyHydrateStructureVapourPressure(hydrateStructure, temp) * Math.exp(solvol / (R * temp) * (pres - getEmptyHydrateStructureVapourPressure(hydrateStructure, temp)) @@ -150,14 +150,14 @@ public double fugcoef2(PhaseInterface phase, int numberOfComps, double temp, dou // System.out.println("structure " + (hydrateStructure+1)); } } else { - fugasityCoeffisient = 1e50; + fugacityCoefficient = 1e50; } - logFugasityCoeffisient = Math.log(fugasityCoeffisient); + logFugacityCoefficient = Math.log(fugacityCoefficient); // System.out.println("reading fugacity coeffiicent calculation"); - return fugasityCoeffisient; + return fugacityCoefficient; } /** {@inheritDoc} */ @@ -167,7 +167,7 @@ public double fugcoef(PhaseInterface phase, int numberOfComps, double temp, doub int stableStructure = 0; if (hydrateStructure == -1) { stableStructure = -1; - // fugasityCoeffisient = 1.02 * + // fugacityCoefficient = 1.02 * // getEmptyHydrateStructureVapourPressure(hydrateStructure, temp) * // Math.exp(getMolarVolumeHydrate(hydrateStructure, temp) / (R * temp) * (pres - // getEmptyHydrateStructureVapourPressure(hydrateStructure, temp)) * 1e5) / @@ -191,7 +191,7 @@ public double fugcoef(PhaseInterface phase, int numberOfComps, double temp, doub + K3 * Math.pow((temp - tmi), 3)); double LNFUG_ICE = LNFUG_ICEREF + (VM * 100000 * (pres - 1.0) / (R * temp)); - fugasityCoeffisient = Math.exp(LNFUG_ICE); + fugacityCoefficient = Math.exp(LNFUG_ICE); } else { for (int structure = 0; structure < 2; structure++) { hydrateStructure = structure; @@ -228,7 +228,7 @@ public double fugcoef(PhaseInterface phase, int numberOfComps, double temp, doub */ // System.out.println("pointing " // +(Math.exp(solvol/(R*temp)*((pres-getEmptyHydrateStructureVapourPressure(hydrateStruct,temp))*1e5)))); - fugasityCoeffisient = Math.exp(val) + fugacityCoefficient = Math.exp(val) * getEmptyHydrateStructureVapourPressure(hydrateStructure, temp) * Math.exp(solvol / (R * temp) * (pres - getEmptyHydrateStructureVapourPressure( @@ -239,19 +239,19 @@ public double fugcoef(PhaseInterface phase, int numberOfComps, double temp, doub // (hydrateStruct+1)); // System.out.println("structure " + (hydrateStructure+1)); - if (fugasityCoeffisient < maxFug) { - maxFug = fugasityCoeffisient; + if (fugacityCoefficient < maxFug) { + maxFug = fugacityCoefficient; stableStructure = hydrateStructure; } } else { - fugasityCoeffisient = 1e50; + fugacityCoefficient = 1e50; } } - fugasityCoeffisient = maxFug; + fugacityCoefficient = maxFug; } - logFugasityCoeffisient = Math.log(fugasityCoeffisient); + logFugacityCoefficient = Math.log(fugacityCoefficient); hydrateStructure = stableStructure; - return fugasityCoeffisient; + return fugacityCoefficient; } /** {@inheritDoc} */ diff --git a/src/main/java/neqsim/thermo/component/ComponentHydrateKluda.java b/src/main/java/neqsim/thermo/component/ComponentHydrateKluda.java index 2e6ab0ea6..2f947c36d 100644 --- a/src/main/java/neqsim/thermo/component/ComponentHydrateKluda.java +++ b/src/main/java/neqsim/thermo/component/ComponentHydrateKluda.java @@ -111,7 +111,7 @@ public double fugcoef(PhaseInterface phase, int numberOfComps, double temp, doub do { val = 0.0; tempy = 0.0; - fugold = fugasityCoeffisient; + fugold = fugacityCoefficient; for (int cavType = 0; cavType < 2; cavType++) { tempy = 0.0; for (int j = 0; j < phase.getNumberOfComponents(); j++) { @@ -124,26 +124,26 @@ public double fugcoef(PhaseInterface phase, int numberOfComps, double temp, doub val += cavprwat[hydrateStructure][cavType] * Math.log(1.0 - tempy); } logger.info("val " + (val)); - logger.info("fugasityCoeffisient bef " + fugasityCoeffisient); + logger.info("fugacityCoefficient bef " + fugacityCoefficient); double solvol = 1.0 / 906.0 * getMolarMass(); - fugasityCoeffisient = Math.exp(val) + fugacityCoefficient = Math.exp(val) * getEmptyHydrateStructureVapourPressure(hydrateStructure, temp) * Math.exp(solvol / (R * temp) * ((pres - getEmptyHydrateStructureVapourPressure(hydrateStructure, temp))) * 1e5) / pres; - // fugasityCoeffisient = getAntoineVaporPressure(temp)/pres; - // logFugasityCoeffisient = Math.log(fugasityCoeffisient); - // logFugasityCoeffisient += val*boltzmannConstant/R; + // fugacityCoefficient = getAntoineVaporPressure(temp)/pres; + // logFugacityCoefficient = Math.log(fugacityCoefficient); + // logFugacityCoefficient += val*boltzmannConstant/R; - // fugasityCoeffisient = Math.exp(logFugasityCoeffisient); - logger.info("fugasityCoeffisient " + fugasityCoeffisient); - } while (Math.abs((fugasityCoeffisient - fugold) / fugold) > 1e-8); + // fugacityCoefficient = Math.exp(logFugacityCoefficient); + logger.info("fugacityCoefficient " + fugacityCoefficient); + } while (Math.abs((fugacityCoefficient - fugold) / fugold) > 1e-8); } else { - fugasityCoeffisient = 1e5; + fugacityCoefficient = 1e5; } - // System.out.println("fug " + fugasityCoeffisient); - return fugasityCoeffisient; + // System.out.println("fug " + fugacityCoefficient); + return fugacityCoefficient; } /** diff --git a/src/main/java/neqsim/thermo/component/ComponentHydratePVTsim.java b/src/main/java/neqsim/thermo/component/ComponentHydratePVTsim.java index eab3a94a6..ea5c8f079 100644 --- a/src/main/java/neqsim/thermo/component/ComponentHydratePVTsim.java +++ b/src/main/java/neqsim/thermo/component/ComponentHydratePVTsim.java @@ -125,7 +125,7 @@ public double fugcoef(PhaseInterface phase, int numberOfComps, double temp, doub + K3 * Math.pow((temp - tmi), 3)); double LNFUG_ICE = LNFUG_ICEREF + (VM * 100000 * (pres - 1.0) / (R * temp)); - fugasityCoeffisient = Math.exp(LNFUG_ICE); + fugacityCoefficient = Math.exp(LNFUG_ICE); } else { for (int structure = 0; structure < 2; structure++) { hydrateStructure = structure; @@ -163,25 +163,25 @@ public double fugcoef(PhaseInterface phase, int numberOfComps, double temp, doub + calcDeltaChemPot(phase, numberOfComps, temp, pres, hydrateStructure)); // tempfugcoef = refWaterFugacity * Math.exp(val + calcDeltaChemPot(phase, // numberOfComps, temp, pres, hydrateStruct) + wateralphaRef) / (pres); - fugasityCoeffisient = alphaWater * Math.exp(val + fugacityCoefficient = alphaWater * Math.exp(val + calcDeltaChemPot(phase, numberOfComps, temp, pres, hydrateStructure) + wateralphaRef) / pres; - if (fugasityCoeffisient < maxFug) { - maxFug = fugasityCoeffisient; + if (fugacityCoefficient < maxFug) { + maxFug = fugacityCoefficient; stableStructure = hydrateStructure; } } else { - fugasityCoeffisient = 1e50; + fugacityCoefficient = 1e50; } } - fugasityCoeffisient = maxFug; + fugacityCoefficient = maxFug; } - logFugasityCoeffisient = Math.log(fugasityCoeffisient); + logFugacityCoefficient = Math.log(fugacityCoefficient); hydrateStructure = stableStructure; - return fugasityCoeffisient; + return fugacityCoefficient; } /** {@inheritDoc} */ diff --git a/src/main/java/neqsim/thermo/component/ComponentHydrateStatoil.java b/src/main/java/neqsim/thermo/component/ComponentHydrateStatoil.java index de8a0dd4b..d3313c26e 100644 --- a/src/main/java/neqsim/thermo/component/ComponentHydrateStatoil.java +++ b/src/main/java/neqsim/thermo/component/ComponentHydrateStatoil.java @@ -73,7 +73,7 @@ public double fugcoef(PhaseInterface phase, int numberOfComps, double temp, doub if (componentName.equals("water")) { double solvol = getMolarVolumeHydrate(hydrateStructure, temp); if (hydrateStructure == -1) { - fugasityCoeffisient = getEmptyHydrateStructureVapourPressure(hydrateStructure, temp) + fugacityCoefficient = getEmptyHydrateStructureVapourPressure(hydrateStructure, temp) * Math.exp(solvol / (R * temp) * (pres - getEmptyHydrateStructureVapourPressure(hydrateStructure, temp)) * 1e5) @@ -95,7 +95,7 @@ public double fugcoef(PhaseInterface phase, int numberOfComps, double temp, doub // System.out.println("pointing " // +(Math.exp(solvol/(R*temp)*((pres-getEmptyHydrateStructureVapourPressure(hydrateStruct,temp))*1e5)))); - fugasityCoeffisient = Math.exp(val) + fugacityCoefficient = Math.exp(val) * getEmptyHydrateStructureVapourPressure(hydrateStructure, temp) * Math.exp(solvol / (R * temp) * (pres - getEmptyHydrateStructureVapourPressure(hydrateStructure, temp)) @@ -107,12 +107,12 @@ public double fugcoef(PhaseInterface phase, int numberOfComps, double temp, doub // System.out.println("structure " + (hydrateStructure+1)); } } else { - fugasityCoeffisient = 1e50; + fugacityCoefficient = 1e50; } - logFugasityCoeffisient = Math.log(fugasityCoeffisient); + logFugacityCoefficient = Math.log(fugacityCoefficient); - return fugasityCoeffisient; + return fugacityCoefficient; } /** {@inheritDoc} */ diff --git a/src/main/java/neqsim/thermo/component/ComponentInterface.java b/src/main/java/neqsim/thermo/component/ComponentInterface.java index de997dd99..032dc8342 100644 --- a/src/main/java/neqsim/thermo/component/ComponentInterface.java +++ b/src/main/java/neqsim/thermo/component/ComponentInterface.java @@ -573,15 +573,6 @@ public void createComponent(String component_name, double moles, double molesInP */ public double getMolality(PhaseInterface phase); - /** - *

- * getFugasityCoefficient. - *

- * - * @return a double - */ - public double getFugasityCoefficient(); - /** *

* setLennardJonesMolecularDiameter. @@ -944,12 +935,12 @@ public void Finit(PhaseInterface phase, double temperature, double pressure, /** *

- * getLogFugasityCoeffisient. + * getLogFugacityCoefficient. *

* * @return a double */ - public double getLogFugasityCoeffisient(); + public double getLogFugacityCoefficient(); /** *

@@ -1192,12 +1183,12 @@ public void Finit(PhaseInterface phase, double temperature, double pressure, /** *

- * getFugasityCoeffisient. + * getFugacityCoefficient. *

* * @return a double */ - public double getFugasityCoeffisient(); + public double getFugacityCoefficient(); /** *

diff --git a/src/main/java/neqsim/thermo/component/ComponentKentEisenberg.java b/src/main/java/neqsim/thermo/component/ComponentKentEisenberg.java index 1a4756b4c..005b3d6cc 100644 --- a/src/main/java/neqsim/thermo/component/ComponentKentEisenberg.java +++ b/src/main/java/neqsim/thermo/component/ComponentKentEisenberg.java @@ -40,21 +40,21 @@ public ComponentKentEisenberg(String component_name, double moles, double molesI public double fugcoef(PhaseInterface phase) { double gamma = 1.0; if (referenceStateType.equals("solvent")) { - fugasityCoeffisient = + fugacityCoefficient = gamma * getAntoineVaporPressure(phase.getTemperature()) / phase.getPressure(); gammaRefCor = gamma; } else { double activinf = 1.0; if (ionicCharge == 0) { - fugasityCoeffisient = + fugacityCoefficient = activinf * getHenryCoef(phase.getTemperature()) / phase.getPressure(); } else { - fugasityCoeffisient = 1e8; + fugacityCoefficient = 1e8; } gammaRefCor = activinf; } - logFugasityCoeffisient = Math.log(fugasityCoeffisient); + logFugacityCoefficient = Math.log(fugacityCoefficient); // System.out.println("gamma " + gamma); - return fugasityCoeffisient; + return fugacityCoefficient; } } diff --git a/src/main/java/neqsim/thermo/component/ComponentPCSAFT.java b/src/main/java/neqsim/thermo/component/ComponentPCSAFT.java index c69ae4a64..6bc93d355 100644 --- a/src/main/java/neqsim/thermo/component/ComponentPCSAFT.java +++ b/src/main/java/neqsim/thermo/component/ComponentPCSAFT.java @@ -119,7 +119,7 @@ public void Finit(PhaseInterface phase, double temp, double pres, double totMole F2dispZHCdn = ((PhasePCSAFT) phase).getF2dispZHCdN() * getDnSAFTdi() + ((PhasePCSAFT) phase).getF2dispZHCdm() * getDmSAFTdi(); - // System.out.println("fugasity " + getFugasityCoefficient()); + // System.out.println("fugacity " + getFugacityCoefficient()); } /** {@inheritDoc} */ @@ -135,7 +135,7 @@ public double dFdN(PhaseInterface phase, int numberOfComponents, double temperat // System.out.println("term getF23 " + // dF_DISP2_SAFTdN(phase,numberOfComponents,temperature,pressure)); - // System.out.println("term furgacity coef " + getFugasityCoefficient()); + // System.out.println("term furgacity coef " + getFugacityCoefficient()); return useHS * dF_HC_SAFTdN(phase, numberOfComponents, temperature, pressure) + useDISP1 * dF_DISP1_SAFTdN(phase, numberOfComponents, temperature, pressure) + useDISP2 * dF_DISP2_SAFTdN(phase, numberOfComponents, temperature, pressure); diff --git a/src/main/java/neqsim/thermo/component/ComponentSolid.java b/src/main/java/neqsim/thermo/component/ComponentSolid.java index 79e5aa4da..9293eb00a 100644 --- a/src/main/java/neqsim/thermo/component/ComponentSolid.java +++ b/src/main/java/neqsim/thermo/component/ComponentSolid.java @@ -84,7 +84,7 @@ public double fugcoef2(PhaseInterface phase1) { refPhase.getComponent(0).fugcoef(refPhase); double liquidPhaseFugacity = - refPhase.getComponent(0).getFugasityCoefficient() * refPhase.getPressure(); + refPhase.getComponent(0).getFugacityCoefficient() * refPhase.getPressure(); // Calculates delta Cp solid-liquid double deltaCpSL = -(getPureComponentCpSolid(getTriplePointTemperature()) @@ -124,9 +124,9 @@ public double fugcoef2(PhaseInterface phase1) { / (R * phase1.getTemperature())); // System.out.println("solidfug " + SolidFug); - fugasityCoeffisient = SolidFug / (phase1.getPressure() * getx()); - logFugasityCoeffisient = Math.log(fugasityCoeffisient); - return fugasityCoeffisient; + fugacityCoefficient = SolidFug / (phase1.getPressure() * getx()); + logFugacityCoefficient = Math.log(fugacityCoefficient); + return fugacityCoefficient; } /** @@ -173,18 +173,18 @@ public double fugcoef(double temp, double pres) { refPhase.getComponent(0).fugcoef(refPhase); // System.out.println("ref co2 fugcoef " + - // refPhase.getComponent(0).getFugasityCoefficient()); + // refPhase.getComponent(0).getFugacityCoefficient()); SolidFug = PvapSolid * Math.exp(solvol / (R * temp) * (pres - PvapSolid) * 1e5) - * refPhase.getComponent(0).getFugasityCoefficient(); + * refPhase.getComponent(0).getFugacityCoefficient(); // System.out.println("Pvap solid " + SolidFug); dfugdt = Math.log(PvapSoliddT * Math.exp(solvol / (R * temp) * (pres - PvapSolid))) / pres; - fugasityCoeffisient = SolidFug / pres; + fugacityCoefficient = SolidFug / pres; // } else{ - // fugasityCoeffisient = 1e5; + // fugacityCoefficient = 1e5; // dfugdt=0; // } - logFugasityCoeffisient = Math.log(fugasityCoeffisient); - return fugasityCoeffisient; + logFugacityCoefficient = Math.log(fugacityCoefficient); + return fugacityCoefficient; } // public double dfugdt(PhaseInterface phase, int numberOfComps, double temp, double pres){ diff --git a/src/main/java/neqsim/thermo/component/ComponentWax.java b/src/main/java/neqsim/thermo/component/ComponentWax.java index 89fb92ea3..cf6934744 100644 --- a/src/main/java/neqsim/thermo/component/ComponentWax.java +++ b/src/main/java/neqsim/thermo/component/ComponentWax.java @@ -47,8 +47,8 @@ public ComponentWax(String component_name, double moles, double molesInPhase, in @Override public double fugcoef(PhaseInterface phase1) { if (!isWaxFormer()) { - fugasityCoeffisient = 1.0e50; - logFugasityCoeffisient = Math.log(fugasityCoeffisient); + fugacityCoefficient = 1.0e50; + logFugacityCoefficient = Math.log(fugacityCoefficient); return 1.0e50; } return fugcoef2(phase1); @@ -68,7 +68,7 @@ public double fugcoef2(PhaseInterface phase1) { refPhase.getComponent(0).fugcoef(refPhase); double liquidPhaseFugacity = - refPhase.getComponent(0).getFugasityCoefficient() * refPhase.getPressure(); + refPhase.getComponent(0).getFugacityCoefficient() * refPhase.getPressure(); double liquidDenisty = refPhase.getMolarVolume(); double solidDensity = liquidDenisty * 0.9; @@ -86,9 +86,9 @@ public double fugcoef2(PhaseInterface phase1) { // phase1.getTemperature()) * (1.0 - phase1.getTemperature() / getTriplePointTemperature()) // + presTerm); - fugasityCoeffisient = SolidFug / (phase1.getPressure() * getx()); - logFugasityCoeffisient = Math.log(fugasityCoeffisient); - return fugasityCoeffisient; + fugacityCoefficient = SolidFug / (phase1.getPressure() * getx()); + logFugacityCoefficient = Math.log(fugacityCoefficient); + return fugacityCoefficient; // getS } diff --git a/src/main/java/neqsim/thermo/component/ComponentWaxWilson.java b/src/main/java/neqsim/thermo/component/ComponentWaxWilson.java index aa0965bee..51c22fb50 100644 --- a/src/main/java/neqsim/thermo/component/ComponentWaxWilson.java +++ b/src/main/java/neqsim/thermo/component/ComponentWaxWilson.java @@ -49,8 +49,8 @@ public ComponentWaxWilson(String component_name, double moles, double molesInPha @Override public double fugcoef(PhaseInterface phase1) { if (!isWaxFormer()) { - // fugasityCoeffisient = 1.0e30; - // logFugasityCoeffisient = Math.log(fugasityCoeffisient); + // fugacityCoefficient = 1.0e30; + // logFugacityCoefficient = Math.log(fugacityCoefficient); return 1.0e30; } return fugcoef2(phase1); @@ -65,7 +65,7 @@ public double fugcoef2(PhaseInterface phase1) { refPhase.getComponent(0).fugcoef(refPhase); double liquidPhaseFugacity = - refPhase.getComponent(0).getFugasityCoefficient() * refPhase.getPressure(); + refPhase.getComponent(0).getFugacityCoefficient() * refPhase.getPressure(); // calculating and setting heat of fusion double Tf = 374.5 + 0.2617 * getMolarMass() - 20.172 / getMolarMass(); @@ -84,7 +84,7 @@ public double fugcoef2(PhaseInterface phase1) { double deltaSolVol = (solMolVol - liqMolVol); // calculating activity coefficient according to Wilson - double solidActivityCoefficient = getWilsonActivityCoeffisient(phase1); + double solidActivityCoefficient = getWilsonActivityCoefficient(phase1); // SolidFug = getx() * liquidPhaseFugacity * Math.exp((-getHeatOfFusion() / (R * // phase1.getTemperature()) * (1.0 - phase1.getTemperature() / // getTriplePointTemperature())) ); @@ -99,20 +99,20 @@ public double fugcoef2(PhaseInterface phase1) { - deltaSolVol * (1.0 - phase1.getPressure()) / (R * phase1.getTemperature())); - fugasityCoeffisient = solidActivityCoefficient * SolidFug / (phase1.getPressure() * getx()); - logFugasityCoeffisient = Math.log(fugasityCoeffisient); - return fugasityCoeffisient; + fugacityCoefficient = solidActivityCoefficient * SolidFug / (phase1.getPressure() * getx()); + logFugacityCoefficient = Math.log(fugacityCoefficient); + return fugacityCoefficient; } /** *

- * getWilsonActivityCoeffisient. + * getWilsonActivityCoefficient. *

* * @param phase1 a {@link neqsim.thermo.phase.PhaseInterface} object * @return a double */ - public double getWilsonActivityCoeffisient(PhaseInterface phase1) { + public double getWilsonActivityCoefficient(PhaseInterface phase1) { double sum1 = 0.0; double sum2 = 0.0; double tempSum = 0.0; diff --git a/src/main/java/neqsim/thermo/component/ComponentWonWax.java b/src/main/java/neqsim/thermo/component/ComponentWonWax.java index 7621e692c..7d92b8936 100644 --- a/src/main/java/neqsim/thermo/component/ComponentWonWax.java +++ b/src/main/java/neqsim/thermo/component/ComponentWonWax.java @@ -57,30 +57,30 @@ public double fugcoef2(PhaseInterface phase1) { refPhase.getComponent(0).fugcoef(refPhase); double liquidPhaseFugacity = - refPhase.getComponent(0).getFugasityCoefficient() * refPhase.getPressure(); + refPhase.getComponent(0).getFugacityCoefficient() * refPhase.getPressure(); - double solidActivityCoefficient = getWonActivityCoeficient(phase1); + double solidActivityCoefficient = getWonActivityCoefficient(phase1); logger.info("activity coef Won " + solidActivityCoefficient); SolidFug = getx() * liquidPhaseFugacity * Math.exp(-getHeatOfFusion() / (R * phase1.getTemperature()) * (1.0 - phase1.getTemperature() / getTriplePointTemperature())); - fugasityCoeffisient = solidActivityCoefficient * SolidFug / (phase1.getPressure() * getx()); - logFugasityCoeffisient = Math.log(fugasityCoeffisient); - return fugasityCoeffisient; + fugacityCoefficient = solidActivityCoefficient * SolidFug / (phase1.getPressure() * getx()); + logFugacityCoefficient = Math.log(fugacityCoefficient); + return fugacityCoefficient; } // public double fugcoef(PhaseInterface phase, int numberOfComps, double temp, // double pres){ /** *

- * getWonActivityCoeficient. + * getWonActivityCoefficient. *

* * @param phase1 a {@link neqsim.thermo.phase.PhaseInterface} object * @return a double */ - public double getWonActivityCoeficient(PhaseInterface phase1) { + public double getWonActivityCoefficient(PhaseInterface phase1) { double TetaAvg = 0.0; // double SolidActivity = 0.0; double gamma = 0.0; diff --git a/src/main/java/neqsim/thermo/phase/Phase.java b/src/main/java/neqsim/thermo/phase/Phase.java index d78fed947..a8ba0d0a0 100644 --- a/src/main/java/neqsim/thermo/phase/Phase.java +++ b/src/main/java/neqsim/thermo/phase/Phase.java @@ -1371,7 +1371,7 @@ public double getLogPureComponentFugacity(int k, boolean pure) { refPhase[k].setPressure(pressure); refPhase[k].init(refPhase[k].getNumberOfMolesInPhase(), 1, 1, this.getPhaseType(), 1.0); refPhase[k].getComponent(0).fugcoef(refPhase[k]); - return refPhase[k].getComponent(0).getLogFugasityCoeffisient(); + return refPhase[k].getComponent(0).getLogFugacityCoefficient(); } /** {@inheritDoc} */ @@ -1402,7 +1402,7 @@ public double getLogInfiniteDiluteFugacity(int k, int p) { refPhase[k].setPressure(pressure); refPhase[k].init(refPhase[k].getNumberOfMolesInPhase(), 2, 1, this.getPhaseType(), 1.0); refPhase[k].getComponent(0).fugcoef(refPhase[k]); - return refPhase[k].getComponent(0).getLogFugasityCoeffisient(); + return refPhase[k].getComponent(0).getLogFugacityCoefficient(); } /** {@inheritDoc} */ @@ -1414,7 +1414,7 @@ public double getLogInfiniteDiluteFugacity(int k) { dilphase.init(dilphase.getNumberOfMolesInPhase(), dilphase.getNumberOfComponents(), 1, dilphase.getPhaseType(), 1.0); dilphase.getComponent(k).fugcoef(dilphase); - return dilphase.getComponent(k).getLogFugasityCoeffisient(); + return dilphase.getComponent(k).getLogFugacityCoefficient(); } /** {@inheritDoc} */ @@ -1439,7 +1439,7 @@ public double getInfiniteDiluteFugacity(int k) { @Override public double getLogActivityCoefficient(int k, int p) { double fug = 0.0; - double oldFug = getComponent(k).getLogFugasityCoeffisient(); + double oldFug = getComponent(k).getLogFugacityCoefficient(); if (getComponent(k).getReferenceStateType().equals("solvent")) { fug = getLogPureComponentFugacity(k); } else { @@ -1452,7 +1452,7 @@ public double getLogActivityCoefficient(int k, int p) { @Override public double getActivityCoefficient(int k, int p) { double fug = 0.0; - double oldFug = getComponent(k).getLogFugasityCoeffisient(); + double oldFug = getComponent(k).getLogFugacityCoefficient(); if (getComponent(k).getReferenceStateType().equals("solvent")) { fug = getLogPureComponentFugacity(k); } else { @@ -1466,7 +1466,7 @@ public double getActivityCoefficient(int k, int p) { public double getActivityCoefficient(int k) { double fug = 0.0; - double oldFug = getComponent(k).getLogFugasityCoeffisient(); + double oldFug = getComponent(k).getLogFugacityCoefficient(); if (getComponent(k).getReferenceStateType().equals("solvent")) { fug = getLogPureComponentFugacity(k); } else { @@ -1482,7 +1482,7 @@ public double getActivityCoefficientSymetric(int k) { initRefPhases(true); } double fug = 0.0; - double oldFug = getComponent(k).getLogFugasityCoeffisient(); + double oldFug = getComponent(k).getLogFugacityCoefficient(); fug = getLogPureComponentFugacity(k); return Math.exp(oldFug - fug); } @@ -1491,7 +1491,7 @@ public double getActivityCoefficientSymetric(int k) { @Override public double getActivityCoefficientUnSymetric(int k) { double fug = 0.0; - double oldFug = getComponent(k).getLogFugasityCoeffisient(); + double oldFug = getComponent(k).getLogFugacityCoefficient(); fug = getLogInfiniteDiluteFugacity(k); return Math.exp(oldFug - fug); } @@ -1544,7 +1544,7 @@ public double getOsmoticCoefficientOfWater() { /** {@inheritDoc} */ @Override public double getOsmoticCoefficient(int watNumb) { - double oldFug = getComponent(watNumb).getFugasityCoeffisient(); + double oldFug = getComponent(watNumb).getFugacityCoefficient(); double pureFug = getPureComponentFugacity(watNumb); double ions = 0.0; for (int j = 0; j < this.numberOfComponents; j++) { @@ -1559,7 +1559,7 @@ public double getOsmoticCoefficient(int watNumb) { // public double getOsmoticCoefficient(int watNumb, String refState){ // if(refState.equals("molality")){ - // double oldFug = getComponent(watNumb).getFugasityCoeffisient(); + // double oldFug = getComponent(watNumb).getFugacityCoefficient(); // double pureFug = getPureComponentFugacity(watNumb);system.getPhase(i). // double ions=0.0; // for(int j=0;j0 ORDER BY Temperature ASC"); try { - long numerOfPoint = 3; - logger.error("point " + numerOfPoint); + long numberOfPoint = 3; + logger.error("point " + numberOfPoint); int i = 0; while (dataSet.next()) { i++; - if (i % numerOfPoint == 0) { + if (i % numberOfPoint == 0) { MathiasCopemanToDewPoint function = new MathiasCopemanToDewPoint(); function.setInitialGuess(guess); @@ -113,12 +113,12 @@ public static void main(String[] args) { // reference='Morch2004gas1'"); try { - long numerOfPoint = 1; - logger.info("point " + numerOfPoint); + long numberOfPoint = 1; + logger.info("point " + numberOfPoint); int i = 0; while (dataSet.next() && i < 100) { i++; - if (i % numerOfPoint == 0) { + if (i % numberOfPoint == 0) { MathiasCopemanToDewPoint function = new MathiasCopemanToDewPoint(); function.setInitialGuess(guess); diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/Flash.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/Flash.java index d31f005e8..b03dd1db2 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/Flash.java +++ b/src/main/java/neqsim/thermodynamicOperations/flashOps/Flash.java @@ -161,7 +161,7 @@ public void stabilityAnalysis() throws neqsim.util.exception.IsNaNException, fNormOld = fNorm; for (int i = 0; i < clonedSystem.getPhases()[0].getNumberOfComponents(); i++) { f.set(i, 0, Math.sqrt(Wi[j][i]) * (Math.log(Wi[j][i]) + clonedSystem - .getPhase(j).getComponent(i).getLogFugasityCoeffisient() - d[i])); + .getPhase(j).getComponent(i).getLogFugacityCoefficient() - d[i])); } fNorm = f.norm2(); if (fNorm > fNormOld && iterations > 3 || (iterations + 1) % 7 != 0) { @@ -189,7 +189,7 @@ public void stabilityAnalysis() throws neqsim.util.exception.IsNaNException, for (int i = 0; i < clonedSystem.getPhases()[0] .getNumberOfComponents(); i++) { logWi[i] = d[i] - clonedSystem.getPhase(j).getComponent(i) - .getLogFugasityCoeffisient(); + .getLogFugacityCoefficient(); error[j] += Math.abs((logWi[i] - oldlogw[i]) / oldlogw[i]); Wi[j][i] = Math.exp(logWi[i]); } @@ -209,7 +209,7 @@ public void stabilityAnalysis() throws neqsim.util.exception.IsNaNException, for (int i = 0; i < clonedSystem.getPhases()[0].getNumberOfComponents(); i++) { f.set(i, 0, Math.sqrt(Wi[j][i]) * (Math.log(Wi[j][i]) + clonedSystem - .getPhase(j).getComponent(i).getLogFugasityCoeffisient() - d[i])); + .getPhase(j).getComponent(i).getLogFugacityCoefficient() - d[i])); for (int k = 0; k < clonedSystem.getPhases()[0] .getNumberOfComponents(); k++) { double kronDelt = (i == k) ? 1.5 : 0.0; // adding 0.5 to diagonal @@ -384,8 +384,8 @@ public void solidPhaseFlash() { tempVar[k] = system.getPhase(0).getComponents()[k].getz(); for (int i = 0; i < system.getNumberOfPhases() - 1; i++) { tempVar[k] -= system.getBeta(i) - * system.getPhases()[3].getComponent(k).getFugasityCoeffisient() - / system.getPhase(i).getComponent(k).getFugasityCoeffisient(); + * system.getPhases()[3].getComponent(k).getFugacityCoefficient() + / system.getPhase(i).getComponent(k).getFugacityCoefficient(); } if (tempVar[k] > 0.0 && tempVar[k] > frac) { diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/SolidFlash.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/SolidFlash.java index 546db65f6..6c60cef0d 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/SolidFlash.java +++ b/src/main/java/neqsim/thermodynamicOperations/flashOps/SolidFlash.java @@ -84,7 +84,7 @@ public void setXY() { for (int k = 0; k < system.getNumberOfPhases() - 1; k++) { for (int i = 0; i < system.getPhases()[0].getNumberOfComponents(); i++) { system.getPhase(k).getComponent(i).setx(system.getPhase(0).getComponent(i).getz() - / E[i] / system.getPhase(k).getComponent(i).getFugasityCoeffisient()); + / E[i] / system.getPhase(k).getComponent(i).getFugacityCoefficient()); /* * if (system.getPhase(k).getComponent(i).getx() > 1.0) { * system.getPhase(k).getComponent(i).setx(1.0 - 1e-30); } if @@ -135,18 +135,18 @@ public void calcE() { E[i] = 0.0; for (int k = 0; k < system.getNumberOfPhases() - 1; k++) { E[i] += system.getBeta(k) - / system.getPhase(k).getComponent(i).getFugasityCoeffisient(); + / system.getPhase(k).getComponent(i).getFugacityCoefficient(); } // logger.info("Ei " +E[i]); // if( } // E[solidComponent] += - // system.getBeta(system.getNumberOfPhases()-1)/system.getPhase(3).getComponent(solidComponent).getFugasityCoeffisient(); + // system.getBeta(system.getNumberOfPhases()-1)/system.getPhase(3).getComponent(solidComponent).getFugacityCoefficient(); E[solidComponent] = system.getPhase(0).getComponent(solidComponent).getz() - / system.getPhases()[3].getComponents()[solidComponent].getFugasityCoeffisient(); + / system.getPhases()[3].getComponents()[solidComponent].getFugacityCoefficient(); // logger.info("Ei " +E[solidComponent]); // logger.info("fug " - // +system.getPhase(3).getComponent(solidComponent).getFugasityCoeffisient()); + // +system.getPhase(3).getComponent(solidComponent).getFugacityCoefficient()); // logger.info("zi " +system.getPhase(0).getComponent(solidComponent).getz()); } @@ -174,12 +174,12 @@ public double calcQ() { for (int k = 0; k < system.getNumberOfPhases() - 1; k++) { dQdbeta[k] = 1.0 - system.getPhases()[3].getComponents()[solidComponent] - .getFugasityCoeffisient() - / system.getPhase(k).getComponent(solidComponent).getFugasityCoeffisient(); + .getFugacityCoefficient() + / system.getPhase(k).getComponent(solidComponent).getFugacityCoefficient(); for (int i = 0; i < system.getPhases()[0].getNumberOfComponents(); i++) { if (i != solidComponent) { dQdbeta[k] -= system.getPhase(0).getComponent(i).getz() * 1.0 / E[i] - / system.getPhase(k).getComponent(i).getFugasityCoeffisient(); + / system.getPhase(k).getComponent(i).getFugacityCoefficient(); } } } @@ -193,8 +193,8 @@ public double calcQ() { for (int k = 0; k < system.getPhases()[0].getNumberOfComponents(); k++) { if (k != solidComponent) { Qmatrix[i][j] += system.getPhase(0).getComponent(k).getz() / (E[k] * E[k] - * system.getPhase(j).getComponent(k).getFugasityCoeffisient() - * system.getPhase(i).getComponent(k).getFugasityCoeffisient()); + * system.getPhase(j).getComponent(k).getFugacityCoefficient() + * system.getPhase(i).getComponent(k).getFugacityCoefficient()); } } } @@ -322,8 +322,8 @@ public void calcSolidBeta() { // double beta = 1.0; for (int i = 0; i < system.getNumberOfPhases() - 1; i++) { tempVar -= system.getBeta(i) - * system.getPhase(3).getComponent(solidComponent).getFugasityCoeffisient() - / system.getPhase(i).getComponent(solidComponent).getFugasityCoeffisient(); + * system.getPhase(3).getComponent(solidComponent).getFugacityCoefficient() + / system.getPhase(i).getComponent(solidComponent).getFugacityCoefficient(); // beta -= system.getBeta(i); } if (tempVar > 0 && tempVar < 1.0) { diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/SolidFlash1.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/SolidFlash1.java index 78c83fc47..6f6b65fac 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/SolidFlash1.java +++ b/src/main/java/neqsim/thermodynamicOperations/flashOps/SolidFlash1.java @@ -65,11 +65,11 @@ public void setXY() { if (i != solidIndex) { system.getPhase(k).getComponent(i) .setx(system.getPhase(0).getComponent(i).getz() / E[i] - / system.getPhase(k).getComponent(i).getFugasityCoeffisient()); + / system.getPhase(k).getComponent(i).getFugacityCoefficient()); } else { system.getPhase(k).getComponent(i) - .setx(system.getPhases()[3].getComponent(i).getFugasityCoefficient() - / system.getPhase(k).getComponent(i).getFugasityCoeffisient()); + .setx(system.getPhases()[3].getComponent(i).getFugacityCoefficient() + / system.getPhase(k).getComponent(i).getFugacityCoefficient()); } } } @@ -114,7 +114,7 @@ public void calcE() { E[i] = 0.0; for (int k = 0; k < system.getNumberOfPhases() - solidsNumber; k++) { E[i] += system.getBeta(k) - / system.getPhase(k).getComponent(i).getFugasityCoeffisient(); + / system.getPhase(k).getComponent(i).getFugacityCoefficient(); } } } @@ -146,11 +146,11 @@ public double calcQ() { for (int i = 0; i < solidsNumber; i++) { Q += system.getPhase(0).getComponent(solidIndex).getz() * (1 - Math .log(system.getPhase(0).getComponent(solidIndex).getz() / system.getPhases()[3] - .getComponent(solidIndex).getFugasityCoefficient())); + .getComponent(solidIndex).getFugacityCoefficient())); for (int j = 0; j < system.getNumberOfPhases() - solidsNumber; j++) { Q -= system.getBeta(j) - * system.getPhases()[3].getComponent(solidIndex).getFugasityCoefficient() - / system.getPhase(j).getComponent(solidIndex).getFugasityCoefficient(); + * system.getPhases()[3].getComponent(solidIndex).getFugacityCoefficient() + / system.getPhase(j).getComponent(solidIndex).getFugacityCoefficient(); } } return Q; @@ -167,11 +167,11 @@ public void calcQbeta() { for (int i = 0; i < system.getPhases()[0].getNumberOfComponents(); i++) { if (i == solidIndex) { dQdbeta[k] -= system.getPhases()[3].getComponents()[solidIndex] - .getFugasityCoeffisient() - / system.getPhase(k).getComponent(solidIndex).getFugasityCoeffisient(); + .getFugacityCoefficient() + / system.getPhase(k).getComponent(solidIndex).getFugacityCoefficient(); } else { dQdbeta[k] -= system.getPhase(0).getComponent(i).getz() / E[i] - / system.getPhase(k).getComponent(i).getFugasityCoeffisient(); + / system.getPhase(k).getComponent(i).getFugacityCoefficient(); } } } @@ -192,11 +192,11 @@ public void calcGradientAndHesian() { for (int i = 0; i < system.getPhases()[0].getNumberOfComponents(); i++) { if (i == solidIndex) { dQdbeta[k] -= system.getPhases()[3].getComponent(solidIndex) - .getFugasityCoeffisient() - / system.getPhase(k).getComponent(solidIndex).getFugasityCoeffisient(); + .getFugacityCoefficient() + / system.getPhase(k).getComponent(solidIndex).getFugacityCoefficient(); } else { dQdbeta[k] -= system.getPhase(0).getComponent(i).getz() / E[i] - / system.getPhase(k).getComponent(i).getFugasityCoeffisient(); + / system.getPhase(k).getComponent(i).getFugacityCoefficient(); } } } @@ -207,8 +207,8 @@ public void calcGradientAndHesian() { for (int k = 0; k < system.getPhases()[0].getNumberOfComponents(); k++) { if (k != solidIndex) { Qmatrix[i][j] += system.getPhase(0).getComponent(k).getz() / (E[k] * E[k] - * system.getPhase(j).getComponent(k).getFugasityCoeffisient() - * system.getPhase(i).getComponent(k).getFugasityCoeffisient()); + * system.getPhase(j).getComponent(k).getFugacityCoefficient() + * system.getPhase(i).getComponent(k).getFugacityCoefficient()); } } } @@ -374,8 +374,8 @@ public double calcSolidBeta() { for (int i = 0; i < system.getNumberOfPhases() - solidsNumber; i++) { if (FluidPhaseActiveDescriptors[i] == 1) { tempVar -= system.getBeta(i) - * system.getPhases()[3].getComponent(solidIndex).getFugasityCoeffisient() - / system.getPhase(i).getComponent(solidIndex).getFugasityCoeffisient(); + * system.getPhases()[3].getComponent(solidIndex).getFugacityCoefficient() + / system.getPhase(i).getComponent(solidIndex).getFugacityCoefficient(); // beta -= system.getBeta(i); } } @@ -466,7 +466,7 @@ public int checkAndAddSolidPhase() { // system.getPhases()[3].getComponent(k).fugcoef(system.getPhases()[3]); solidCandidate[k] -= system.getBeta(i) * system.getPhases()[3].getComponent(k).fugcoef(system.getPhases()[3]) - / system.getPhase(i).getComponent(k).getFugasityCoeffisient(); + / system.getPhase(i).getComponent(k).getFugacityCoefficient(); } } } @@ -522,7 +522,7 @@ public double solvebeta1() { for (int i = 0; i < system.getNumberOfPhases(); i++) { solidCandidate -= system.getPhases()[3].getComponent(solidIndex) .fugcoef(system.getPhases()[3]) - / system.getPhase(i).getComponent(solidIndex).getFugasityCoeffisient(); + / system.getPhase(i).getComponent(solidIndex).getFugacityCoefficient(); } double dsoliddn = (solidCandidate - solidCandidateOld) / dn; dn = -0.5 * solidCandidate / dsoliddn; diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/SolidFlash12.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/SolidFlash12.java index 2ee56b90b..1fac6257d 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/SolidFlash12.java +++ b/src/main/java/neqsim/thermodynamicOperations/flashOps/SolidFlash12.java @@ -68,11 +68,11 @@ public void setXY() { if (i != solidIndex) { system.getPhase(k).getComponent(i) .setx(system.getPhase(0).getComponent(i).getz() / E[i] - / system.getPhase(k).getComponent(i).getFugasityCoeffisient()); + / system.getPhase(k).getComponent(i).getFugacityCoefficient()); } else { system.getPhase(k).getComponent(i) - .setx(system.getPhases()[3].getComponent(i).getFugasityCoefficient() - / system.getPhase(k).getComponent(i).getFugasityCoeffisient()); + .setx(system.getPhases()[3].getComponent(i).getFugacityCoefficient() + / system.getPhase(k).getComponent(i).getFugacityCoefficient()); } } } @@ -117,7 +117,7 @@ public void calcE() { E[i] = 0.0; for (int k = 0; k < system.getNumberOfPhases() - solidsNumber; k++) { E[i] += system.getBeta(k) - / system.getPhase(k).getComponent(i).getFugasityCoeffisient(); + / system.getPhase(k).getComponent(i).getFugacityCoefficient(); } } } @@ -150,11 +150,11 @@ public double calcQ() { for (int i = 0; i < solidsNumber; i++) { Q += system.getPhase(0).getComponent(solidIndex).getz() * (1 - Math .log(system.getPhase(0).getComponent(solidIndex).getz() / system.getPhases()[3] - .getComponent(solidIndex).getFugasityCoefficient())); + .getComponent(solidIndex).getFugacityCoefficient())); for (int j = 0; j < system.getNumberOfPhases() - solidsNumber; j++) { Q -= system.getBeta(j) - * system.getPhases()[3].getComponent(solidIndex).getFugasityCoefficient() - / system.getPhase(j).getComponent(solidIndex).getFugasityCoefficient(); + * system.getPhases()[3].getComponent(solidIndex).getFugacityCoefficient() + / system.getPhase(j).getComponent(solidIndex).getFugacityCoefficient(); } } @@ -163,11 +163,11 @@ public double calcQ() { for (int i = 0; i < system.getPhases()[0].getNumberOfComponents(); i++) { if (i == solidIndex) { dQdbeta[k] -= system.getPhases()[3].getComponents()[solidIndex] - .getFugasityCoeffisient() - / system.getPhase(k).getComponent(solidIndex).getFugasityCoeffisient(); + .getFugacityCoefficient() + / system.getPhase(k).getComponent(solidIndex).getFugacityCoefficient(); } else { dQdbeta[k] -= system.getPhase(0).getComponent(i).getz() / E[i] - / system.getPhase(k).getComponent(i).getFugasityCoeffisient(); + / system.getPhase(k).getComponent(i).getFugacityCoefficient(); } } } @@ -178,8 +178,8 @@ public double calcQ() { for (int k = 0; k < system.getPhases()[0].getNumberOfComponents(); k++) { if (k != solidIndex) { Qmatrix[i][j] += system.getPhase(0).getComponent(k).getz() / (E[k] * E[k] - * system.getPhase(j).getComponent(k).getFugasityCoeffisient() - * system.getPhase(i).getComponent(k).getFugasityCoeffisient()); + * system.getPhase(j).getComponent(k).getFugacityCoefficient() + * system.getPhase(i).getComponent(k).getFugacityCoefficient()); } } } @@ -296,8 +296,8 @@ public void calcSolidBeta() { // double beta = 1.0; for (int i = 0; i < system.getNumberOfPhases() - 1; i++) { tempVar -= system.getBeta(i) - * system.getPhase(3).getComponent(solidIndex).getFugasityCoeffisient() - / system.getPhase(i).getComponent(solidIndex).getFugasityCoeffisient(); + * system.getPhase(3).getComponent(solidIndex).getFugacityCoefficient() + / system.getPhase(i).getComponent(solidIndex).getFugacityCoefficient(); // beta -= system.getBeta(i); } if (tempVar > 0 && tempVar < 1.0) { @@ -349,7 +349,7 @@ public int checkAndAddSolidPhase() { for (int i = 0; i < system.getNumberOfPhases(); i++) { solidCandidate[k] -= system.getPhases()[3].getComponent(k).fugcoef(system.getPhases()[3]) - / system.getPhase(i).getComponent(k).getFugasityCoeffisient(); + / system.getPhase(i).getComponent(k).getFugacityCoefficient(); } } } @@ -402,7 +402,7 @@ public double solvebeta1() { for (int i = 0; i < system.getNumberOfPhases(); i++) { solidCandidate -= system.getPhases()[3].getComponent(solidIndex) .fugcoef(system.getPhases()[3]) - / system.getPhase(i).getComponent(solidIndex).getFugasityCoeffisient(); + / system.getPhase(i).getComponent(solidIndex).getFugacityCoefficient(); } double dsoliddn = (solidCandidate - solidCandidateOld) / dn; dn = -0.5 * solidCandidate / dsoliddn; diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/TPflash.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/TPflash.java index 8abd5208a..46d164d03 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/TPflash.java +++ b/src/main/java/neqsim/thermodynamicOperations/flashOps/TPflash.java @@ -75,8 +75,8 @@ public void sucsSubs() { } else { Kold = system.getPhase(0).getComponent(i).getK(); system.getPhase(0).getComponent(i) - .setK(system.getPhase(1).getComponent(i).getFugasityCoeffisient() - / system.getPhase(0).getComponent(i).getFugasityCoeffisient() + .setK(system.getPhase(1).getComponent(i).getFugacityCoefficient() + / system.getPhase(0).getComponent(i).getFugacityCoefficient() * presdiff); if (Double.isNaN(system.getPhase(0).getComponent(i).getK())) { system.getPhase(0).getComponent(i).setK(Kold); @@ -154,8 +154,8 @@ public void setNewK() { lnOldOldOldK[i] = lnOldOldK[i]; lnOldOldK[i] = lnOldK[i]; lnOldK[i] = lnK[i]; - lnK[i] = Math.log(system.getPhase(1).getComponent(i).getFugasityCoeffisient()) - - Math.log(system.getPhase(0).getComponents()[i].getFugasityCoeffisient()); + lnK[i] = Math.log(system.getPhase(1).getComponent(i).getFugacityCoefficient()) + - Math.log(system.getPhase(0).getComponents()[i].getFugacityCoefficient()); oldoldDeltalnK[i] = lnOldOldK[i] - lnOldOldOldK[i]; oldDeltalnK[i] = lnOldK[i] - lnOldOldK[i]; @@ -225,7 +225,7 @@ public void run() { for (int i = 0; i < system.getPhase(0).getNumberOfComponents(); i++) { minGibsPhaseLogZ[i] = Math.log(system.getPhase(minGibbsPhase).getComponent(i).getz()); minGibsLogFugCoef[i] = - system.getPhase(minGibbsPhase).getComponent(i).getLogFugasityCoeffisient(); + system.getPhase(minGibbsPhase).getComponent(i).getLogFugacityCoefficient(); } presdiff = system.getPhase(1).getPressure() / system.getPhase(0).getPressure(); @@ -292,11 +292,11 @@ public void run() { } else { for (i = 0; i < system.getPhases()[0].getNumberOfComponents(); i++) { tpdy += system.getPhase(0).getComponent(i).getx() - * (Math.log(system.getPhase(0).getComponent(i).getFugasityCoeffisient()) + * (Math.log(system.getPhase(0).getComponent(i).getFugacityCoefficient()) + Math.log(system.getPhase(0).getComponents()[i].getx()) - minGibsPhaseLogZ[i] - minGibsLogFugCoef[i]); tpdx += system.getPhase(1).getComponent(i).getx() - * (Math.log(system.getPhase(1).getComponent(i).getFugasityCoeffisient()) + * (Math.log(system.getPhase(1).getComponent(i).getFugacityCoefficient()) + Math.log(system.getPhase(1).getComponents()[i].getx()) - minGibsPhaseLogZ[i] - minGibsLogFugCoef[i]); } @@ -309,7 +309,7 @@ public void run() { for (i = 0; i < system.getPhases()[0].getNumberOfComponents(); i++) { system.getPhase(0).getComponent(i) .setK(Math.exp(Math.log( - system.getPhase(1).getComponent(i).getFugasityCoeffisient()) + system.getPhase(1).getComponent(i).getFugacityCoefficient()) - minGibsLogFugCoef[i]) * presdiff); system.getPhase(1).getComponent(i) .setK(system.getPhase(0).getComponent(i).getK()); @@ -319,7 +319,7 @@ public void run() { system.getPhase(0).getComponents()[i] .setK(Math .exp(minGibsLogFugCoef[i] - Math.log(system.getPhase(0) - .getComponent(i).getFugasityCoeffisient())) + .getComponent(i).getFugacityCoefficient())) * presdiff); system.getPhase(1).getComponent(i) .setK(system.getPhase(0).getComponent(i).getK()); diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/TPgradientFlash.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/TPgradientFlash.java index eb77743bf..a30d511f2 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/TPgradientFlash.java +++ b/src/main/java/neqsim/thermodynamicOperations/flashOps/TPgradientFlash.java @@ -61,10 +61,10 @@ public TPgradientFlash(SystemInterface system, double height, double temperature public void setfvec() { for (int i = 0; i < system.getPhase(0).getNumberOfComponents(); i++) { fvec.set(i, 0, Math - .log(localSystem.getPhases()[0].getComponents()[i].getFugasityCoeffisient() + .log(localSystem.getPhases()[0].getComponents()[i].getFugacityCoefficient() * localSystem.getPhases()[0].getComponents()[i].getx() * localSystem.getPressure()) - - Math.log(tempSystem.getPhases()[0].getComponents()[i].getFugasityCoeffisient() + - Math.log(tempSystem.getPhases()[0].getComponents()[i].getFugacityCoefficient() * tempSystem.getPhases()[0].getComponents()[i].getx() * tempSystem.getPressure()) - tempSystem.getPhases()[0].getComponents()[i].getMolarMass() @@ -101,10 +101,10 @@ public void setJac() { for (int j = 0; j < system.getPhase(0).getNumberOfComponents(); j++) { dij = i == j ? 1.0 : 0.0;// Kroneckers delta tempJ = 1.0 - / (localSystem.getPhases()[0].getComponents()[i].getFugasityCoeffisient() + / (localSystem.getPhases()[0].getComponents()[i].getFugacityCoefficient() * localSystem.getPhases()[0].getComponents()[i].getx() * localSystem.getPressure()) - * (localSystem.getPhases()[0].getComponents()[i].getFugasityCoeffisient() + * (localSystem.getPhases()[0].getComponents()[i].getFugacityCoefficient() * dij * localSystem.getPressure() + localSystem.getPhases()[0].getComponents()[i].getdfugdx(j) * localSystem.getPhases()[0].getComponents()[i].getx() diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/TPmultiflash.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/TPmultiflash.java index 6a4958dcc..5a0ea444a 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/TPmultiflash.java +++ b/src/main/java/neqsim/thermodynamicOperations/flashOps/TPmultiflash.java @@ -101,7 +101,7 @@ public void setXY() { if (system.getPhase(0).getComponent(i).getz() > 1e-100) { system.getPhase(k).getComponents()[i] .setx(system.getPhase(0).getComponents()[i].getz() / Erow[i] - / system.getPhase(k).getComponent(i).getFugasityCoeffisient()); + / system.getPhase(k).getComponent(i).getFugacityCoefficient()); } if (system.getPhase(0).getComponent(i).getIonicCharge() != 0 && !system.getPhase(k).getPhaseTypeName().equals("aqueous")) { @@ -130,7 +130,7 @@ public void calcE() { Erow[i] = 0.0; for (int k = 0; k < system.getNumberOfPhases(); k++) { Erow[i] += system.getPhase(k).getBeta() - / system.getPhase(k).getComponent(i).getFugasityCoeffisient(); + / system.getPhase(k).getComponent(i).getFugacityCoefficient(); } } } @@ -162,7 +162,7 @@ public double calcQ() { dQdbeta[k][0] = 1.0; for (int i = 0; i < system.getPhase(0).getNumberOfComponents(); i++) { dQdbeta[k][0] -= - multTerm[i] / system.getPhase(k).getComponent(i).getFugasityCoeffisient(); + multTerm[i] / system.getPhase(k).getComponent(i).getFugacityCoefficient(); } } @@ -171,8 +171,8 @@ public double calcQ() { Qmatrix[i][j] = 0.0; for (int k = 0; k < system.getPhase(0).getNumberOfComponents(); k++) { Qmatrix[i][j] += multTerm2[k] - / (system.getPhase(j).getComponent(k).getFugasityCoeffisient() - * system.getPhase(i).getComponent(k).getFugasityCoeffisient()); + / (system.getPhase(j).getComponent(k).getFugacityCoefficient() + * system.getPhase(i).getComponent(k).getFugacityCoefficient()); } if (i == j) { Qmatrix[i][j] += 1.0e-3; @@ -291,14 +291,14 @@ public void stabilityAnalysis() { * logger.info("x: " + ( clonedSystem.get(k)).getPhase(0).getComponents()[i].getx()); } if * (system.getPhase(0).getComponent(k).getx() > 1e-100) { d[k] = * Math.log(system.getPhase(0).getComponents()[k].getx()) + - * system.getPhase(0).getComponents()[k].getLogFugasityCoeffisient(); + * system.getPhase(0).getComponents()[k].getLogFugacityCoefficient(); * if(minimumGibbsEnergySystem.getPhases()[lowestGibbsEnergyPhase].getComponents * ()[k].getIonicCharge()!=0) d[k]=0; } //logger.info("dk: " + d[k]); } */ for (int k = 0; k < minimumGibbsEnergySystem.getPhase(0).getNumberOfComponents(); k++) { if (system.getPhase(0).getComponent(k).getx() > 1e-100) { d[k] = Math.log(system.getPhase(0).getComponents()[k].getx()) - + system.getPhase(0).getComponents()[k].getLogFugasityCoeffisient(); + + system.getPhase(0).getComponents()[k].getLogFugacityCoefficient(); // if(minimumGibbsEnergySystem.getPhases()[lowestGibbsEnergyPhase].getComponents()[k].getIonicCharge()!=0) // d[k]=0; } @@ -405,10 +405,10 @@ public void stabilityAnalysis() { // oldlogw[i] = logWi[i]; if (!Double .isInfinite(clonedSystem.get(0).getPhase(1).getComponents()[i] - .getLogFugasityCoeffisient()) + .getLogFugacityCoefficient()) && system.getPhase(0).getComponent(i).getx() > 1e-100) { logWi[i] = d[i] - clonedSystem.get(0).getPhase(1).getComponents()[i] - .getLogFugasityCoeffisient(); + .getLogFugacityCoefficient(); if (clonedSystem.get(0).getPhase(1).getComponents()[i] .getIonicCharge() != 0) { logWi[i] = -1000.0; @@ -452,7 +452,7 @@ public void stabilityAnalysis() { f.set(i, 0, Math.sqrt(Wi[j][i]) * (Math.log(Wi[j][i]) + clonedSystem.get(0).getPhases()[1].getComponents()[i] - .getLogFugasityCoeffisient() + .getLogFugacityCoefficient() - d[i])); } for (int k = 0; k < clonedSystem.get(0).getPhases()[0] @@ -641,7 +641,7 @@ public void stabilityAnalysis2() { } if (system.getPhase(0).getComponent(k).getx() > 1e-100) { d[k] = Math.log(system.getPhase(0).getComponents()[k].getx()) - + system.getPhase(0).getComponents()[k].getLogFugasityCoeffisient(); + + system.getPhase(0).getComponents()[k].getLogFugacityCoefficient(); // if(minimumGibbsEnergySystem.getPhases()[lowestGibbsEnergyPhase].getComponents()[k].getIonicCharge()!=0) // d[k]=0; } @@ -738,11 +738,11 @@ public void stabilityAnalysis2() { // oldlogw[i] = logWi[i]; if (!Double .isInfinite((clonedSystem.get(j)).getPhase(1).getComponents()[i] - .getLogFugasityCoeffisient()) + .getLogFugacityCoefficient()) && system.getPhase(0).getComponent(i).getx() > 1e-100) { logWi[i] = d[i] - (clonedSystem.get(j)).getPhase(1).getComponents()[i] - .getLogFugasityCoeffisient(); + .getLogFugacityCoefficient(); if ((clonedSystem.get(j)).getPhase(1).getComponents()[i] .getIonicCharge() != 0) { logWi[i] = -1000.0; @@ -786,7 +786,7 @@ public void stabilityAnalysis2() { if (system.getPhase(0).getComponent(i).getz() > 1e-100) { f.set(i, 0, Math.sqrt(Wi[j][i]) * (Math.log(Wi[j][i]) + (clonedSystem.get(j)).getPhases()[1].getComponents()[i] - .getLogFugasityCoeffisient() + .getLogFugacityCoefficient() - d[i])); } for (int k = 0; k < (clonedSystem.get(j)).getPhases()[0] diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/TPmultiflashWAX.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/TPmultiflashWAX.java index 90f133029..1f80127fe 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/TPmultiflashWAX.java +++ b/src/main/java/neqsim/thermodynamicOperations/flashOps/TPmultiflashWAX.java @@ -74,7 +74,7 @@ public void setXY() { if (system.getPhase(0).getComponent(i).getz() > 1e-100) { system.getPhase(k).getComponents()[i].setx(system.getPhase(0).getComponents()[i] .getz() / E[i] - / system.getPhase(k).getComponents()[i].getFugasityCoeffisient()); + / system.getPhase(k).getComponents()[i].getFugacityCoefficient()); } if (system.getPhase(0).getComponent(i).getIonicCharge() != 0 && !system.getPhase(k).getPhaseTypeName().equals("aqueous")) { @@ -105,7 +105,7 @@ public void calcE() { for (int i = 0; i < system.getPhase(0).getNumberOfComponents(); i++) { for (int k = 0; k < system.getNumberOfPhases(); k++) { E[i] += system.getPhase(k).getBeta() - / system.getPhase(k).getComponents()[i].getFugasityCoeffisient(); + / system.getPhase(k).getComponents()[i].getFugacityCoefficient(); } } } @@ -138,7 +138,7 @@ public double calcQ() { dQdbeta[k] = 1.0; for (int i = 0; i < system.getPhase(0).getNumberOfComponents(); i++) { dQdbeta[k] -= system.getPhase(0).getComponents()[i].getz() * 1.0 / E[i] - / system.getPhase(k).getComponents()[i].getFugasityCoeffisient(); + / system.getPhase(k).getComponents()[i].getFugacityCoefficient(); } } @@ -147,8 +147,8 @@ public double calcQ() { Qmatrix[i][j] = 0; for (int k = 0; k < system.getPhase(0).getNumberOfComponents(); k++) { Qmatrix[i][j] += system.getPhase(0).getComponents()[k].getz() / (E[k] * E[k] - * system.getPhase(j).getComponents()[k].getFugasityCoeffisient() - * system.getPhase(i).getComponents()[k].getFugasityCoeffisient()); + * system.getPhase(j).getComponents()[k].getFugacityCoefficient() + * system.getPhase(i).getComponents()[k].getFugacityCoefficient()); } if (i == j) { Qmatrix[i][j] += 1e-10; @@ -284,7 +284,7 @@ public void stabilityAnalysis() { .log(minimumGibbsEnergySystem.getPhases()[lowestGibbsEnergyPhase] .getComponents()[k].getx()) + minimumGibbsEnergySystem.getPhases()[lowestGibbsEnergyPhase] - .getComponents()[k].getLogFugasityCoeffisient(); + .getComponents()[k].getLogFugacityCoefficient(); } } @@ -346,11 +346,11 @@ public void stabilityAnalysis() { oldlogw[i] = logWi[i]; if (!Double.isInfinite(Math .log((clonedSystem.get(j)).getPhase(waxphasenumber).getComponents()[i] - .getLogFugasityCoeffisient())) + .getLogFugacityCoefficient())) && system.getPhase(0).getComponent(i).getx() > 1e-100) { logWi[i] = d[i] - Math.log( (clonedSystem.get(j)).getPhase(waxphasenumber).getComponents()[i] - .getFugasityCoeffisient()); + .getFugacityCoefficient()); if ((clonedSystem.get(j)).getPhase(1).getComponents()[i] .getIonicCharge() != 0) { logWi[i] = -1000.0; diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/TPmultiflash_1.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/TPmultiflash_1.java index 74d74bd6c..b1c187b25 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/TPmultiflash_1.java +++ b/src/main/java/neqsim/thermodynamicOperations/flashOps/TPmultiflash_1.java @@ -78,7 +78,7 @@ public void setXY() { system.getPhases()[k].getComponents()[i] .setx(system.getPhases()[k].getComponents()[i].getz() / E[i] / system.getPhases()[k].getComponents()[i] - .getFugasityCoeffisient()); + .getFugacityCoefficient()); } } } @@ -94,7 +94,7 @@ public void calcE() { for (int i = 0; i < system.getPhases()[0].getNumberOfComponents(); i++) { for (int k = 0; k < system.getNumberOfPhases(); k++) { E[i] += system.getPhases()[k].getBeta() - / system.getPhases()[k].getComponents()[i].getFugasityCoeffisient(); + / system.getPhases()[k].getComponents()[i].getFugacityCoefficient(); } } } @@ -127,7 +127,7 @@ public double calcQ() { dQdbeta[k] = 1.0; for (int i = 0; i < system.getPhases()[0].getNumberOfComponents(); i++) { dQdbeta[k] -= system.getPhases()[0].getComponents()[i].getz() * 1.0 / E[i] - / system.getPhases()[k].getComponents()[i].getFugasityCoeffisient(); + / system.getPhases()[k].getComponents()[i].getFugacityCoefficient(); } } @@ -136,8 +136,8 @@ public double calcQ() { Qmatrix[i][j] = 0; for (int k = 0; k < system.getPhases()[0].getNumberOfComponents(); k++) { Qmatrix[i][j] += system.getPhases()[0].getComponents()[k].getz() / (E[k] * E[k] - * system.getPhases()[j].getComponents()[k].getFugasityCoeffisient() - * system.getPhases()[i].getComponents()[k].getFugasityCoeffisient()); + * system.getPhases()[j].getComponents()[k].getFugacityCoefficient() + * system.getPhases()[i].getComponents()[k].getFugacityCoefficient()); } } } @@ -242,7 +242,7 @@ public void stabilityAnalysis() { minimumGibbsEnergySystem.getPhases()[lowestGibbsEnergyPhase].getComponents()[k] .getx()) + Math.log(minimumGibbsEnergySystem.getPhases()[lowestGibbsEnergyPhase] - .getComponents()[k].getFugasityCoeffisient()); + .getComponents()[k].getFugacityCoefficient()); // logger.info("dk: " + d[k]); } @@ -258,7 +258,7 @@ public void stabilityAnalysis() { oldlogw[i] = logWi[i]; logWi[i] = d[i] - Math.log((clonedSystem.get(j)).getPhases()[1].getComponents()[i] - .getFugasityCoeffisient()); + .getFugacityCoefficient()); err += Math.abs(logWi[i] - oldlogw[i]); Wi[j][i] = Math.exp(logWi[i]); } diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/dTPflash.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/dTPflash.java index 1e1bc72b3..eabd37aa7 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/dTPflash.java +++ b/src/main/java/neqsim/thermodynamicOperations/flashOps/dTPflash.java @@ -60,21 +60,21 @@ public void run() { for (int j = 0; j < flashComp.length; j++) { if (flashComp[j].equals(system.getPhase(0).getComponent(i).getName())) { diff += Math.abs((system.getPhase(1).getComponent(i).getx() - * system.getPhase(1).getComponent(i).getFugasityCoefficient() + * system.getPhase(1).getComponent(i).getFugacityCoefficient() * system.getPhase(1).getPressure()) - (system.getPhase(0).getComponent(i).getx() * system.getPhase(0).getComponent(i) - .getFugasityCoefficient() + .getFugacityCoefficient() * system.getPhase(0).getPressure())); system.getPhase(1).getComponent(i) .setx(system.getPhase(1).getComponent(i).getx() * (system.getPhase(0).getComponent(i).getx() * system.getPhase(0).getComponent(i) - .getFugasityCoefficient() + .getFugacityCoefficient() * system.getPhase(0).getPressure()) / (system.getPhase(1).getComponent(i).getx() * system.getPhase(1).getComponent(i) - .getFugasityCoefficient() + .getFugacityCoefficient() * system.getPhase(1).getPressure())); // fracdiff += system.getPhase(1).getComponent(i).getz() - diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/FreezeOut.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/FreezeOut.java index 46c76a348..5cd955a93 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/FreezeOut.java +++ b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/FreezeOut.java @@ -127,7 +127,7 @@ public void run() { * testSystem.getPressure()); SolidFug = Pvapsolid - * testSystem2.getPhase(0).getComponent(0).getFugasityCoeffisient() + * testSystem2.getPhase(0).getComponent(0).getFugacityCoefficient() * Math.exp(solvol / (R * temp) * (pres - Pvapsolid)); FluidFug = testSystem.getPhase(0).getFugacity(k); diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/FugTestConstP.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/FugTestConstP.java index 8443f8776..05489d77e 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/FugTestConstP.java +++ b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/FugTestConstP.java @@ -130,7 +130,7 @@ public void run() { testOps2.TPflash(); SolVapFugCoeff = - testSystem2.getPhase(0).getComponent(0).getFugasityCoeffisient(); + testSystem2.getPhase(0).getComponent(0).getFugacityCoefficient(); Fug[3][i] = testSystem.getPhase(0).getFugacity(k); Fug[1][i] = SolidFug * SolVapFugCoeff; diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/HCdewPointPressureFlash.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/HCdewPointPressureFlash.java index f1d2d2e1e..4d4e52870 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/HCdewPointPressureFlash.java +++ b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/HCdewPointPressureFlash.java @@ -90,9 +90,9 @@ public void run() { system.getPhases()[0].getComponents()[i].setK(1e-40); } else { system.getPhases()[0].getComponents()[i].setK(Math.exp(Math.log( - system.getPhases()[1].getComponents()[i].getFugasityCoeffisient()) + system.getPhases()[1].getComponents()[i].getFugacityCoefficient()) - Math.log(system.getPhases()[0].getComponents()[i] - .getFugasityCoeffisient()))); + .getFugacityCoefficient()))); } system.getPhases()[1].getComponents()[i] .setK(system.getPhases()[0].getComponents()[i].getK()); diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/HydrateFormationPressureFlash.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/HydrateFormationPressureFlash.java index e413d1224..daa05bc8b 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/HydrateFormationPressureFlash.java +++ b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/HydrateFormationPressureFlash.java @@ -58,7 +58,7 @@ public void run() { / system.getPhase(0).getFugacity("water"))); system.setPressure(system.getPressure() * (system.getPhase(4).getFugacity("water") / system.getPhase(0).getFugacity("water"))); - logger.info("presure " + system.getPressure()); + logger.info("pressure " + system.getPressure()); // logger.info("x water " + system.getPhase(3).getComponent("water").getx()); } while (Math.abs((olfFug - system.getPhase(4).getFugacity("water")) / olfFug) > 1e-8 && iter < 100); diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/SolidComplexTemperatureCalc.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/SolidComplexTemperatureCalc.java index 8acc2d449..26a2efceb 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/SolidComplexTemperatureCalc.java +++ b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/SolidComplexTemperatureCalc.java @@ -111,7 +111,7 @@ public void runOld() { // system.getPhases()[5].getComponent(i).setx(Ksolid[i] * // system.getPhase(0).getComponent(i).getx()); // if (system.getPhases()[5].getComponent(i).getx() > 0.000001) { - Ksolid[i] = system.getPhase(0).getComponent(i).getFugasityCoefficient() + Ksolid[i] = system.getPhase(0).getComponent(i).getFugacityCoefficient() / system.getPhases()[5].getComponent(i).fugcoef(system.getPhases()[5]); sumx += Ksolid[i] * system.getPhase(0).getComponent(i).getx(); // } diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/WATcalc.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/WATcalc.java index e33a38cd0..0906c556f 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/WATcalc.java +++ b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/WATcalc.java @@ -56,7 +56,7 @@ public void run() { for (int i = 0; i < system.getPhase(0).getNumberOfComponents(); i++) { system.getPhases()[5].getComponent(i) .setx(Ksolid[i] * system.getPhase(0).getComponent(i).getx()); - Ksolid[i] = system.getPhase(0).getComponent(i).getFugasityCoefficient() + Ksolid[i] = system.getPhase(0).getComponent(i).getFugacityCoefficient() / system.getPhases()[5].getComponent(i).fugcoef(system.getPhases()[5]); sumx += Ksolid[i] * system.getPhase(0).getComponent(i).getx(); } diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/bubblePointPressureFlash.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/bubblePointPressureFlash.java index 652090ec6..46c5d916b 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/bubblePointPressureFlash.java +++ b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/bubblePointPressureFlash.java @@ -96,17 +96,17 @@ public void run() { do { yold = system.getPhases()[0].getComponents()[i].getx(); if (!Double.isNaN(Math.exp(Math.log( - system.getPhases()[1].getComponents()[i].getFugasityCoeffisient()) + system.getPhases()[1].getComponents()[i].getFugacityCoefficient()) - Math.log(system.getPhases()[0].getComponents()[i] - .getFugasityCoeffisient())))) { + .getFugacityCoefficient())))) { if (system.getPhase(0).getComponent(i).getIonicCharge() != 0) { system.getPhases()[0].getComponents()[i].setK(1e-40); } else { system.getPhases()[0].getComponents()[i].setK(Math.exp(Math .log(system.getPhases()[1].getComponents()[i] - .getFugasityCoeffisient()) + .getFugacityCoefficient()) - Math.log(system.getPhases()[0].getComponents()[i] - .getFugasityCoeffisient()))); + .getFugacityCoefficient()))); } } system.getPhases()[1].getComponents()[i] diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/bubblePointPressureFlashDer.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/bubblePointPressureFlashDer.java index 2b48f786e..f3faddc8b 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/bubblePointPressureFlashDer.java +++ b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/bubblePointPressureFlashDer.java @@ -94,17 +94,17 @@ public void run() { do { yold = system.getPhases()[0].getComponents()[i].getx(); if (!Double.isNaN(Math.exp(Math.log( - system.getPhases()[1].getComponents()[i].getFugasityCoeffisient()) + system.getPhases()[1].getComponents()[i].getFugacityCoefficient()) - Math.log(system.getPhases()[0].getComponents()[i] - .getFugasityCoeffisient())))) { + .getFugacityCoefficient())))) { if (system.getPhase(0).getComponent(i).getIonicCharge() != 0) { system.getPhases()[0].getComponents()[i].setK(1e-40); } else { system.getPhases()[0].getComponents()[i].setK(Math.exp(Math .log(system.getPhases()[1].getComponents()[i] - .getFugasityCoeffisient()) + .getFugacityCoefficient()) - Math.log(system.getPhases()[0].getComponents()[i] - .getFugasityCoeffisient()))); + .getFugacityCoefficient()))); } } system.getPhases()[1].getComponents()[i] diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/bubblePointTemperatureFlash.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/bubblePointTemperatureFlash.java index 80e12fdaf..67149d426 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/bubblePointTemperatureFlash.java +++ b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/bubblePointTemperatureFlash.java @@ -63,17 +63,17 @@ public void run() { yold = system.getPhases()[0].getComponents()[i].getx(); system.getPhases()[0].getComponents()[i] - .setK(system.getPhases()[1].getComponents()[i].getFugasityCoeffisient() + .setK(system.getPhases()[1].getComponents()[i].getFugacityCoefficient() / system.getPhases()[0].getComponents()[i] - .getFugasityCoeffisient()); + .getFugacityCoefficient()); system.getPhases()[1].getComponents()[i] .setK(system.getPhases()[0].getComponents()[i].getK()); system.getPhases()[0].getComponents()[i] .setx(system.getPhases()[1].getComponents()[i].getx() * system.getPhases()[1].getComponents()[i] - .getFugasityCoeffisient() + .getFugacityCoefficient() / system.getPhases()[0].getComponents()[i] - .getFugasityCoeffisient()); + .getFugacityCoefficient()); } while ((Math.abs(yold - system.getPhases()[1].getComponents()[i].getx()) > 1e-10) && (iterations < maxNumberOfIterations)); diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/bubblePointTemperatureNoDer.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/bubblePointTemperatureNoDer.java index 1db9af7c1..10f4ab06a 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/bubblePointTemperatureNoDer.java +++ b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/bubblePointTemperatureNoDer.java @@ -112,9 +112,9 @@ public void run() { system.getPhases()[0].getComponents()[i].setK(1e-40); } else { system.getPhases()[0].getComponents()[i].setK(Math.exp(Math.log( - system.getPhases()[1].getComponents()[i].getFugasityCoeffisient()) + system.getPhases()[1].getComponents()[i].getFugacityCoefficient()) - Math.log(system.getPhases()[0].getComponents()[i] - .getFugasityCoeffisient()))); + .getFugacityCoefficient()))); } system.getPhases()[1].getComponents()[i] .setK(system.getPhases()[0].getComponents()[i].getK()); @@ -156,8 +156,8 @@ public void run() { setSuperCritical(true); } if (system.getPhase(0).getNumberOfComponents() == 1 - && Math.abs(system.getPhases()[1].getComponents()[0].getFugasityCoeffisient() - / system.getPhases()[0].getComponents()[0].getFugasityCoeffisient() + && Math.abs(system.getPhases()[1].getComponents()[0].getFugacityCoefficient() + / system.getPhases()[0].getComponents()[0].getFugacityCoefficient() - 1.0) < 1e-20) { setSuperCritical(true); return; diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/constantDutyFlash.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/constantDutyFlash.java index 93f1efe9f..47296fdb0 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/constantDutyFlash.java +++ b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/constantDutyFlash.java @@ -73,13 +73,13 @@ public void run() { for (int i = 0; i < system.getPhases()[0].getNumberOfComponents(); i++) { system.getPhases()[0].getComponents()[i] - .setK(system.getPhases()[0].getComponents()[i].getFugasityCoeffisient() + .setK(system.getPhases()[0].getComponents()[i].getFugacityCoefficient() / system.getPhases()[1].getComponents()[i] - .getFugasityCoeffisient()); + .getFugacityCoefficient()); system.getPhases()[1].getComponents()[i] - .setK(system.getPhases()[0].getComponents()[i].getFugasityCoeffisient() + .setK(system.getPhases()[0].getComponents()[i].getFugacityCoefficient() / system.getPhases()[1].getComponents()[i] - .getFugasityCoeffisient()); + .getFugacityCoefficient()); } system.calc_x_y(); diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/constantDutyPressureFlash.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/constantDutyPressureFlash.java index ca26ec2b6..42759fbe4 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/constantDutyPressureFlash.java +++ b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/constantDutyPressureFlash.java @@ -52,9 +52,9 @@ public void run() { iterations++; for (int i = 0; i < system.getPhases()[0].getNumberOfComponents(); i++) { system.getPhases()[0].getComponents()[i] - .setK(system.getPhases()[1].getComponents()[i].getFugasityCoeffisient() + .setK(system.getPhases()[1].getComponents()[i].getFugacityCoefficient() / system.getPhases()[0].getComponents()[i] - .getFugasityCoeffisient()); + .getFugacityCoefficient()); system.getPhases()[1].getComponents()[i] .setK(system.getPhases()[0].getComponents()[i].getK()); } diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/constantDutyTemperatureFlash.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/constantDutyTemperatureFlash.java index bda6c762d..c62025c4a 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/constantDutyTemperatureFlash.java +++ b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/constantDutyTemperatureFlash.java @@ -49,13 +49,13 @@ public void run() { for (int i = 0; i < system.getPhases()[0].getNumberOfComponents(); i++) { system.getPhases()[0].getComponents()[i] - .setK(system.getPhases()[0].getComponents()[i].getFugasityCoeffisient() + .setK(system.getPhases()[0].getComponents()[i].getFugacityCoefficient() / system.getPhases()[1].getComponents()[i] - .getFugasityCoeffisient()); + .getFugacityCoefficient()); system.getPhases()[1].getComponents()[i] - .setK(system.getPhases()[0].getComponents()[i].getFugasityCoeffisient() + .setK(system.getPhases()[0].getComponents()[i].getFugacityCoefficient() / system.getPhases()[1].getComponents()[i] - .getFugasityCoeffisient()); + .getFugacityCoefficient()); } system.calc_x_y_nonorm(); diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/cricondebarFlash.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/cricondebarFlash.java index 12335e951..f2becd57e 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/cricondebarFlash.java +++ b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/cricondebarFlash.java @@ -53,9 +53,9 @@ public double calcx() { double xtotal = 0; for (int i = 0; i < system.getPhases()[1].getNumberOfComponents(); i++) { system.getPhases()[0].getComponents()[i].setK( - Math.exp(system.getPhases()[1].getComponents()[i].getLogFugasityCoeffisient() + Math.exp(system.getPhases()[1].getComponents()[i].getLogFugacityCoefficient() - system.getPhases()[0].getComponents()[i] - .getLogFugasityCoeffisient())); + .getLogFugacityCoefficient())); system.getPhases()[1].getComponents()[i] .setK(system.getPhases()[0].getComponents()[i].getK()); @@ -83,8 +83,8 @@ public double initMoleFraction() { // double sumX = 0.0; for (int i = 0; i < system.getPhase(0).getNumberOfComponents(); i++) { XI[i] = Math.exp(Math.log(system.getPhase(0).getComponent(i).getz()) - + system.getPhase(0).getComponent(i).getLogFugasityCoeffisient() - - system.getPhase(1).getComponent(i).getLogFugasityCoeffisient()); + + system.getPhase(0).getComponent(i).getLogFugacityCoefficient() + - system.getPhase(1).getComponent(i).getLogFugacityCoefficient()); // sumX += XI[i]; } double tempSumXI = 1.0;// sumX; @@ -255,10 +255,10 @@ public void setfvec() { for (int i = 0; i < system.getPhase(0).getNumberOfComponents(); i++) { sumxx += system.getPhases()[1].getComponents()[i].getx(); fvec.set(i, 0, Math - .log(system.getPhases()[0].getComponents()[i].getFugasityCoeffisient() + .log(system.getPhases()[0].getComponents()[i].getFugacityCoefficient() * system.getPhases()[0].getComponents()[i].getz() * system.getPressure()) - - Math.log(system.getPhases()[1].getComponents()[i].getFugasityCoeffisient() + - Math.log(system.getPhases()[1].getComponents()[i].getFugacityCoefficient() * system.getPhases()[1].getComponents()[i].getx() * system.getPressure())); } diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/cricondenBarTemp.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/cricondenBarTemp.java index 654f3e25b..157af018f 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/cricondenBarTemp.java +++ b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/cricondenBarTemp.java @@ -67,10 +67,10 @@ public cricondenBarTemp(SystemInterface system, int numberOfPhases, int numberOf public void setfvec() { for (int i = 0; i < numberOfComponents; i++) { fvec.set(i, 0, Math - .log(system.getPhases()[0].getComponents()[i].getFugasityCoeffisient() + .log(system.getPhases()[0].getComponents()[i].getFugacityCoefficient() * system.getPhases()[0].getComponents()[i].getx() * system.getPressure()) - - Math.log(system.getPhases()[1].getComponents()[i].getFugasityCoeffisient() + - Math.log(system.getPhases()[1].getComponents()[i].getFugacityCoefficient() * system.getPhases()[1].getComponents()[i].getx() * system.getPressure())); } diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/cricondenBarTemp1.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/cricondenBarTemp1.java index 0fdb3c632..da1d4a17e 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/cricondenBarTemp1.java +++ b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/cricondenBarTemp1.java @@ -71,9 +71,9 @@ public void setfvec() { * (system.getPhase(0).getComponent(i).getdfugdt() - system.getPhase(1).getComponent(i).getdfugdt()); fvec.set(i, 0, Math - .log(system.getPhase(0).getComponents()[i].getFugasityCoeffisient() + .log(system.getPhase(0).getComponents()[i].getFugacityCoefficient() * system.getPhase(0).getComponents()[i].getz() * system.getPressure()) - - Math.log(system.getPhases()[1].getComponents()[i].getFugasityCoeffisient() + - Math.log(system.getPhases()[1].getComponents()[i].getFugacityCoefficient() * system.getPhases()[1].getComponents()[i].getx() * system.getPressure())); } diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/dewPointPressureFlash.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/dewPointPressureFlash.java index 7db1995f8..330d82746 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/dewPointPressureFlash.java +++ b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/dewPointPressureFlash.java @@ -86,9 +86,9 @@ public void run() { system.getPhases()[0].getComponents()[i].setK(1e-40); } else { system.getPhases()[0].getComponents()[i].setK(Math.exp(Math.log( - system.getPhases()[1].getComponents()[i].getFugasityCoeffisient()) + system.getPhases()[1].getComponents()[i].getFugacityCoefficient()) - Math.log(system.getPhases()[0].getComponents()[i] - .getFugasityCoeffisient()))); + .getFugacityCoefficient()))); } system.getPhases()[1].getComponents()[i] .setK(system.getPhases()[0].getComponents()[i].getK()); diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/dewPointTemperatureFlash.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/dewPointTemperatureFlash.java index df6340175..e239d13e9 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/dewPointTemperatureFlash.java +++ b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/dewPointTemperatureFlash.java @@ -94,9 +94,9 @@ public void run() { system.getPhases()[0].getComponents()[i].setK(1e-40); } else { system.getPhases()[0].getComponents()[i].setK(Math.exp( - system.getPhases()[1].getComponents()[i].getLogFugasityCoeffisient() + system.getPhases()[1].getComponents()[i].getLogFugacityCoefficient() - system.getPhases()[0].getComponents()[i] - .getLogFugasityCoeffisient())); + .getLogFugacityCoefficient())); } system.getPhases()[1].getComponents()[i] .setK(system.getPhases()[0].getComponents()[i].getK()); diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/dewPointTemperatureFlashDer.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/dewPointTemperatureFlashDer.java index cd46b2bf3..4b75d129f 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/dewPointTemperatureFlashDer.java +++ b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/dewPointTemperatureFlashDer.java @@ -123,9 +123,9 @@ public void run() { system.getPhases()[0].getComponents()[i].setK(1e-40); } else { system.getPhases()[0].getComponents()[i].setK(Math.exp( - system.getPhases()[1].getComponents()[i].getLogFugasityCoeffisient() + system.getPhases()[1].getComponents()[i].getLogFugacityCoefficient() - system.getPhases()[0].getComponents()[i] - .getLogFugasityCoeffisient())); + .getLogFugacityCoefficient())); } system.getPhases()[1].getComponents()[i] .setK(system.getPhases()[0].getComponents()[i].getK()); diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/freezingPointTemperatureFlash.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/freezingPointTemperatureFlash.java index 77938edd0..da4849b77 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/freezingPointTemperatureFlash.java +++ b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/freezingPointTemperatureFlash.java @@ -3,10 +3,8 @@ import java.io.FileWriter; import java.io.IOException; import java.io.PrintWriter; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; - import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicOperations.ThermodynamicOperations; @@ -83,7 +81,7 @@ public double calcFunc() { funk = system.getPhase(0).getComponent(k).getz(); for (int i = 0; i < system.getNumberOfPhases(); i++) { funk -= system.getPhase(i).getBeta() * SolidFugCoeff - / system.getPhase(i).getComponents()[k].getFugasityCoeffisient(); + / system.getPhase(i).getComponents()[k].getFugacityCoefficient(); } } } @@ -129,7 +127,7 @@ public void run() { funk = system.getPhase(0).getComponent(k).getz(); for (int i = 0; i < system.getNumberOfPhases(); i++) { funk -= system.getPhase(i).getBeta() * SolidFugCoeff - / system.getPhase(i).getComponents()[k].getFugasityCoeffisient(); + / system.getPhase(i).getComponents()[k].getFugacityCoefficient(); } logger.info("funk " + funk); if (iterations > 1) {// && oldPhaseType == system.getPhase(0).getPhaseType()) { diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/freezingPointTemperatureFlashOld.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/freezingPointTemperatureFlashOld.java index ec5f64d10..379a63ac6 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/freezingPointTemperatureFlashOld.java +++ b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/freezingPointTemperatureFlashOld.java @@ -2,7 +2,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; - import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicOperations.ThermodynamicOperations; @@ -69,21 +68,21 @@ public void run() { for (int i = 0; i < system.getNumberOfPhases(); i++) { funk -= system.getPhases()[i].getBeta() - * system.getPhases()[3].getComponents()[k].getFugasityCoeffisient() - / system.getPhases()[i].getComponents()[k].getFugasityCoeffisient(); + * system.getPhases()[3].getComponents()[k].getFugacityCoefficient() + / system.getPhases()[i].getComponents()[k].getFugacityCoefficient(); deriv -= 0.01 * system.getPhases()[i].getBeta() - * (system.getPhases()[3].getComponents()[k].getFugasityCoeffisient() + * (system.getPhases()[3].getComponents()[k].getFugacityCoefficient() * Math.exp(system.getPhases()[i].getComponents()[k] .getdfugdt()) * -1.0 / Math.pow( system.getPhases()[i].getComponents()[k] - .getFugasityCoeffisient(), + .getFugacityCoefficient(), 2.0) + Math.exp(system.getPhases()[3].getComponents()[k] .getdfugdt()) / system.getPhases()[i].getComponents()[k] - .getFugasityCoeffisient()); + .getFugacityCoefficient()); } if (iterations >= 2) { deriv = -(funk - funkOld) / (system.getTemperature() - oldTemperature); diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/freezingPointTemperatureFlashTR.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/freezingPointTemperatureFlashTR.java index c9d858020..f438d6d0f 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/freezingPointTemperatureFlashTR.java +++ b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/freezingPointTemperatureFlashTR.java @@ -3,10 +3,8 @@ import java.io.FileWriter; import java.io.IOException; import java.io.PrintWriter; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; - import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkSchwartzentruberEos; @@ -164,19 +162,19 @@ public void run() { ops.TPflash(); testOps2.TPflash(); SolidFug = Pvapsolid / pres * Math.exp(solvol / (R * temp) * (pres - Pvapsolid)); - SolVapFugCoeff = testSystem2.getPhase(0).getComponent(0).getFugasityCoeffisient(); + SolVapFugCoeff = testSystem2.getPhase(0).getComponent(0).getFugacityCoefficient(); funk = system.getPhases()[0].getComponents()[k].getz(); for (int i = 0; i < system.getNumberOfPhases(); i++) { funk -= system.getPhases()[i].getBeta() * SolidFug * SolVapFugCoeff - / system.getPhases()[i].getComponents()[k].getFugasityCoeffisient(); + / system.getPhases()[i].getComponents()[k].getFugacityCoefficient(); deriv -= 0.01 * system.getPhases()[i].getBeta() * (SolidFug * SolVapFugCoeff * Math.exp(system.getPhases()[i].getComponents()[k].getdfugdt()) * -1.0 / Math.pow(system.getPhases()[i].getComponents()[k] - .getFugasityCoeffisient(), 2.0) + .getFugacityCoefficient(), 2.0) + Math.exp(dfugdt) / system.getPhases()[i].getComponents()[k] - .getFugasityCoeffisient()); + .getFugacityCoefficient()); } if (iterations >= 2) { deriv = -(funk - funkOld) / (system.getTemperature() - oldTemperature); diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/waterDewPointTemperatureFlash.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/waterDewPointTemperatureFlash.java index bfcc90012..a1e71ff70 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/waterDewPointTemperatureFlash.java +++ b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/waterDewPointTemperatureFlash.java @@ -68,17 +68,17 @@ public void run() { funk = system.getPhases()[0].getComponents()[k].getz(); funk -= system.getPhases()[0].getBeta() - * system.getPhases()[1].getComponents()[k].getFugasityCoeffisient() - / system.getPhases()[0].getComponents()[k].getFugasityCoeffisient(); + * system.getPhases()[1].getComponents()[k].getFugacityCoefficient() + / system.getPhases()[0].getComponents()[k].getFugacityCoefficient(); // logger.info("funk " + funk); /* * deriv -= system.getPhases()[0].getBeta() - * (system.getPhases()[1].getComponents()[k].getFugasityCoeffisient() + * (system.getPhases()[1].getComponents()[k].getFugacityCoefficient() * system.getPhases()[0].getComponents()[k].getdfugdt() * -1.0 / - * Math.pow(system.getPhases()[0].getComponents()[k] .getFugasityCoeffisient(), + * Math.pow(system.getPhases()[0].getComponents()[k] .getFugacityCoefficient(), * 2.0) + system.getPhases()[1].getComponents()[k].getdfugdt() / - * system.getPhases()[i].getComponents()[k] .getFugasityCoeffisient()); + * system.getPhases()[i].getComponents()[k] .getFugacityCoefficient()); * * system.setTemperature(system.getTemperature() - funk/deriv); */ diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/sysNewtonRhapsonPHflash.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/sysNewtonRhapsonPHflash.java index 4e5bc14b2..1cc223633 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/sysNewtonRhapsonPHflash.java +++ b/src/main/java/neqsim/thermodynamicOperations/flashOps/sysNewtonRhapsonPHflash.java @@ -112,10 +112,10 @@ public void setSpec(double spec) { public void setfvec() { for (int i = 0; i < numberOfComponents; i++) { fvec.set(i, 0, - Math.log(system.getPhases()[0].getComponents()[i].getFugasityCoeffisient()) + Math.log(system.getPhases()[0].getComponents()[i].getFugacityCoefficient()) + Math.log(system.getPhases()[0].getComponents()[i].getx()) - Math.log(system.getPhases()[1].getComponents()[i] - .getFugasityCoeffisient()) + .getFugacityCoefficient()) - Math.log(system.getPhases()[1].getComponents()[i].getx())); } double rP = 0.0, rT = 0.0; diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/sysNewtonRhapsonTPflash.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/sysNewtonRhapsonTPflash.java index a888348b9..445fb8ed0 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/sysNewtonRhapsonTPflash.java +++ b/src/main/java/neqsim/thermodynamicOperations/flashOps/sysNewtonRhapsonTPflash.java @@ -68,9 +68,9 @@ public sysNewtonRhapsonTPflash(SystemInterface system, int numberOfPhases, public void setfvec() { for (int i = 0; i < numberOfComponents; i++) { fvec.set(i, 0, Math - .log(system.getPhase(0).getComponents()[i].getFugasityCoeffisient() + .log(system.getPhase(0).getComponents()[i].getFugacityCoefficient() * system.getPhase(0).getComponents()[i].getx() * system.getPressure()) - - Math.log(system.getPhase(1).getComponents()[i].getFugasityCoeffisient() + - Math.log(system.getPhase(1).getComponents()[i].getFugacityCoefficient() * system.getPhase(1).getComponents()[i].getx() * system.getPressure())); } } diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/sysNewtonRhapsonTPflashNew.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/sysNewtonRhapsonTPflashNew.java index ca5520df6..a87804e84 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/sysNewtonRhapsonTPflashNew.java +++ b/src/main/java/neqsim/thermodynamicOperations/flashOps/sysNewtonRhapsonTPflashNew.java @@ -73,8 +73,8 @@ public sysNewtonRhapsonTPflashNew(SystemInterface system, int numberOfPhases, public void setfvec() { for (int i = 0; i < numberOfComponents; i++) { fvec.set(i, 0, u.get(i, 0) - + Math.log(system.getPhases()[1].getComponents()[i].getFugasityCoeffisient() - / system.getPhases()[0].getComponents()[i].getFugasityCoeffisient())); + + Math.log(system.getPhases()[1].getComponents()[i].getFugacityCoefficient() + / system.getPhases()[0].getComponents()[i].getFugacityCoefficient())); } double fsum = 0.0; diff --git a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/CricondenBarFlash.java b/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/CricondenBarFlash.java index 78f1d74e8..de5003ae3 100644 --- a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/CricondenBarFlash.java +++ b/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/CricondenBarFlash.java @@ -239,8 +239,8 @@ public void run() { */ public void setNewK() { for (int j = 0; j < numberOfComponents; j++) { - double kap = system.getPhase(0).getComponent(j).getFugasityCoeffisient() - / system.getPhase(1).getComponent(j).getFugasityCoeffisient(); + double kap = system.getPhase(0).getComponent(j).getFugacityCoefficient() + / system.getPhase(1).getComponent(j).getFugacityCoefficient(); system.getPhase(0).getComponents()[j].setK(kap); u.set(j, 0, kap); } @@ -311,8 +311,8 @@ public void funcT() { * double T=system.getPhase(0).getPressure(); double * P=system.getPhase(1).getTemperature() ; */ - double fugl = system.getPhase(0).getComponent(j).getLogFugasityCoeffisient(); - double fugv = system.getPhase(1).getComponent(j).getLogFugasityCoeffisient(); + double fugl = system.getPhase(0).getComponent(j).getLogFugacityCoefficient(); + double fugv = system.getPhase(1).getComponent(j).getLogFugacityCoefficient(); double fugTl = system.getPhase(0).getComponent(j).getdfugdt(); double fugTv = system.getPhase(1).getComponent(j).getdfugdt(); @@ -335,8 +335,8 @@ public void funcP() { double xx = system.getPhase(0).getComponent(j).getx(); double yy = system.getPhase(1).getComponent(j).getx(); - double fugl = system.getPhase(0).getComponents()[j].getLogFugasityCoeffisient(); - double fugv = system.getPhase(1).getComponents()[j].getLogFugasityCoeffisient(); + double fugl = system.getPhase(0).getComponents()[j].getLogFugacityCoefficient(); + double fugv = system.getPhase(1).getComponents()[j].getLogFugacityCoefficient(); double fugPl = system.getPhase(0).getComponents()[j].getdfugdp(); double fugPv = system.getPhase(1).getComponents()[j].getdfugdp(); diff --git a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/CricondenThermFlash.java b/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/CricondenThermFlash.java index 231adcde4..2210bf088 100644 --- a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/CricondenThermFlash.java +++ b/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/CricondenThermFlash.java @@ -238,8 +238,8 @@ public void run() { */ public void setNewK() { for (int j = 0; j < numberOfComponents; j++) { - double kap = system.getPhase(0).getComponent(j).getFugasityCoeffisient() - / system.getPhase(1).getComponent(j).getFugasityCoeffisient(); + double kap = system.getPhase(0).getComponent(j).getFugacityCoefficient() + / system.getPhase(1).getComponent(j).getFugacityCoefficient(); system.getPhase(0).getComponents()[j].setK(kap); u.set(j, 0, kap); } @@ -310,8 +310,8 @@ public void funcT() { * double T=system.getPhase(0).getPressure(); double * P=system.getPhase(1).getTemperature() ; */ - double fugl = system.getPhase(0).getComponent(j).getLogFugasityCoeffisient(); - double fugv = system.getPhase(1).getComponent(j).getLogFugasityCoeffisient(); + double fugl = system.getPhase(0).getComponent(j).getLogFugacityCoefficient(); + double fugv = system.getPhase(1).getComponent(j).getLogFugacityCoefficient(); double fugTl = system.getPhase(0).getComponent(j).getdfugdt(); double fugTv = system.getPhase(1).getComponent(j).getdfugdt(); @@ -334,8 +334,8 @@ public void funcP() { double xx = system.getPhase(0).getComponent(j).getx(); double yy = system.getPhase(1).getComponent(j).getx(); - double fugl = system.getPhase(0).getComponents()[j].getLogFugasityCoeffisient(); - double fugv = system.getPhase(1).getComponents()[j].getLogFugasityCoeffisient(); + double fugl = system.getPhase(0).getComponents()[j].getLogFugacityCoefficient(); + double fugv = system.getPhase(1).getComponents()[j].getLogFugacityCoefficient(); double fugPl = system.getPhase(0).getComponents()[j].getdfugdp(); double fugPv = system.getPhase(1).getComponents()[j].getdfugdp(); diff --git a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/sysNewtonRhapsonPhaseEnvelope.java b/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/sysNewtonRhapsonPhaseEnvelope.java index b8d051ca7..7d9647642 100644 --- a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/sysNewtonRhapsonPhaseEnvelope.java +++ b/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/sysNewtonRhapsonPhaseEnvelope.java @@ -95,9 +95,9 @@ public sysNewtonRhapsonPhaseEnvelope(SystemInterface system, int numberOfPhases, public void setfvec22() { for (int i = 0; i < numberOfComponents; i++) { fvec.set(i, 0, Math - .log(system.getPhase(0).getComponents()[i].getFugasityCoeffisient() + .log(system.getPhase(0).getComponents()[i].getFugacityCoefficient() * system.getPhase(0).getComponents()[i].getx()) - - Math.log(system.getPhase(1).getComponents()[i].getFugasityCoeffisient() + - Math.log(system.getPhase(1).getComponents()[i].getFugacityCoefficient() * system.getPhase(1).getComponents()[i].getx())); } double fsum = 0.0; @@ -118,8 +118,8 @@ public void setfvec22() { public void setfvec() { for (int i = 0; i < numberOfComponents; i++) { fvec.set(i, 0, - u.get(i, 0) + system.getPhase(0).getComponents()[i].getLogFugasityCoeffisient() - - system.getPhase(1).getComponents()[i].getLogFugasityCoeffisient()); + u.get(i, 0) + system.getPhase(0).getComponents()[i].getLogFugacityCoefficient() + - system.getPhase(1).getComponents()[i].getLogFugacityCoefficient()); } fvec.set(numberOfComponents, 0, sumy - sumx); fvec.set(numberOfComponents + 1, 0, u.get(speceq, 0) - specVal); diff --git a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/sysNewtonRhapsonPhaseEnvelope2.java b/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/sysNewtonRhapsonPhaseEnvelope2.java index 1d3ac9a11..d8d704ce5 100644 --- a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/sysNewtonRhapsonPhaseEnvelope2.java +++ b/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/sysNewtonRhapsonPhaseEnvelope2.java @@ -76,8 +76,8 @@ public sysNewtonRhapsonPhaseEnvelope2(SystemInterface system) { public void setfvec() { for (int i = 0; i < system.getPhase(0).getNumberOfComponents(); i++) { fvec.setEntry(i, 0, u.getEntry(i, 0) - + Math.log(system.getPhase(0).getComponents()[i].getFugasityCoeffisient() - / system.getPhase(1).getComponents()[i].getFugasityCoeffisient())); + + Math.log(system.getPhase(0).getComponents()[i].getFugacityCoefficient() + / system.getPhase(1).getComponents()[i].getFugacityCoefficient())); } double fsum = 0.0; for (int i = 0; i < system.getPhase(0).getNumberOfComponents(); i++) { diff --git a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/reactiveCurves/pLoadingCurve.java b/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/reactiveCurves/pLoadingCurve.java index 7afcd3800..00e94673a 100644 --- a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/reactiveCurves/pLoadingCurve.java +++ b/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/reactiveCurves/pLoadingCurve.java @@ -101,7 +101,7 @@ public void run() { system.getChemicalReactionOperations().solveChemEq(1); points[0][i] = (inscr * (i - 1)) / molMDEA; - points[1][i] = (system.getPhases()[1].getComponents()[0].getFugasityCoeffisient() + points[1][i] = (system.getPhases()[1].getComponents()[0].getFugacityCoefficient() * system.getPhases()[1].getComponents()[0].getx() * system.getPressure()); for (int k = 0; k < system.getPhases()[1].getNumberOfComponents(); k++) { diff --git a/src/test/java/neqsim/physicalProperties/util/examples/TPflashTest.java b/src/test/java/neqsim/physicalProperties/util/examples/TPflashTest.java index c951b2d3d..a4405f92e 100644 --- a/src/test/java/neqsim/physicalProperties/util/examples/TPflashTest.java +++ b/src/test/java/neqsim/physicalProperties/util/examples/TPflashTest.java @@ -19,7 +19,9 @@ public class TPflashTest { static Logger logger = LogManager.getLogger(TPflashTest.class); /** - *

main.

+ *

+ * main. + *

* * @param args an array of {@link java.lang.String} objects */ @@ -89,7 +91,7 @@ public static void main(String args[]) { testSystem.initPhysicalProperties(); // double a = - // testSystem.getPhase("oil").getPhysicalProperties().getDiffusionCoeffisient(0, + // testSystem.getPhase("oil").getPhysicalProperties().getDiffusionCoefficient(0, // 1); // testSystem.setPhysicalPropertyModel(6); // testSystem.getPhase(0).initPhysicalProperties("viscosity"); diff --git a/src/test/java/neqsim/processSimulation/util/example/TEGdehydrationProcess2.java b/src/test/java/neqsim/processSimulation/util/example/TEGdehydrationProcess2.java index 3048b35c1..5189bdf65 100644 --- a/src/test/java/neqsim/processSimulation/util/example/TEGdehydrationProcess2.java +++ b/src/test/java/neqsim/processSimulation/util/example/TEGdehydrationProcess2.java @@ -81,11 +81,11 @@ public static void main(String[] args) { glycol_flash_valve.setName("Rich TEG HP flash valve"); glycol_flash_valve.setOutletPressure(4.9); - Heater richGLycolHeaterCondeser = new Heater(glycol_flash_valve.getOutStream()); - richGLycolHeaterCondeser.setName("rich TEG preheater"); - richGLycolHeaterCondeser.setOutTemperature(273.15 + 35.5); + Heater richGLycolHeaterCondenser = new Heater(glycol_flash_valve.getOutStream()); + richGLycolHeaterCondenser.setName("rich TEG preheater"); + richGLycolHeaterCondenser.setOutTemperature(273.15 + 35.5); - Heater richGLycolHeater = new Heater(richGLycolHeaterCondeser.getOutStream()); + Heater richGLycolHeater = new Heater(richGLycolHeaterCondenser.getOutStream()); richGLycolHeater.setName("rich TEG heater HP"); richGLycolHeater.setOutTemperature(273.15 + 62.0); @@ -114,7 +114,7 @@ public static void main(String[] args) { Heater sepregenGasCooler = new Heater(gasFromRegenerator); sepregenGasCooler.setOutTemperature(273.15 + 109.0); sepregenGasCooler.setOutPressure(1.23); - // sepregenGasCooler.setEnergyStream(richGLycolHeaterCondeser.getEnergyStream()); + // sepregenGasCooler.setEnergyStream(richGLycolHeaterCondenser.getEnergyStream()); Separator sepRegen = new Separator(sepregenGasCooler.getOutStream()); @@ -208,7 +208,7 @@ public static void main(String[] args) { operations.add(dehydratedGas); operations.add(richTEG); operations.add(glycol_flash_valve); - operations.add(richGLycolHeaterCondeser); + operations.add(richGLycolHeaterCondenser); operations.add(richGLycolHeater); operations.add(flashSep); operations.add(flashGas); diff --git a/src/test/java/neqsim/thermo/system/ModelBaseTest.java b/src/test/java/neqsim/thermo/system/ModelBaseTest.java index cb0cd6c00..1e14c89d2 100644 --- a/src/test/java/neqsim/thermo/system/ModelBaseTest.java +++ b/src/test/java/neqsim/thermo/system/ModelBaseTest.java @@ -103,7 +103,7 @@ public void testFugasities() { thermoSystem.init(0); thermoSystem.init(1); fugTest = new neqsim.thermo.ThermodynamicModelTest(thermoSystem); - assertTrue(fugTest.checkFugasityCoeffisients()); + assertTrue(fugTest.checkFugacityCoefficients()); } /** @@ -116,7 +116,7 @@ public void testFugasitiesdT() { thermoSystem.init(0); thermoSystem.init(3); fugTest = new neqsim.thermo.ThermodynamicModelTest(thermoSystem); - assertTrue(fugTest.checkFugasityCoeffisientsDT()); + assertTrue(fugTest.checkFugacityCoefficientsDT()); } /** @@ -129,7 +129,7 @@ public void testFugasitiesdP() { thermoSystem.init(0); thermoSystem.init(3); fugTest = new neqsim.thermo.ThermodynamicModelTest(thermoSystem); - assertTrue(fugTest.checkFugasityCoeffisientsDP()); + assertTrue(fugTest.checkFugacityCoefficientsDP()); } /** @@ -142,6 +142,6 @@ public void testFugasitiesdn() { thermoSystem.init(0); thermoSystem.init(3); fugTest = new neqsim.thermo.ThermodynamicModelTest(thermoSystem); - assertTrue(fugTest.checkFugasityCoeffisientsDn()); + assertTrue(fugTest.checkFugacityCoefficientsDn()); } } diff --git a/src/test/java/neqsim/thermo/system/SystemPrEosTest.java b/src/test/java/neqsim/thermo/system/SystemPrEosTest.java index b844db2db..7b32b221e 100644 --- a/src/test/java/neqsim/thermo/system/SystemPrEosTest.java +++ b/src/test/java/neqsim/thermo/system/SystemPrEosTest.java @@ -12,7 +12,9 @@ class SystemPrEoSTest { static neqsim.thermo.ThermodynamicModelTest testModel = null; /** - *

setUp.

+ *

+ * setUp. + *

*/ @BeforeAll public static void setUp() { @@ -30,7 +32,9 @@ public static void setUp() { } /** - *

testTPflash2.

+ *

+ * testTPflash2. + *

*/ @Test @DisplayName("test a TPflash2") @@ -39,7 +43,9 @@ public void testTPflash2() { } /** - *

testTPflash.

+ *

+ * testTPflash. + *

*/ @Test @DisplayName("test a TPflash of the fluid (should return two phases)") @@ -48,52 +54,64 @@ public void testTPflash() { } /** - *

testFugacityCoefficients.

+ *

+ * testFugacityCoefficients. + *

*/ @Test - @DisplayName("test the fugacity coeficients calcutated") + @DisplayName("test the fugacity coefficients calculated") public void testFugacityCoefficients() { - assertTrue(testModel.checkFugasityCoeffisients()); + assertTrue(testModel.checkFugacityCoefficients()); } /** - *

checkFugasityCoeffisientsDP.

+ *

+ * checkFugacityCoefficientsDP. + *

*/ @Test - @DisplayName("test derivative of fugacity coeficients with respect to pressure") - public void checkFugasityCoeffisientsDP() { - assertTrue(testModel.checkFugasityCoeffisientsDP()); + @DisplayName("test derivative of fugacity coefficients with respect to pressure") + public void checkFugacityCoefficientsDP() { + assertTrue(testModel.checkFugacityCoefficientsDP()); } /** - *

checkFugasityCoeffisientsDT.

+ *

+ * checkFugacityCoefficientsDT. + *

*/ @Test - @DisplayName("test derivative of fugacity coeficients with respect to temperature") - public void checkFugasityCoeffisientsDT() { - assertTrue(testModel.checkFugasityCoeffisientsDT()); + @DisplayName("test derivative of fugacity coefficients with respect to temperature") + public void checkFugacityCoefficientsDT() { + assertTrue(testModel.checkFugacityCoefficientsDT()); } /** - *

checkFugasityCoeffisientsDn.

+ *

+ * checkFugacityCoefficientsDn. + *

*/ @Test - @DisplayName("test derivative of fugacity coeficients with respect to composition") - public void checkFugasityCoeffisientsDn() { - assertTrue(testModel.checkFugasityCoeffisientsDn()); + @DisplayName("test derivative of fugacity coefficients with respect to composition") + public void checkFugacityCoefficientsDn() { + assertTrue(testModel.checkFugacityCoefficientsDn()); } /** - *

checkFugasityCoeffisientsDn2.

+ *

+ * checkFugacityCoefficientsDn2. + *

*/ @Test - @DisplayName("test derivative of fugacity coeficients with respect to composition (2nd method)") - public void checkFugasityCoeffisientsDn2() { - assertTrue(testModel.checkFugasityCoeffisientsDn2()); + @DisplayName("test derivative of fugacity coefficients with respect to composition (2nd method)") + public void checkFugacityCoefficientsDn2() { + assertTrue(testModel.checkFugacityCoefficientsDn2()); } /** - *

checkCompressibility.

+ *

+ * checkCompressibility. + *

*/ @Test @DisplayName("calculate compressibility of gas phase") @@ -101,18 +119,21 @@ public void checkCompressibility() { System.out.println("gas compressibility " + testSystem.getPhase("gas").getZ()); assertEquals(testSystem.getPhase("gas").getZ(), 0.9708455641951108, 1e-5); } - + /** - *

calcProperties.

+ *

+ * calcProperties. + *

*/ @Test @DisplayName("calculate properties when flow rate is 0") public void calcProperties() { - testSystem.setTotalFlowRate(1.0, "mol/sec"); - ThermodynamicOperations testOps = new ThermodynamicOperations(testSystem); - testOps.TPflash(); - testSystem.initProperties(); - System.out.print("enthalpy " + testSystem.getEnthalpy("kJ/kg")); - assertEquals(testSystem.getEnthalpy("kJ/kg"), -165.60627184389855, Math.abs(-165.60627184389855/1000.0)); + testSystem.setTotalFlowRate(1.0, "mol/sec"); + ThermodynamicOperations testOps = new ThermodynamicOperations(testSystem); + testOps.TPflash(); + testSystem.initProperties(); + System.out.print("enthalpy " + testSystem.getEnthalpy("kJ/kg")); + assertEquals(testSystem.getEnthalpy("kJ/kg"), -165.60627184389855, + Math.abs(-165.60627184389855 / 1000.0)); } } diff --git a/src/test/java/neqsim/thermo/system/SystemUMRPRUMCEosNewTest.java b/src/test/java/neqsim/thermo/system/SystemUMRPRUMCEosNewTest.java index 545ec95d0..7f615e8a6 100644 --- a/src/test/java/neqsim/thermo/system/SystemUMRPRUMCEosNewTest.java +++ b/src/test/java/neqsim/thermo/system/SystemUMRPRUMCEosNewTest.java @@ -14,7 +14,9 @@ class SystemUMRPRUMCEosNewTest { static neqsim.thermo.ThermodynamicModelTest testModel = null; /** - *

setUp.

+ *

+ * setUp. + *

*/ @BeforeAll public static void setUp() { @@ -35,7 +37,9 @@ public static void setUp() { } /** - *

testTPflash2.

+ *

+ * testTPflash2. + *

*/ @Test @DisplayName("test a TPflash2") @@ -44,7 +48,9 @@ public void testTPflash2() { } /** - *

testTPflash.

+ *

+ * testTPflash. + *

*/ @Test @DisplayName("test a TPflash of the fluid (should return two phases)") @@ -53,52 +59,64 @@ public void testTPflash() { } /** - *

testFugacityCoefficients.

+ *

+ * testFugacityCoefficients. + *

*/ @Test - @DisplayName("test the fugacity coeficients calcutated") + @DisplayName("test the fugacity coefficients calculated") public void testFugacityCoefficients() { - assertTrue(testModel.checkFugasityCoeffisients()); + assertTrue(testModel.checkFugacityCoefficients()); } /** - *

checkFugasityCoeffisientsDP.

+ *

+ * checkFugacityCoefficientsDP. + *

*/ @Test - @DisplayName("test derivative of fugacity coeficients with respect to pressure") - public void checkFugasityCoeffisientsDP() { - assertTrue(testModel.checkFugasityCoeffisientsDP()); + @DisplayName("test derivative of fugacity coefficients with respect to pressure") + public void checkFugacityCoefficientsDP() { + assertTrue(testModel.checkFugacityCoefficientsDP()); } /** - *

checkFugasityCoeffisientsDT.

+ *

+ * checkFugacityCoefficientsDT. + *

*/ @Test - @DisplayName("test derivative of fugacity coeficients with respect to temperature") - public void checkFugasityCoeffisientsDT() { - assertTrue(testModel.checkFugasityCoeffisientsDT()); + @DisplayName("test derivative of fugacity coefficients with respect to temperature") + public void checkFugacityCoefficientsDT() { + assertTrue(testModel.checkFugacityCoefficientsDT()); } /** - *

checkFugasityCoeffisientsDn.

+ *

+ * checkFugacityCoefficientsDn. + *

*/ @Test - @DisplayName("test derivative of fugacity coeficients with respect to composition") - public void checkFugasityCoeffisientsDn() { - assertTrue(testModel.checkFugasityCoeffisientsDn()); + @DisplayName("test derivative of fugacity coefficients with respect to composition") + public void checkFugacityCoefficientsDn() { + assertTrue(testModel.checkFugacityCoefficientsDn()); } /** - *

checkFugasityCoeffisientsDn2.

+ *

+ * checkFugacityCoefficientsDn2. + *

*/ @Test - @DisplayName("test derivative of fugacity coeficients with respect to composition (2nd method)") - public void checkFugasityCoeffisientsDn2() { - assertTrue(testModel.checkFugasityCoeffisientsDn2()); + @DisplayName("test derivative of fugacity coefficients with respect to composition (2nd method)") + public void checkFugacityCoefficientsDn2() { + assertTrue(testModel.checkFugacityCoefficientsDn2()); } /** - *

checkCompressibility.

+ *

+ * checkCompressibility. + *

*/ @Test @DisplayName("calculate compressibility of gas phase") diff --git a/src/test/java/neqsim/thermo/util/example/LNGfilling.java b/src/test/java/neqsim/thermo/util/example/LNGfilling.java index 8d2e987b6..4a93be389 100644 --- a/src/test/java/neqsim/thermo/util/example/LNGfilling.java +++ b/src/test/java/neqsim/thermo/util/example/LNGfilling.java @@ -63,7 +63,7 @@ public static void main(String args[]) { // System.out.println("wt%MEG " + // testSystem.getPhase(1).getComponent("MEG").getMolarMass()*testSystem.getPhase(1).getComponent("MEG").getx()/testSystem.getPhase(1).getMolarMass()); // System.out.println("fug" - // +testSystem.getPhase(0).getComponent("water").getx()*testSystem.getPhase(0).getPressure()*testSystem.getPhase(0).getComponent(0).getFugasityCoefficient()); + // +testSystem.getPhase(0).getComponent("water").getx()*testSystem.getPhase(0).getPressure()*testSystem.getPhase(0).getComponent(0).getFugacityCoefficient()); } } // testSystem = testSystem.setModel("GERG-water"); diff --git a/src/test/java/neqsim/thermo/util/example/TPMultiFlash.java b/src/test/java/neqsim/thermo/util/example/TPMultiFlash.java index e4dfab57a..89d01fe83 100644 --- a/src/test/java/neqsim/thermo/util/example/TPMultiFlash.java +++ b/src/test/java/neqsim/thermo/util/example/TPMultiFlash.java @@ -7,7 +7,9 @@ import neqsim.thermodynamicOperations.ThermodynamicOperations; /** - *

TPMultiFlash class.

+ *

+ * TPMultiFlash class. + *

* * @author esol * @since 2.2.3 @@ -17,7 +19,9 @@ public class TPMultiFlash { static Logger logger = LogManager.getLogger(TPMultiFlash.class); /** - *

main.

+ *

+ * main. + *

* * @param args an array of {@link java.lang.String} objects */ @@ -116,7 +120,7 @@ public static void main(String[] args) { // System.out.println("Henrys Constant " + // 1.0/testSystem.getPhase(1).getComponent("CO2").getx()*testSystem.getPressure()); // System.out.println("water fugacity " + - // testSystem.getPhase(0).getComponent("water").getx()*testSystem.getPhase(0).getComponent("water").getFugasityCoefficient()*testSystem.getPressure()); + // testSystem.getPhase(0).getComponent("water").getx()*testSystem.getPhase(0).getComponent("water").getFugacityCoefficient()*testSystem.getPressure()); // System.out.println("partial pressure water " + // testSystem.getPhase(0).getComponent("water").getx()*testSystem.getPressure()); // System.out.println("activity water " + diff --git a/src/test/java/neqsim/thermo/util/example/TPflashDehyd.java b/src/test/java/neqsim/thermo/util/example/TPflashDehyd.java index 18ec3b4cc..0b7265e11 100644 --- a/src/test/java/neqsim/thermo/util/example/TPflashDehyd.java +++ b/src/test/java/neqsim/thermo/util/example/TPflashDehyd.java @@ -187,7 +187,7 @@ public static void main(String[] args) { * testSystem.getPhase(1).getActivityCoefficient(1)); // System.out.println("TEG activity " * + testSystem.getPhase(1).getActivityCoefficient(0)); // testSystem.display(); * //System.out.println("fugacitycoefficient " + - * testSystem.getPhase(1).getComponent("water").getLogFugasityCoeffisient()); /* + * testSystem.getPhase(1).getComponent("water").getLogFugacityCoefficient()); /* * System.out.println("fugacitycoefficientdp " + * testSystem.getPhase(0).getComponent("MEG").getdfugdp()); * System.out.println("fugacitycoefficientdp " + diff --git a/src/test/java/neqsim/thermo/util/example/TestCharacterizationCondensate1.java b/src/test/java/neqsim/thermo/util/example/TestCharacterizationCondensate1.java index 550b50371..98526d9b9 100644 --- a/src/test/java/neqsim/thermo/util/example/TestCharacterizationCondensate1.java +++ b/src/test/java/neqsim/thermo/util/example/TestCharacterizationCondensate1.java @@ -8,7 +8,9 @@ import neqsim.thermodynamicOperations.ThermodynamicOperations; /** - *

TestCharacterizationCondensate1 class.

+ *

+ * TestCharacterizationCondensate1 class. + *

* * @author esol * @version $Id: $Id @@ -18,7 +20,9 @@ public class TestCharacterizationCondensate1 { static Logger logger = LogManager.getLogger(TestCharacterizationCondensate1.class); /** - *

main.

+ *

+ * main. + *

* * @param args an array of {@link java.lang.String} objects */ @@ -78,7 +82,7 @@ public static void main(String args[]) { logger.error(e.toString()); } System.out.println( - "activity coeffisient " + testSystem.getPhase(1).getActivityCoefficient(1)); + "activity coefficient " + testSystem.getPhase(1).getActivityCoefficient(1)); testSystem.display(); ((PhaseEosInterface) testSystem.getPhase(0)).displayInteractionCoefficients(""); testSystem.getPhase(0).getComponent(1).getAcentricFactor(); diff --git a/src/test/java/neqsim/thermo/util/example/TestPCSAFT.java b/src/test/java/neqsim/thermo/util/example/TestPCSAFT.java index c832be6d1..766d9970a 100644 --- a/src/test/java/neqsim/thermo/util/example/TestPCSAFT.java +++ b/src/test/java/neqsim/thermo/util/example/TestPCSAFT.java @@ -20,7 +20,9 @@ public class TestPCSAFT { static Logger logger = LogManager.getLogger(TestPCSAFT.class); /** - *

main.

+ *

+ * main. + *

* * @param args an array of {@link java.lang.String} objects */ @@ -69,7 +71,7 @@ public static void main(String args[]) { // System.out.println("enthalpy " + (testSystem.getEnthalpy() - oldEnthalpy)); logger.info("fuagcity gas" + testSystem.getPhase(0).getFugacity(0)); logger.info("fuagcity liquid" + testSystem.getPhase(1).getFugacity(0)); - logger.info("K " + testSystem.getPhase(1).getComponent(0).getFugasityCoefficient() - / testSystem.getPhase(0).getComponent(0).getFugasityCoefficient()); + logger.info("K " + testSystem.getPhase(1).getComponent(0).getFugacityCoefficient() + / testSystem.getPhase(0).getComponent(0).getFugacityCoefficient()); } } diff --git a/src/test/java/neqsim/thermo/util/example/TestVHflash.java b/src/test/java/neqsim/thermo/util/example/TestVHflash.java index fc63de580..8d078c319 100644 --- a/src/test/java/neqsim/thermo/util/example/TestVHflash.java +++ b/src/test/java/neqsim/thermo/util/example/TestVHflash.java @@ -95,7 +95,7 @@ public static void main(String args[]) { // logger.info("wt%MEG " + // testSystem.getPhase(1).getComponent("MEG").getMolarMass()*testSystem.getPhase(1).getComponent("MEG").getx()/testSystem.getPhase(1).getMolarMass()); // logger.info("fug" - // +testSystem.getPhase(0).getComponent("water").getx()*testSystem.getPhase(0).getPressure()*testSystem.getPhase(0).getComponent(0).getFugasityCoefficient()); + // +testSystem.getPhase(0).getComponent("water").getx()*testSystem.getPhase(0).getPressure()*testSystem.getPhase(0).getComponent(0).getFugacityCoefficient()); } } // testSystem = testSystem.setModel("GERG-water"); diff --git a/src/test/java/neqsim/thermodynamicOperations/util/example/MEGwaterComplexFlash.java b/src/test/java/neqsim/thermodynamicOperations/util/example/MEGwaterComplexFlash.java index 1a70b2620..0544774d5 100644 --- a/src/test/java/neqsim/thermodynamicOperations/util/example/MEGwaterComplexFlash.java +++ b/src/test/java/neqsim/thermodynamicOperations/util/example/MEGwaterComplexFlash.java @@ -7,7 +7,9 @@ import neqsim.thermodynamicOperations.ThermodynamicOperations; /** - *

MEGwaterComplexFlash class.

+ *

+ * MEGwaterComplexFlash class. + *

* * @author ESOL * @version $Id: $Id @@ -17,7 +19,9 @@ public class MEGwaterComplexFlash { static Logger logger = LogManager.getLogger(MEGwaterComplexFlash.class); /** - *

main.

+ *

+ * main. + *

* * @param args an array of {@link java.lang.String} objects */ @@ -34,7 +38,7 @@ public static void main(String args[]) { testSystem.setMixingRule(10); testSystem.init(0); // logger.info("fug " - // +Math.log(testSystem.getPhase(1).getComponent("TEG").getFugasityCoefficient())); + // +Math.log(testSystem.getPhase(1).getComponent("TEG").getFugacityCoefficient())); testSystem.setSolidPhaseCheck("water"); // testSystem.setMultiPhaseCheck(true); ThermodynamicOperations testOps = new ThermodynamicOperations(testSystem);