refact: reorder variable init to match order

equinor · Jan 5, 2025 · 1883291 · 1883291
1 parent 9189d0b
commit 1883291
Show file tree

Hide file tree

Showing 21 changed files with 27 additions and 18 deletions.
diff --git a/src/main/java/neqsim/thermo/system/SystemDesmukhMather.java b/src/main/java/neqsim/thermo/system/SystemDesmukhMather.java
@@ -45,8 +45,8 @@ public SystemDesmukhMather(double T, double P) {
    */
   public SystemDesmukhMather(double T, double P, boolean checkForSolids) {
     super(T, P, checkForSolids);
-    attractiveTermNumber = 0;
     modelName = "Desmukh-Mather-model";
+    attractiveTermNumber = 0;
 
     phaseArray[0] = new PhaseSrkEos();
     phaseArray[0].setTemperature(T);

diff --git a/src/main/java/neqsim/thermo/system/SystemDuanSun.java b/src/main/java/neqsim/thermo/system/SystemDuanSun.java
@@ -48,8 +48,8 @@ public SystemDuanSun(double T, double P) {
    */
   public SystemDuanSun(double T, double P, boolean checkForSolids) {
     super(T, P, checkForSolids);
-    attractiveTermNumber = 0;
     modelName = "Duan-Sun-model";
+    attractiveTermNumber = 0;
 
     phaseArray[0] = new PhaseSrkEos();
     phaseArray[0].setTemperature(T);

diff --git a/src/main/java/neqsim/thermo/system/SystemElectrolyteCPA.java b/src/main/java/neqsim/thermo/system/SystemElectrolyteCPA.java
@@ -31,8 +31,9 @@ public SystemElectrolyteCPA() {
    */
   public SystemElectrolyteCPA(double T, double P) {
     super(T, P);
-    attractiveTermNumber = 0;
     modelName = "Electrolyte-CPA-EOS";
+    attractiveTermNumber = 0;
+
     for (int i = 0; i < numberOfPhases; i++) {
       phaseArray[i] = new PhaseElectrolyteCPA();
       phaseArray[i].setTemperature(T);

diff --git a/src/main/java/neqsim/thermo/system/SystemElectrolyteCPAstatoil.java b/src/main/java/neqsim/thermo/system/SystemElectrolyteCPAstatoil.java
@@ -31,8 +31,9 @@ public SystemElectrolyteCPAstatoil() {
    */
   public SystemElectrolyteCPAstatoil(double T, double P) {
     super(T, P);
-    attractiveTermNumber = 15;
     modelName = "Electrolyte-CPA-EOS-statoil";
+    attractiveTermNumber = 15;
+
     for (int i = 0; i < numberOfPhases; i++) {
       phaseArray[i] = new PhaseElectrolyteCPAstatoil();
       phaseArray[i].setTemperature(T);

diff --git a/src/main/java/neqsim/thermo/system/SystemFurstElectrolyteEos.java b/src/main/java/neqsim/thermo/system/SystemFurstElectrolyteEos.java
@@ -30,8 +30,9 @@ public SystemFurstElectrolyteEos() {
    */
   public SystemFurstElectrolyteEos(double T, double P) {
     super(T, P);
-    attractiveTermNumber = 2;
     modelName = "Electrolyte-ScRK-EOS";
+    attractiveTermNumber = 2;
+
     for (int i = 0; i < numberOfPhases; i++) {
       phaseArray[i] = new PhaseModifiedFurstElectrolyteEos();
       phaseArray[i].setTemperature(T);

diff --git a/src/main/java/neqsim/thermo/system/SystemFurstElectrolyteEosMod2004.java b/src/main/java/neqsim/thermo/system/SystemFurstElectrolyteEosMod2004.java
@@ -31,8 +31,9 @@ public SystemFurstElectrolyteEosMod2004() {
    */
   public SystemFurstElectrolyteEosMod2004(double T, double P) {
     super(T, P);
-    attractiveTermNumber = 2;
     modelName = "Electrolyte-ScRK-EOS";
+    attractiveTermNumber = 2;
+
     for (int i = 0; i < numberOfPhases; i++) {
       phaseArray[i] = new PhaseModifiedFurstElectrolyteEosMod2004();
       phaseArray[i].setTemperature(T);

diff --git a/src/main/java/neqsim/thermo/system/SystemGEWilson.java b/src/main/java/neqsim/thermo/system/SystemGEWilson.java
@@ -45,8 +45,8 @@ public SystemGEWilson(double T, double P) {
    */
   public SystemGEWilson(double T, double P, boolean checkForSolids) {
     super(T, P, checkForSolids);
-    attractiveTermNumber = 0;
     modelName = "UNIFAC-GE-model";
+    attractiveTermNumber = 0;
 
     phaseArray[0] = new PhaseSrkEos();
     phaseArray[0].setTemperature(T);

diff --git a/src/main/java/neqsim/thermo/system/SystemKentEisenberg.java b/src/main/java/neqsim/thermo/system/SystemKentEisenberg.java
@@ -45,8 +45,8 @@ public SystemKentEisenberg(double T, double P) {
    */
   public SystemKentEisenberg(double T, double P, boolean checkForSolids) {
     super(T, P, checkForSolids);
-    attractiveTermNumber = 0;
     modelName = "Kent Eisenberg-model";
+    attractiveTermNumber = 0;
 
     phaseArray[0] = new PhaseSrkEos();
     phaseArray[0].setTemperature(T);

diff --git a/src/main/java/neqsim/thermo/system/SystemNRTL.java b/src/main/java/neqsim/thermo/system/SystemNRTL.java
@@ -45,8 +45,8 @@ public SystemNRTL(double T, double P) {
    */
   public SystemNRTL(double T, double P, boolean checkForSolids) {
     super(T, P, checkForSolids);
-    attractiveTermNumber = 0;
     modelName = "NRTL-GE-model";
+    attractiveTermNumber = 0;
 
     phaseArray[0] = new PhaseSrkEos();
     phaseArray[0].setTemperature(T);

diff --git a/src/main/java/neqsim/thermo/system/SystemPrEos.java b/src/main/java/neqsim/thermo/system/SystemPrEos.java
@@ -39,9 +39,9 @@ public SystemPrEos(double T, double P) {
    */
   public SystemPrEos(double T, double P, boolean checkForSolids) {
     super(T, P, checkForSolids);
-    attractiveTermNumber = 1;
     modelName = "PR-EOS";
     getCharacterization().setTBPModel("PedersenPR");
+    attractiveTermNumber = 1;
 
     for (int i = 0; i < numberOfPhases; i++) {
       phaseArray[i] = new PhasePrEos();

diff --git a/src/main/java/neqsim/thermo/system/SystemPrEos1978.java b/src/main/java/neqsim/thermo/system/SystemPrEos1978.java
@@ -41,8 +41,8 @@ public SystemPrEos1978(double T, double P) {
    */
   public SystemPrEos1978(double T, double P, boolean checkForSolids) {
     super(T, P, checkForSolids);
-    attractiveTermNumber = 6;
     modelName = "PR78-EoS";
+    attractiveTermNumber = 6;
   }
 
   /** {@inheritDoc} */

diff --git a/src/main/java/neqsim/thermo/system/SystemPrMathiasCopeman.java b/src/main/java/neqsim/thermo/system/SystemPrMathiasCopeman.java
@@ -41,8 +41,8 @@ public SystemPrMathiasCopeman(double T, double P) {
    */
   public SystemPrMathiasCopeman(double T, double P, boolean checkForSolids) {
     super(T, P, checkForSolids);
-    attractiveTermNumber = 13;
     modelName = "Mathias-Copeman-PR-EOS";
+    attractiveTermNumber = 13;
   }
 
   /** {@inheritDoc} */

diff --git a/src/main/java/neqsim/thermo/system/SystemPsrkEos.java b/src/main/java/neqsim/thermo/system/SystemPsrkEos.java
@@ -41,8 +41,8 @@ public SystemPsrkEos(double T, double P) {
    */
   public SystemPsrkEos(double T, double P, boolean checkForSolids) {
     super(T, P, checkForSolids);
-    attractiveTermNumber = 4;
     modelName = "Predictive-SRK-EOS";
+    attractiveTermNumber = 4;
   }
 
   /** {@inheritDoc} */

diff --git a/src/main/java/neqsim/thermo/system/SystemRKEos.java b/src/main/java/neqsim/thermo/system/SystemRKEos.java
@@ -44,8 +44,8 @@ public SystemRKEos(double T, double P) {
    */
   public SystemRKEos(double T, double P, boolean checkForSolids) {
     super(T, P, checkForSolids);
-    attractiveTermNumber = 5;
     modelName = "RK-EOS";
+    attractiveTermNumber = 5;
 
     for (int i = 0; i < numberOfPhases; i++) {
       phaseArray[i] = new PhaseRK();

diff --git a/src/main/java/neqsim/thermo/system/SystemSrkMathiasCopeman.java b/src/main/java/neqsim/thermo/system/SystemSrkMathiasCopeman.java
@@ -41,8 +41,8 @@ public SystemSrkMathiasCopeman(double T, double P) {
    */
   public SystemSrkMathiasCopeman(double T, double P, boolean checkForSolids) {
     super(T, P, checkForSolids);
-    attractiveTermNumber = 4;
     modelName = "Mathias-Copeman-SRK-EOS";
+    attractiveTermNumber = 4;
   }
 
   /** {@inheritDoc} */

diff --git a/src/main/java/neqsim/thermo/system/SystemTSTEos.java b/src/main/java/neqsim/thermo/system/SystemTSTEos.java
@@ -47,8 +47,8 @@ public SystemTSTEos(double T, double P) {
    */
   public SystemTSTEos(double T, double P, boolean checkForSolids) {
     super(T, P, checkForSolids);
-    attractiveTermNumber = 14;
     modelName = "TST-EOS";
+    attractiveTermNumber = 14;
 
     for (int i = 0; i < numberOfPhases; i++) {
       phaseArray[i] = new PhaseTSTEos();

diff --git a/src/main/java/neqsim/thermo/system/SystemUMRCPAEoS.java b/src/main/java/neqsim/thermo/system/SystemUMRCPAEoS.java
@@ -31,6 +31,7 @@ public SystemUMRCPAEoS(double T, double P) {
     super(T, P);
     modelName = "UMR-CPA";
     attractiveTermNumber = 19;
+
     useVolumeCorrection(false);
     for (int i = 0; i < numberOfPhases; i++) {
       phaseArray[i] = new PhaseUMRCPA();

diff --git a/src/main/java/neqsim/thermo/system/SystemUMRPRUEos.java b/src/main/java/neqsim/thermo/system/SystemUMRPRUEos.java
@@ -44,6 +44,7 @@ public SystemUMRPRUEos(double T, double P, boolean checkForSolids) {
     setBmixType(1);
     modelName = "UMR-PRU-EoS";
     attractiveTermNumber = 1;
+
     CapeOpenProperties11 = new String[] {"speedOfSound", "jouleThomsonCoefficient",
         "internalEnergy", "internalEnergy.Dtemperature", "gibbsEnergy", "helmholtzEnergy",
         "fugacityCoefficient", "logFugacityCoefficient", "logFugacityCoefficient.Dtemperature",

diff --git a/src/main/java/neqsim/thermo/system/SystemUMRPRUMCEosNew.java b/src/main/java/neqsim/thermo/system/SystemUMRPRUMCEosNew.java
@@ -31,6 +31,7 @@ public SystemUMRPRUMCEosNew(double T, double P) {
     super(T, P);
     modelName = "UMR-PRU-MC-EoS-New";
     attractiveTermNumber = 19;
+
     useVolumeCorrection(false);
     for (int i = 0; i < numberOfPhases; i++) {
       phaseArray[i] = new PhasePrEosvolcor();

diff --git a/src/main/java/neqsim/thermo/system/SystemUNIFAC.java b/src/main/java/neqsim/thermo/system/SystemUNIFAC.java
@@ -46,8 +46,9 @@ public SystemUNIFAC(double T, double P) {
    */
   public SystemUNIFAC(double T, double P, boolean checkForSolids) {
     super(T, P, checkForSolids);
-    attractiveTermNumber = 0;
     modelName = "UNIFAC-GE-model";
+    attractiveTermNumber = 0;
+
     solidPhaseCheck = checkForSolids;
 
     phaseArray[0] = new PhaseSrkEos();

diff --git a/src/main/java/neqsim/thermo/system/SystemUNIFACpsrk.java b/src/main/java/neqsim/thermo/system/SystemUNIFACpsrk.java
@@ -45,8 +45,9 @@ public SystemUNIFACpsrk(double T, double P) {
    */
   public SystemUNIFACpsrk(double T, double P, boolean checkForSolids) {
     super(T, P, checkForSolids);
-    attractiveTermNumber = 0;
     modelName = "UNIFAC-GE-model";
+    attractiveTermNumber = 0;
+
     solidPhaseCheck = checkForSolids;
 
     phaseArray[0] = new PhaseSrkEos();