refact: rename getCpamix -> getCpaMixingRule

equinor · Jan 9, 2025 · 2f38ac4 · 2f38ac4
1 parent 9556c8b
commit 2f38ac4
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 15 deletions.
diff --git a/src/main/java/neqsim/thermo/component/ComponentElectrolyteCPA.java b/src/main/java/neqsim/thermo/component/ComponentElectrolyteCPA.java
@@ -421,8 +421,8 @@ public double dFCPAdXidXj(int sitei, int sitej, int compj, PhaseInterface phase)
     }
     return -getNumberOfMolesInPhase() / Math.pow(xsite[sitei], 2.0) * fact
         - getNumberOfMolesInPhase() * phase.getComponent(compj).getNumberOfMolesInPhase()
-            * ((PhaseCPAInterface) phase).getCpamix().calcDelta(sitei, sitej, componentNumber,
-                compj, phase, phase.getTemperature(), phase.getPressure(),
+            * ((PhaseCPAInterface) phase).getCpaMixingRule().calcDelta(sitei, sitej,
+                componentNumber, compj, phase, phase.getTemperature(), phase.getPressure(),
                 phase.getNumberOfComponents());
   }
 

diff --git a/src/main/java/neqsim/thermo/component/ComponentSrkCPA.java b/src/main/java/neqsim/thermo/component/ComponentSrkCPA.java
@@ -411,8 +411,8 @@ public double dFCPAdXidXj(int sitei, int sitej, int compj, PhaseInterface phase)
     }
     return -getNumberOfMolesInPhase() / Math.pow(xsite[sitei], 2.0) * fact
         - getNumberOfMolesInPhase() * phase.getComponent(compj).getNumberOfMolesInPhase()
-            * ((PhaseCPAInterface) phase).getCpamix().calcDelta(sitei, sitej, componentNumber,
-                compj, phase, phase.getTemperature(), phase.getPressure(),
+            * ((PhaseCPAInterface) phase).getCpaMixingRule().calcDelta(sitei, sitej,
+                componentNumber, compj, phase, phase.getTemperature(), phase.getPressure(),
                 phase.getNumberOfComponents());
   }
 

diff --git a/src/main/java/neqsim/thermo/component/ComponentUMRCPA.java b/src/main/java/neqsim/thermo/component/ComponentUMRCPA.java
@@ -425,8 +425,8 @@ public double dFCPAdXidXj(int sitei, int sitej, int compj, PhaseInterface phase)
     }
     return -getNumberOfMolesInPhase() / Math.pow(xsite[sitei], 2.0) * fact
         - getNumberOfMolesInPhase() * phase.getComponent(compj).getNumberOfMolesInPhase()
-            * ((PhaseCPAInterface) phase).getCpamix().calcDelta(sitei, sitej, componentNumber,
-                compj, phase, phase.getTemperature(), phase.getPressure(),
+            * ((PhaseCPAInterface) phase).getCpaMixingRule().calcDelta(sitei, sitej,
+                componentNumber, compj, phase, phase.getTemperature(), phase.getPressure(),
                 phase.getNumberOfComponents());
   }
 

diff --git a/src/main/java/neqsim/thermo/phase/PhaseCPAInterface.java b/src/main/java/neqsim/thermo/phase/PhaseCPAInterface.java
@@ -71,10 +71,10 @@ public interface PhaseCPAInterface extends PhaseEosInterface {
 
   /**
    * <p>
-   * getCpamix.
+   * getCpaMixingRule.
    * </p>
    *
    * @return a {@link neqsim.thermo.mixingrule.CPAMixingRulesInterface} object
    */
-  public CPAMixingRulesInterface getCpamix();
+  public CPAMixingRulesInterface getCpaMixingRule();
 }
diff --git a/src/main/java/neqsim/thermo/phase/PhaseElectrolyteCPA.java b/src/main/java/neqsim/thermo/phase/PhaseElectrolyteCPA.java
@@ -1324,7 +1324,7 @@ public void setGcpav(double gcpav) {
 
   /** {@inheritDoc} */
   @Override
-  public CPAMixingRulesInterface getCpamix() {
+  public CPAMixingRulesInterface getCpaMixingRule() {
     return cpamix;
   }
 

diff --git a/src/main/java/neqsim/thermo/phase/PhaseElectrolyteCPAOld.java b/src/main/java/neqsim/thermo/phase/PhaseElectrolyteCPAOld.java
@@ -803,7 +803,7 @@ public void setGcpav(double gcpav) {
 
   /** {@inheritDoc} */
   @Override
-  public CPAMixingRulesInterface getCpamix() {
+  public CPAMixingRulesInterface getCpaMixingRule() {
     return cpamix;
   }
 

diff --git a/src/main/java/neqsim/thermo/phase/PhasePCSAFTa.java b/src/main/java/neqsim/thermo/phase/PhasePCSAFTa.java
@@ -476,7 +476,7 @@ public double getGcpav() {
 
   /** {@inheritDoc} */
   @Override
-  public CPAMixingRulesInterface getCpamix() {
+  public CPAMixingRulesInterface getCpaMixingRule() {
     return cpamix;
   }
 

diff --git a/src/main/java/neqsim/thermo/phase/PhasePrCPA.java b/src/main/java/neqsim/thermo/phase/PhasePrCPA.java
@@ -456,7 +456,7 @@ public double getGcpav() {
 
   /** {@inheritDoc} */
   @Override
-  public CPAMixingRulesInterface getCpamix() {
+  public CPAMixingRulesInterface getCpaMixingRule() {
     return cpamix;
   }
 

diff --git a/src/main/java/neqsim/thermo/phase/PhaseSrkCPA.java b/src/main/java/neqsim/thermo/phase/PhaseSrkCPA.java
@@ -1421,7 +1421,7 @@ public void setGcpav(double gcpav) {
 
   /** {@inheritDoc} */
   @Override
-  public CPAMixingRulesInterface getCpamix() {
+  public CPAMixingRulesInterface getCpaMixingRule() {
     return cpamix;
   }
 

diff --git a/src/main/java/neqsim/thermo/phase/PhaseSrkCPA_proceduralMatrices.java b/src/main/java/neqsim/thermo/phase/PhaseSrkCPA_proceduralMatrices.java
@@ -1406,7 +1406,7 @@ public void setGcpav(double gcpav) {
 
   /** {@inheritDoc} */
   @Override
-  public CPAMixingRulesInterface getCpamix() {
+  public CPAMixingRulesInterface getCpaMixingRule() {
     return cpamix;
   }
 

diff --git a/src/main/java/neqsim/thermo/phase/PhaseUMRCPA.java b/src/main/java/neqsim/thermo/phase/PhaseUMRCPA.java
@@ -1375,7 +1375,7 @@ public void setGcpav(double gcpav) {
 
   /** {@inheritDoc} */
   @Override
-  public CPAMixingRulesInterface getCpamix() {
+  public CPAMixingRulesInterface getCpaMixingRule() {
     return cpamix;
   }