remove redundant methods

equinor · Mar 1, 2024 · c8688b0 · c8688b0
1 parent e7a90fb
commit c8688b0
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 626 deletions.
diff --git a/src/main/java/neqsim/thermo/phase/Phase.java b/src/main/java/neqsim/thermo/phase/Phase.java
@@ -337,7 +337,8 @@ public double getMixGibbsEnergy() {
     for (int i = 0; i < numberOfComponents; i++) {
       gmix += getComponent(i).getx() * Math.log(getComponent(i).getx());
     }
-    return getExcessGibbsEnergy() + R * temperature * gmix * numberOfMolesInPhase;
+    // todo: is this correct?
+    return R * temperature * numberOfMolesInPhase * getExcessGibbsEnergy() * gmix;
   }
 
   /** {@inheritDoc} */

diff --git a/src/main/java/neqsim/thermo/phase/PhaseDesmukhMather.java b/src/main/java/neqsim/thermo/phase/PhaseDesmukhMather.java
@@ -203,8 +203,7 @@ public double getExcessGibbsEnergy(PhaseInterface phase, int numberOfComponents,
       GE += phase.getComponents()[i].getx() * Math.log(((ComponentDesmukhMather) componentArray[i])
           .getGamma(phase, numberOfComponents, temperature, pressure, pt));
     }
-    // System.out.println("ge " + GE);
-    return R * temperature * numberOfMolesInPhase * GE; // phase.getNumberOfMolesInPhase()*
+    return R * temperature * numberOfMolesInPhase * GE;
   }
 
   /** {@inheritDoc} */

diff --git a/src/main/java/neqsim/thermo/phase/PhaseDuanSun.java b/src/main/java/neqsim/thermo/phase/PhaseDuanSun.java
@@ -111,7 +111,7 @@ public double getExcessGibbsEnergy(PhaseInterface phase, int numberOfComponents,
           .getGammaPitzer(phase, numberOfComponents, temperature, pressure, pt, salinity));
     }
 
-    return R * temperature * numberOfMolesInPhase * GE; // phase.getNumberOfMolesInPhase()*
+    return R * temperature * numberOfMolesInPhase * GE;
   }
 
   /** {@inheritDoc} */

diff --git a/src/main/java/neqsim/thermo/phase/PhaseGENRTL.java b/src/main/java/neqsim/thermo/phase/PhaseGENRTL.java
@@ -124,7 +124,7 @@ public double getExcessGibbsEnergy(PhaseInterface phase, int numberOfComponents,
               temperature, pressure, pt, alpha, Dij, intparam, mixRule));
     }
 
-    return R * temperature * numberOfMolesInPhase * GE; // phase.getNumberOfMolesInPhase()*
+    return R * temperature * numberOfMolesInPhase * GE;
   }
 
   /** {@inheritDoc} */

diff --git a/src/main/java/neqsim/thermo/phase/PhaseGENRTLmodifiedHV.java b/src/main/java/neqsim/thermo/phase/PhaseGENRTLmodifiedHV.java
@@ -138,7 +138,7 @@ public double getExcessGibbsEnergy(PhaseInterface phase, int numberOfComponents,
                 temperature, pressure, pt, alpha, Dij, DijT, intparam, mixRule));
       }
     }
-    return (R * phase.getTemperature() * GE) * phase.getNumberOfMolesInPhase();
+    return R * phase.getTemperature() * phase.getNumberOfMolesInPhase() * GE;
   }
 
   /** {@inheritDoc} */
@@ -149,7 +149,7 @@ public double getGibbsEnergy() {
       val +=
           getComponent(i).getNumberOfMolesInPhase() * (getComponent(i).getLogFugacityCoefficient()); // +Math.log(getComponent(i).getx()*getComponent(i).getAntoineVaporPressure(temperature)));
     }
-    return R * temperature * ((val) + Math.log(pressure) * numberOfMolesInPhase);
+    return R * temperature * numberOfMolesInPhase * (val + Math.log(pressure));
   }
 
   /** {@inheritDoc} */

