refact: replace byValue with enums

equinor · Jan 11, 2025 · 49a79da · 49a79da
1 parent 0fe37d1
commit 49a79da
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/src/main/java/neqsim/thermo/phase/PhaseEos.java b/src/main/java/neqsim/thermo/phase/PhaseEos.java
@@ -89,7 +89,7 @@ public void init(double totalNumberOfMoles, int numberOfComponents, int initType
       pt = PhaseType.LIQUID;
     }
     if (!isMixingRuleDefined()) {
-      setMixingRule(EosMixingRuleType.byValue(1));
+      setMixingRule(EosMixingRuleType.NO);
     }
 
     super.init(totalNumberOfMoles, numberOfComponents, initType, pt, beta);

diff --git a/src/main/java/neqsim/thermo/phase/PhaseGE.java b/src/main/java/neqsim/thermo/phase/PhaseGE.java
@@ -143,7 +143,7 @@ public void setMixingRule(MixingRuleTypeInterface mr) {
       throw new RuntimeException(
           new neqsim.util.exception.InvalidInputException(this, "setMixingRule", "mr"));
     }
-    mixingRuleType = EosMixingRuleType.byValue(2);
+    mixingRuleType = EosMixingRuleType.CLASSIC);
     mixRule = mixSelect.getMixingRule(mixingRuleType.getValue(), this);
   }
 
@@ -155,7 +155,7 @@ public void resetMixingRule(MixingRuleTypeInterface mr) {
           new neqsim.util.exception.InvalidInputException(this, "resetMixingRule", "mr"));
     }
     // NB! Ignores input mr
-    mixingRuleType = EosMixingRuleType.byValue(2);
+    mixingRuleType = EosMixingRuleType.CLASSIC;
     mixRule = mixSelect.resetMixingRule(mixingRuleType.getValue(), this);
   }
 

diff --git a/src/main/java/neqsim/thermo/phase/PhaseGENRTL.java b/src/main/java/neqsim/thermo/phase/PhaseGENRTL.java
@@ -62,7 +62,7 @@ public PhaseGENRTL(PhaseInterface phase, double[][] alpha, double[][] Dij, Strin
           phase.getComponent(i).getNumberOfmoles(), phase.getComponent(i).getNumberOfMolesInPhase(),
           phase.getComponent(i).getComponentNumber());
     }
-    setMixingRule(EosMixingRuleType.byValue(2));
+    setMixingRule(EosMixingRuleType.CLASSIC);
   }
 
   /** {@inheritDoc} */

diff --git a/src/main/java/neqsim/thermo/phase/PhaseGEUnifacPSRK.java b/src/main/java/neqsim/thermo/phase/PhaseGEUnifacPSRK.java
@@ -52,7 +52,7 @@ public PhaseGEUnifacPSRK(PhaseInterface phase, double[][] alpha, double[][] Dij,
           phase.getComponent(i).getNumberOfmoles(), phase.getComponent(i).getNumberOfMolesInPhase(),
           phase.getComponent(i).getComponentNumber());
     }
-    this.setMixingRule(EosMixingRuleType.byValue(2));
+    this.setMixingRule(EosMixingRuleType.CLASSIC);
   }
 
   /** {@inheritDoc} */

diff --git a/src/main/java/neqsim/thermo/phase/PhaseGEUnifacUMRPRU.java b/src/main/java/neqsim/thermo/phase/PhaseGEUnifacUMRPRU.java
@@ -60,7 +60,7 @@ public PhaseGEUnifacUMRPRU(PhaseInterface phase, double[][] alpha, double[][] Di
           phase.getComponent(i).getComponentNumber());
       componentArray[i].setAttractiveTerm(phase.getComponent(i).getAttractiveTermNumber());
     }
-    this.setMixingRule(EosMixingRuleType.byValue(2));
+    this.setMixingRule(EosMixingRuleType.CLASSIC);
   }
 
   /**

diff --git a/...va/neqsim/thermodynamicoperations/flashops/saturationops/HydrateInhibitorwtFlashTest.java b/...va/neqsim/thermodynamicoperations/flashops/saturationops/HydrateInhibitorwtFlashTest.java
@@ -23,7 +23,7 @@ void testRun() {
     testSystem.addComponent("MEG", 0.000001);
     testSystem.addComponent("water", 0.0010);
     testSystem.createDatabase(true);
-    testSystem.setMixingRule(EosMixingRuleType.byValue(10));
+    testSystem.setMixingRule(EosMixingRuleType.CLASSIC_TX_CPA);
 
     testSystem.init(0);
     testSystem.setMultiPhaseCheck(true);