From 4020a77bcbcb60ff203a58dbb26795979470af98 Mon Sep 17 00:00:00 2001
From: fannemel
- * setOuterHeatTransferCOefficients.
+ * setOuterHeatTransferCoefficients.
*
- * setWallHeatTransferCOefficients.
+ * setWallHeatTransferCoefficients.
*
@@ -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.
* KrishnaStandartFilmModel class.
+ * KrishnaStandartFilmModel class.
+ * Constructor for KrishnaStandartFilmModel.
+ * Constructor for KrishnaStandartFilmModel.
+ * Constructor for KrishnaStandartFilmModel.
+ * Constructor for KrishnaStandartFilmModel.
+ * Constructor for KrishnaStandartFilmModel.
+ * Constructor for KrishnaStandartFilmModel.
+ * calcBinarySchmidtNumbers.
+ * calcBinarySchmidtNumbers.
+ * calcBinaryMassTransferCoefficients.
+ * calcBinaryMassTransferCoefficients.
+ * calcMassTransferCoeffisients.
+ * calcMassTransferCoefficients.
+ * calcPhiMatrix.
+ * calcPhiMatrix.
+ * calcRedPhiMatrix.
+ * calcRedPhiMatrix.
+ * calcRedCorrectionMatrix.
+ * calcRedCorrectionMatrix.
+ * calcCorrectionMatrix.
+ * calcCorrectionMatrix.
+ * calcTotalMassTransferCoefficientMatrix.
+ * calcTotalMassTransferCoefficientMatrix.
+ * initCorrections.
+ * initCorrections.
+ * main.
+ * main.
+ *
@@ -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.
+ * calcBinaryDiffusionCoefficient.
+ * calcBinaryDiffusionCoefficient.
+ * calcDiffusionCoeffisients.
+ * calcDiffusionCoefficients.
+ * getFickBinaryDiffusionCoefficient.
+ * getFickBinaryDiffusionCoefficient.
+ * getMaxwellStefanBinaryDiffusionCoefficient.
+ * getMaxwellStefanBinaryDiffusionCoefficient.
+ * getEffectiveDiffusionCoefficient.
+ * getEffectiveDiffusionCoefficient.
+ * calcEffectiveDiffusionCoeffisients.
+ * calcEffectiveDiffusionCoefficients.
+ *
* 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.
*
@@ -208,14 +208,14 @@ public void setMixingRule(
/**
*
- * getFickDiffusionCoeffisient.
+ * getFickDiffusionCoefficient.
*
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
- * setTopCondeserDuty.
+ * setTopCondenserDuty.
*
- * 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;jmain.
+ *+ * 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);