diff --git a/src/main/java/neqsim/thermo/phase/PhaseGENRTLmodifiedWS.java b/src/main/java/neqsim/thermo/phase/PhaseGENRTLmodifiedWS.java
@@ -93,19 +93,19 @@ public void addComponent(String name, double moles, double molesInPhase, int com
   @Override
   public double getExcessGibbsEnergy(PhaseInterface phase, int numberOfComponents,
       double temperature, double pressure, PhaseType pt) {
+    // TODO: why is GE a local variable?
     double GE = 0;
     for (int i = 0; i < numberOfComponents; i++) {
       if (type == 0) {
         GE += phase.getComponents()[i].getx()
             * Math.log(((ComponentGEInterface) componentArray[i]).getGamma(phase,
                 numberOfComponents, temperature, pressure, pt, alpha, Dij, intparam, mixRule));
-      }
-      if (type == 1) {
+      } else if (type == 1) {
         GE += phase.getComponents()[i].getx() * Math
             .log(((ComponentGENRTLmodifiedWS) componentArray[i]).getGamma(phase, numberOfComponents,
                 temperature, pressure, pt, alpha, Dij, DijT, intparam, mixRule));
       }
     }
-    return R * temperature * GE * numberOfMolesInPhase;
+    return R * temperature * numberOfMolesInPhase * GE;
   }
 }
diff --git a/src/main/java/neqsim/thermo/phase/PhaseGEUnifac.java b/src/main/java/neqsim/thermo/phase/PhaseGEUnifac.java
@@ -193,7 +193,7 @@ public double getExcessGibbsEnergy(PhaseInterface phase, int numberOfComponents,
       GE += phase.getComponents()[i].getx() * Math.log(((ComponentGEUniquac) componentArray[i])
           .getGamma(phase, numberOfComponents, temperature, pressure, pt));
     }
-    return R * phase.getTemperature() * GE * phase.getNumberOfMolesInPhase();
+    return R * phase.getTemperature() * phase.getNumberOfMolesInPhase() * GE;
   }
 
   /** {@inheritDoc} */
@@ -204,7 +204,7 @@ public double getGibbsEnergy() {
       val +=
           getComponent(i).getNumberOfMolesInPhase() * (getComponent(i).getLogFugacityCoefficient());
     }
-    return R * temperature * ((val) + Math.log(pressure) * numberOfMolesInPhase);
+    return R * temperature * numberOfMolesInPhase * (val + Math.log(pressure));
   }
 
   /**

diff --git a/src/main/java/neqsim/thermo/phase/PhaseGEUnifacPSRK.java b/src/main/java/neqsim/thermo/phase/PhaseGEUnifacPSRK.java
@@ -80,7 +80,7 @@ public double getExcessGibbsEnergy(PhaseInterface phase, int numberOfComponents,
       GE += phase.getComponents()[i].getx() * Math.log(((ComponentGEUniquac) componentArray[i])
           .getGamma(phase, numberOfComponents, temperature, pressure, pt));
     }
-    return R * phase.getTemperature() * GE * phase.getNumberOfMolesInPhase(); // phase.getNumberOfMolesInPhase()*
+    return R * phase.getTemperature() * phase.getNumberOfMolesInPhase() * GE;
   }
 
   /**

diff --git a/src/main/java/neqsim/thermo/phase/PhaseGEUnifacUMRPRU.java b/src/main/java/neqsim/thermo/phase/PhaseGEUnifacUMRPRU.java
@@ -125,7 +125,7 @@ public double getExcessGibbsEnergy(PhaseInterface phase, int numberOfComponents,
       GE += phase.getComponents()[i].getx() * Math.log(((ComponentGEUniquac) componentArray[i])
           .getGamma(phase, numberOfComponents, temperature, pressure, pt));
     }
-    return R * phase.getTemperature() * GE * phase.getNumberOfMolesInPhase();
+    return R * phase.getTemperature() * phase.getNumberOfMolesInPhase() * GE;
   }
 
   /**

diff --git a/src/main/java/neqsim/thermo/phase/PhasePCSAFT.java b/src/main/java/neqsim/thermo/phase/PhasePCSAFT.java
@@ -334,7 +334,6 @@ public double calcmSAFT() {
    */
   public double calcF1dispSumTerm() {
     double temp1 = 0.0;
-
     for (int i = 0; i < numberOfComponents; i++) {
       for (int j = 0; j < numberOfComponents; j++) {
         temp1 +=
@@ -358,7 +357,6 @@ public double calcF1dispSumTerm() {
    */
   public double calcF2dispSumTerm() {
     double temp1 = 0.0;
-
     for (int i = 0; i < numberOfComponents; i++) {
       for (int j = 0; j < numberOfComponents; j++) {
         temp1 += getComponent(i).getNumberOfMolesInPhase()