efficients etc (#292)

equinor · Jan 18, 2022 · 4020a77 · 4020a77
1 parent 91b693f
commit 4020a77
Show file tree

Hide file tree

Showing 121 changed files with 816 additions and 747 deletions.
diff --git a/src/main/java/neqsim/MathLib/nonLinearSolver/sysNewtonRhapson.java b/src/main/java/neqsim/MathLib/nonLinearSolver/sysNewtonRhapson.java
@@ -72,8 +72,8 @@ public sysNewtonRhapson(SystemInterface system, int numberOfPhases, int numberOf
     public void setfvec() {
         for (int i = 0; i < numberOfComponents; i++) {
             fvec.set(i, 0, u.get(i, 0)
-                    + Math.log(system.getPhases()[1].getComponents()[i].getFugasityCoeffisient()
-                            / system.getPhases()[0].getComponents()[i].getFugasityCoeffisient()));
+                    + Math.log(system.getPhases()[1].getComponents()[i].getFugacityCoefficient()
+                            / system.getPhases()[0].getComponents()[i].getFugacityCoefficient()));
         }
         double fsum = 0.0;
         for (int i = 0; i < numberOfComponents; i++) {

diff --git a/src/main/java/neqsim/chemicalReactions/chemicalEquilibriaum/ChemicalEquilibrium.java b/src/main/java/neqsim/chemicalReactions/chemicalEquilibriaum/ChemicalEquilibrium.java
@@ -391,9 +391,9 @@ public double step() {
                 return step;
             } else {
                 // chem_pot_omega[i] = R*T*(chem_ref[i]+ Math.log(n_omega[i]/n_t) +
-                // Math.log(system.getPhases()[1].getComponents()[components[i].getComponentNumber()].getFugasityCoeffisient()/chem_pot_pure[i]));
+                // Math.log(system.getPhases()[1].getComponents()[components[i].getComponentNumber()].getFugacityCoefficient()/chem_pot_pure[i]));
                 // chem_pot[i] = R*T*(chem_ref[i] + Math.log(n_mol[i]/n_t)+
-                // Math.log(system.getPhases()[1].getComponents()[components[i].getComponentNumber()].getFugasityCoeffisient()/chem_pot_pure[i]));
+                // Math.log(system.getPhases()[1].getComponents()[components[i].getComponentNumber()].getFugacityCoefficient()/chem_pot_pure[i]));
 
                 if (system.getPhase(phasenumb).getComponents()[components[i].getComponentNumber()]
                         .getReferenceStateType().equals("solvent")) {
@@ -402,14 +402,14 @@ public double step() {
                                     .getComponentNumber()].getNumberOfMolesInPhase())
                             - Math.log(n_t) + logactivityVec[i]);// system.getPhase(phasenumb).getActivityCoefficient(components[i].getComponentNumber(),components[waterNumb].getComponentNumber())));
                     // System.out.println("solvent activ: "+ i + " " +
-                    // system.getPhases()[1].getComponents()[components[i].getComponentNumber()].getFugasityCoeffisient()/chem_pot_pure[i]);
+                    // system.getPhases()[1].getComponents()[components[i].getComponentNumber()].getFugacityCoefficient()/chem_pot_pure[i]);
                 } else {
                     chem_pot[i] = R * system.getPhase(phasenumb).getTemperature() * (chem_ref[i]
                             + Math.log(system.getPhase(phasenumb).getComponents()[components[i]
                                     .getComponentNumber()].getNumberOfMolesInPhase())
                             - Math.log(n_t) + logactivityVec[i]);// system.getPhase(phasenumb).getActivityCoefficient(components[i].getComponentNumber(),components[waterNumb].getComponentNumber())));
                     // System.out.println("solute activ : " + i + " " +
-                    // system.getPhases()[1].getComponents()[components[i].getComponentNumber()].getFugasityCoeffisient()/chem_pot_dilute[i]);
+                    // system.getPhases()[1].getComponents()[components[i].getComponentNumber()].getFugacityCoefficient()/chem_pot_dilute[i]);
                 }
                 chem_pot_omega[i] = R * system.getPhase(phasenumb).getTemperature()
                         * (chem_ref[i] + Math.log(n_omega[i]) - Math.log(n_t) + logactivityVec[i]);

diff --git a/src/main/java/neqsim/fluidMechanics/flowLeg/FlowLeg.java b/src/main/java/neqsim/fluidMechanics/flowLeg/FlowLeg.java
@@ -159,15 +159,15 @@ public void setHeightCoordinates(double startHeightCoordinate, double endHeightC
 
     /** {@inheritDoc} */
     @Override
-    public void setOuterHeatTransferCOefficients(double startHeatTransferCoefficient,
+    public void setOuterHeatTransferCoefficients(double startHeatTransferCoefficient,
             double endHeatTransferCoefficient) {
         this.startOuterHeatTransferCoefficient = startHeatTransferCoefficient;
         this.endOuterHeatTransferCoefficient = endHeatTransferCoefficient;
     }
 
     /** {@inheritDoc} */
     @Override
-    public void setWallHeatTransferCOefficients(double startHeatTransferCoefficient,
+    public void setWallHeatTransferCoefficients(double startHeatTransferCoefficient,
             double endHeatTransferCoefficient) {
         this.startWallHeatTransferCOefficients = startHeatTransferCoefficient;
         this.endWallHeatTransferCOefficients = endHeatTransferCoefficient;

diff --git a/src/main/java/neqsim/fluidMechanics/flowLeg/FlowLegInterface.java b/src/main/java/neqsim/fluidMechanics/flowLeg/FlowLegInterface.java
@@ -123,24 +123,24 @@ public void setLongitudionalCoordinates(double startLongitudionalCoordinate,
 
     /**
      * <p>
-     * setOuterHeatTransferCOefficients.
+     * setOuterHeatTransferCoefficients.
      * </p>
      *
      * @param startHeatTransferCoefficient a double
      * @param endHeatTransferCoefficient a double
      */
-    public void setOuterHeatTransferCOefficients(double startHeatTransferCoefficient,
+    public void setOuterHeatTransferCoefficients(double startHeatTransferCoefficient,
             double endHeatTransferCoefficient);
 
     /**
      * <p>
-     * setWallHeatTransferCOefficients.
+     * setWallHeatTransferCoefficients.
      * </p>
      *
      * @param startHeatTransferCoefficient a double
      * @param endHeatTransferCoefficient a double
      */
-    public void setWallHeatTransferCOefficients(double startHeatTransferCoefficient,
+    public void setWallHeatTransferCoefficients(double startHeatTransferCoefficient,
             double endHeatTransferCoefficient);
 
     /**

diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/FlowNode.java b/src/main/java/neqsim/fluidMechanics/flowNode/FlowNode.java
@@ -517,7 +517,7 @@ public double getPrandtlNumber(int phase) {
     @Override
     public double getSchmidtNumber(int phase, int component1, int component2) {
         return getBulkSystem().getPhase(phase).getPhysicalProperties()
-                .getDiffusionCoeffisient(component1, component2)
+                .getDiffusionCoefficient(component1, component2)
                 / getBulkSystem().getPhase(phase).getPhysicalProperties().getKinematicViscosity();
     }
 

diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/FlowNodeInterface.java b/src/main/java/neqsim/fluidMechanics/flowNode/FlowNodeInterface.java
@@ -658,9 +658,9 @@ public interface FlowNodeInterface extends Cloneable {
      */
     public DoubleCloneable getVelocityIn(int i);
 
-    // public double calcWallHeatTransferCoeffisient(int phase);
+    // public double calcWallHeatTransferCoefficient(int phase);
 
-    // public double calcWallMassTransferCoeffisient(double schmidtNumber, int phase);
+    // public double calcWallMassTransferCoefficient(double schmidtNumber, int phase);
 
     /**
      * <p>
@@ -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/...oundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/NonEquilibriumFluidBoundary.java b/...oundary/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() {
 
     /**
      * <p>
-     * calcHeatTransferCoeffisients.
+     * calcHeatTransferCoefficients.
      * </p>
      *
      * @param phase a int
      */
-    public void calcHeatTransferCoeffisients(int phase) {
+    public void calcHeatTransferCoefficients(int phase) {
         prandtlNumber[phase] = getBulkSystem().getPhases()[phase].getCp()
                 / getBulkSystem().getPhases()[phase].getNumberOfMolesInPhase()
                 * getBulkSystem().getPhases()[phase].getPhysicalProperties().getViscosity()

diff --git a/...sTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/KrishnaStandartFilmModel.java b/...sTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/KrishnaStandartFilmModel.java
@@ -10,7 +10,9 @@
 import neqsim.thermodynamicOperations.ThermodynamicOperations;
 
 /**
- * <p>KrishnaStandartFilmModel class.</p>
+ * <p>
+ * KrishnaStandartFilmModel class.
+ * </p>
  *
  * @author asmund
  * @version $Id: $Id
@@ -26,12 +28,16 @@ public class KrishnaStandartFilmModel extends
     Matrix betaMatrix;
 
     /**
-     * <p>Constructor for KrishnaStandartFilmModel.</p>
+     * <p>
+     * Constructor for KrishnaStandartFilmModel.
+     * </p>
      */
     public KrishnaStandartFilmModel() {}
 
     /**
-     * <p>Constructor for KrishnaStandartFilmModel.</p>
+     * <p>
+     * Constructor for KrishnaStandartFilmModel.
+     * </p>
      *
      * @param system a {@link neqsim.thermo.system.SystemInterface} object
      */
@@ -48,7 +54,9 @@ public KrishnaStandartFilmModel(SystemInterface system) {
     }
 
     /**
-     * <p>Constructor for KrishnaStandartFilmModel.</p>
+     * <p>
+     * Constructor for KrishnaStandartFilmModel.
+     * </p>
      *
      * @param flowNode a {@link neqsim.fluidMechanics.flowNode.FlowNodeInterface} object
      */
@@ -83,7 +91,9 @@ public KrishnaStandartFilmModel clone() {
     }
 
     /**
-     * <p>calcBinarySchmidtNumbers.</p>
+     * <p>
+     * calcBinarySchmidtNumbers.
+     * </p>
      *
      * @param phase a int
      * @return a double
@@ -94,10 +104,10 @@ public double calcBinarySchmidtNumbers(int phase) {
                 binarySchmidtNumber[phase][i][j] = getBulkSystem().getPhases()[phase]
                         .getPhysicalProperties().getKinematicViscosity()
                         / getBulkSystem().getPhases()[phase].getPhysicalProperties()
-                                .getDiffusionCoeffisient(i, j);
+                                .getDiffusionCoefficient(i, j);
                 // System.out.println("i j " + i +" j " + j);
                 // System.out.println("phase " + phase + " diff" +
-                // getBulkSystem().getPhases()[phase].getPhysicalProperties().getDiffusionCoeffisient(i,j));
+                // getBulkSystem().getPhases()[phase].getPhysicalProperties().getDiffusionCoefficient(i,j));
                 // System.out.println("phase " + phase + " visk" +
                 // getBulkSystem().getPhases()[phase].getPhysicalProperties().getKinematicViscosity());
             }
@@ -106,7 +116,9 @@ public double calcBinarySchmidtNumbers(int phase) {
     }
 
     /**
-     * <p>calcBinaryMassTransferCoefficients.</p>
+     * <p>
+     * calcBinaryMassTransferCoefficients.
+     * </p>
      *
      * @param phase a int
      * @return a double
@@ -123,12 +135,14 @@ public double calcBinaryMassTransferCoefficients(int phase) {
     }
 
     /**
-     * <p>calcMassTransferCoeffisients.</p>
+     * <p>
+     * calcMassTransferCoefficients.
+     * </p>
      *
      * @param phase a int
      * @return a double
      */
-    public double calcMassTransferCoeffisients(int phase) {
+    public double calcMassTransferCoefficients(int phase) {
         int n = getBulkSystem().getPhases()[phase].getNumberOfComponents() - 1;
 
         for (int i = 0; i < getBulkSystem().getPhases()[phase].getNumberOfComponents() - 1; i++) {
@@ -154,7 +168,9 @@ public double calcMassTransferCoeffisients(int phase) {
     }
 
     /**
-     * <p>calcPhiMatrix.</p>
+     * <p>
+     * calcPhiMatrix.
+     * </p>
      *
      * @param phase a int
      */
@@ -187,7 +203,9 @@ public void calcPhiMatrix(int phase) {
     }
 
     /**
-     * <p>calcRedPhiMatrix.</p>
+     * <p>
+     * calcRedPhiMatrix.
+     * </p>
      *
      * @param phase a int
      */
@@ -196,7 +214,9 @@ public void calcRedPhiMatrix(int phase) {
     }
 
     /**
-     * <p>calcRedCorrectionMatrix.</p>
+     * <p>
+     * calcRedCorrectionMatrix.
+     * </p>
      *
      * @param phase a int
      */
@@ -209,7 +229,9 @@ public void calcRedCorrectionMatrix(int phase) {
     }
 
     /**
-     * <p>calcCorrectionMatrix.</p>
+     * <p>
+     * calcCorrectionMatrix.
+     * </p>
      *
      * @param phase a int
      */
@@ -226,7 +248,9 @@ public void calcCorrectionMatrix(int phase) {
     }
 
     /**
-     * <p>calcTotalMassTransferCoefficientMatrix.</p>
+     * <p>
+     * calcTotalMassTransferCoefficientMatrix.
+     * </p>
      *
      * @param phase a int
      */
@@ -257,7 +281,9 @@ public void calcTotalMassTransferCoefficientMatrix(int phase) {
     }
 
     /**
-     * <p>initCorrections.</p>
+     * <p>
+     * initCorrections.
+     * </p>
      *
      * @param phase a int
      */
@@ -280,7 +306,7 @@ public void initMassTransferCalc() {
         for (int phase = 0; phase < 2; phase++) {
             this.calcBinarySchmidtNumbers(phase);
             this.calcBinaryMassTransferCoefficients(phase);
-            this.calcMassTransferCoeffisients(phase);
+            this.calcMassTransferCoefficients(phase);
             this.initCorrections(phase);
             this.calcNonIdealCorrections(phase);
             // this.calcFluxTypeCorrectionMatrix(phase,0);
@@ -293,7 +319,7 @@ public void initMassTransferCalc() {
     public void initHeatTransferCalc() {
         super.initHeatTransferCalc();
         for (int phase = 0; phase < 2; phase++) {
-            this.calcHeatTransferCoeffisients(phase);
+            this.calcHeatTransferCoefficients(phase);
             this.calcHeatTransferCorrection(phase);
         }
     }
@@ -317,7 +343,9 @@ public void solve() {
     }
 
     /**
-     * <p>main.</p>
+     * <p>
+     * main.
+     * </p>
      *
      * @param args an array of {@link java.lang.String} objects
      */