refact: simplify EOS subclass constructor

asmfstatoil · asmfstatoil · commit b46223fa7710 · 2024-03-15T11:11:35.000+01:00
diff --git a/src/main/java/neqsim/thermo/component/ComponentInterface.java b/src/main/java/neqsim/thermo/component/ComponentInterface.java
@@ -1835,7 +1835,7 @@ public default double getLogFugacityCoefficient() {
    * Setter for field <code>solidCheck</code>.
    * </p>
    *
-   * @param checkForSolids Set true to check for solid phase and do solid phase calculations.
+   * @param checkForSolids Set true to do solid phase check and calculations
    */
   public void setSolidCheck(boolean checkForSolids);
 
diff --git a/src/main/java/neqsim/thermo/system/SystemBWRSEos.java b/src/main/java/neqsim/thermo/system/SystemBWRSEos.java
@@ -46,8 +46,7 @@ public SystemBWRSEos(double T, double P) {
    * @param checkForSolids Set true to do solid phase check and calculations
    */
   public SystemBWRSEos(double T, double P, boolean checkForSolids) {
-    super(T, P);
-    this.solidPhaseCheck = checkForSolids;;
+    super(T, P, checkForSolids);
     modelName = "BWRS-EOS";
     attractiveTermNumber = 0;
 
@@ -83,11 +82,6 @@ public SystemBWRSEos clone() {
       logger.error("Cloning failed.", ex);
     }
 
-    // clonedSystem.phaseArray = (PhaseInterface[]) phaseArray.clone();
-    // for(int i = 0; i < numberOfPhases; i++) {
-    // clonedSystem.phaseArray[i] = (PhaseInterface) phaseArray[i].clone();
-    // }
-
     return clonedSystem;
   }
 }
diff --git a/src/main/java/neqsim/thermo/system/SystemDesmukhMather.java b/src/main/java/neqsim/thermo/system/SystemDesmukhMather.java
@@ -44,8 +44,7 @@ public SystemDesmukhMather(double T, double P) {
    * @param checkForSolids Set true to do solid phase check and calculations
    */
   public SystemDesmukhMather(double T, double P, boolean checkForSolids) {
-    super(T, P);
-    this.solidPhaseCheck = checkForSolids;;
+    super(T, P, checkForSolids);
     attractiveTermNumber = 0;
     modelName = "Desmukh-Mather-model";
 
diff --git a/src/main/java/neqsim/thermo/system/SystemDuanSun.java b/src/main/java/neqsim/thermo/system/SystemDuanSun.java
@@ -48,8 +48,7 @@ public SystemDuanSun(double T, double P) {
    * @param checkForSolids Set true to do solid phase check and calculations
    */
   public SystemDuanSun(double T, double P, boolean checkForSolids) {
-    super(T, P);
-    this.solidPhaseCheck = checkForSolids;;
+    super(T, P, checkForSolids);
     attractiveTermNumber = 0;
     modelName = "Duan-Sun-model";
 
diff --git a/src/main/java/neqsim/thermo/system/SystemElectrolyteCPA.java b/src/main/java/neqsim/thermo/system/SystemElectrolyteCPA.java
@@ -52,10 +52,6 @@ public SystemElectrolyteCPA clone() {
       logger.error("Cloning failed.", ex);
     }
 
-    // for(int i = 0; i < numberOfPhases; i++) {
-    // clonedSystem.phaseArray[i] =(PhaseElectrolyteCPA) phaseArray[i].clone();
-    // }
-
     return clonedSystem;
   }
 }
diff --git a/src/main/java/neqsim/thermo/system/SystemElectrolyteCPAstatoil.java b/src/main/java/neqsim/thermo/system/SystemElectrolyteCPAstatoil.java
@@ -52,10 +52,6 @@ public SystemElectrolyteCPAstatoil clone() {
       logger.error("Cloning failed.", ex);
     }
 
-    // for(int i = 0; i < numberOfPhases; i++) {
-    // clonedSystem.phaseArray[i] =(PhaseElectrolyteCPA) phaseArray[i].clone();
-    // }
-
     return clonedSystem;
   }
 }
diff --git a/src/main/java/neqsim/thermo/system/SystemEos.java b/src/main/java/neqsim/thermo/system/SystemEos.java
@@ -1,6 +1,7 @@
 package neqsim.thermo.system;
 
 /**
+ * Base class for system with EOS.
  *
  * @author Even Solbraa
  */
@@ -23,13 +24,9 @@ public SystemEos() {
    *
    * @param T The temperature in unit Kelvin
    * @param P The pressure in unit bara (absolute pressure)
+   * @param checkForSolids Set true to do solid phase check and calculations
    */
-  public SystemEos(double T, double P) {
-    this(T, P, false);
-  }
-
   public SystemEos(double T, double P, boolean checkForSolids) {
-    super(T, P);
-    this.solidPhaseCheck = checkForSolids;
+    super(T, P, checkForSolids);
   }
 }
diff --git a/src/main/java/neqsim/thermo/system/SystemFurstElectrolyteEos.java b/src/main/java/neqsim/thermo/system/SystemFurstElectrolyteEos.java
@@ -50,12 +50,6 @@ public SystemFurstElectrolyteEos clone() {
       logger.error("Cloning failed.", ex);
     }
 
-    // clonedSystem.phaseArray = (PhaseInterface[]) phaseArray.clone();
-    // for(int i = 0; i < numberOfPhases; i++) {
-    // clonedSystem.phaseArray[i] = (PhaseModifiedFurstElectrolyteEos)
-    // phaseArray[i].clone();
-    // }
-
     return clonedSystem;
   }
 }
diff --git a/src/main/java/neqsim/thermo/system/SystemFurstElectrolyteEosMod2004.java b/src/main/java/neqsim/thermo/system/SystemFurstElectrolyteEosMod2004.java
@@ -50,12 +50,6 @@ public SystemFurstElectrolyteEosMod2004 clone() {
       logger.error("Cloning failed.", ex);
     }
 
-    // clonedSystem.phaseArray = (PhaseInterface[]) phaseArray.clone();
-    // for(int i = 0; i < numberOfPhases; i++) {
-    // clonedSystem.phaseArray[i] = (PhaseModifiedFurstElectrolyteEos)
-    // phaseArray[i].clone();
-    // }
-
     return clonedSystem;
   }
 }
diff --git a/src/main/java/neqsim/thermo/system/SystemGERG2004Eos.java b/src/main/java/neqsim/thermo/system/SystemGERG2004Eos.java
@@ -44,8 +44,7 @@ public SystemGERG2004Eos(double T, double P) {
    * @param checkForSolids Set true to do solid phase check and calculations
    */
   public SystemGERG2004Eos(double T, double P, boolean checkForSolids) {
-    super(T, P);
-    this.solidPhaseCheck = checkForSolids;;
+    super(T, P, checkForSolids);
     modelName = "GERG2004-EOS";
 
     for (int i = 0; i < numberOfPhases; i++) {
diff --git a/src/main/java/neqsim/thermo/system/SystemGEWilson.java b/src/main/java/neqsim/thermo/system/SystemGEWilson.java
@@ -44,8 +44,7 @@ public SystemGEWilson(double T, double P) {
    * @param checkForSolids Set true to do solid phase check and calculations
    */
   public SystemGEWilson(double T, double P, boolean checkForSolids) {
-    super(T, P);
-    this.solidPhaseCheck = checkForSolids;;
+    super(T, P, checkForSolids);
     attractiveTermNumber = 0;
     modelName = "UNIFAC-GE-model";
 
@@ -77,10 +76,6 @@ public SystemGEWilson clone() {
       logger.error("Cloning failed.", ex);
     }
 
-    // for(int i = 0; i < numberOfPhases; i++) {
-    // clonedSystem.phaseArray[i] = (PhaseInterface) phaseArray[i].clone();
-    // }
-
     return clonedSystem;
   }
 }
diff --git a/src/main/java/neqsim/thermo/system/SystemKentEisenberg.java b/src/main/java/neqsim/thermo/system/SystemKentEisenberg.java
@@ -44,8 +44,7 @@ public SystemKentEisenberg(double T, double P) {
    * @param checkForSolids Set true to do solid phase check and calculations
    */
   public SystemKentEisenberg(double T, double P, boolean checkForSolids) {
-    super(T, P);
-    this.solidPhaseCheck = checkForSolids;;
+    super(T, P, checkForSolids);
     attractiveTermNumber = 0;
     modelName = "Kent Eisenberg-model";
 
@@ -77,10 +76,6 @@ public SystemKentEisenberg clone() {
       logger.error("Cloning failed.", ex);
     }
 
-    // for(int i = 0; i < numberOfPhases; i++) {
-    // clonedSystem.phaseArray[i] = (PhaseInterface) phaseArray[i].clone();
-    // }
-
     return clonedSystem;
   }
 }
diff --git a/src/main/java/neqsim/thermo/system/SystemNRTL.java b/src/main/java/neqsim/thermo/system/SystemNRTL.java
@@ -44,8 +44,7 @@ public SystemNRTL(double T, double P) {
    * @param checkForSolids Set true to do solid phase check and calculations
    */
   public SystemNRTL(double T, double P, boolean checkForSolids) {
-    super(T, P);
-    this.solidPhaseCheck = checkForSolids;;
+    super(T, P, checkForSolids);
     attractiveTermNumber = 0;
     modelName = "NRTL-GE-model";
 
@@ -77,10 +76,6 @@ public SystemNRTL clone() {
       logger.error("Cloning failed.", ex);
     }
 
-    // for(int i = 0; i < numberOfPhases; i++) {
-    // clonedSystem.phaseArray[i] = (PhaseInterface) phaseArray[i].clone();
-    // }
-
     return clonedSystem;
   }
 }
diff --git a/src/main/java/neqsim/thermo/system/SystemPrEos.java b/src/main/java/neqsim/thermo/system/SystemPrEos.java
@@ -38,8 +38,7 @@ public SystemPrEos(double T, double P) {
    * @param checkForSolids Set true to do solid phase check and calculations
    */
   public SystemPrEos(double T, double P, boolean checkForSolids) {
-    super(T, P);
-    this.solidPhaseCheck = checkForSolids;;
+    super(T, P, checkForSolids);
     attractiveTermNumber = 1;
     modelName = "PR-EOS";
     getCharacterization().setTBPModel("PedersenPR");
@@ -76,10 +75,6 @@ public SystemPrEos clone() {
       logger.error("Cloning failed.", ex);
     }
 
-    // clonedSystem.phaseArray = (PhaseInterface[]) phaseArray.clone();
-    // for(int i = 0; i < numberOfPhases; i++) {
-    // clonedSystem.phaseArray[i] = (PhaseInterface) phaseArray[i].clone();
-    // }
     return clonedSystem;
   }
 }
diff --git a/src/main/java/neqsim/thermo/system/SystemPrEos1978.java b/src/main/java/neqsim/thermo/system/SystemPrEos1978.java
@@ -44,8 +44,7 @@ public SystemPrEos1978(double T, double P) {
    * @param checkForSolids Set true to do solid phase check and calculations
    */
   public SystemPrEos1978(double T, double P, boolean checkForSolids) {
-    super(T, P);
-    this.solidPhaseCheck = checkForSolids;;
+    super(T, P, checkForSolids);
     attractiveTermNumber = 13;
     modelName = "PR1978-EOS";
 
@@ -81,11 +80,6 @@ public SystemPrEos1978 clone() {
       logger.error("Cloning failed.", ex);
     }
 
-    // clonedSystem.phaseArray = (PhaseInterface[]) phaseArray.clone();
-    // for(int i = 0; i < numberOfPhases; i++) {
-    // clonedSystem.phaseArray[i] = (PhaseInterface) phaseArray[i].clone();
-    // }
-
     return clonedSystem;
   }
 }
diff --git a/src/main/java/neqsim/thermo/system/SystemRKEos.java b/src/main/java/neqsim/thermo/system/SystemRKEos.java
@@ -43,8 +43,7 @@ public SystemRKEos(double T, double P) {
    * @param checkForSolids Set true to do solid phase check and calculations
    */
   public SystemRKEos(double T, double P, boolean checkForSolids) {
-    super(T, P);
-    this.solidPhaseCheck = checkForSolids;;
+    super(T, P, checkForSolids);
     attractiveTermNumber = 5;
     modelName = "RK-EOS";
 
diff --git a/src/main/java/neqsim/thermo/system/SystemSrkEos.java b/src/main/java/neqsim/thermo/system/SystemSrkEos.java
@@ -38,8 +38,7 @@ public SystemSrkEos(double T, double P) {
    * @param checkForSolids Set true to do solid phase check and calculations
    */
   public SystemSrkEos(double T, double P, boolean checkForSolids) {
-    super(T, P);
-    this.solidPhaseCheck = checkForSolids;;
+    super(T, P, checkForSolids);
     modelName = "SRK-EOS";
     getCharacterization().setTBPModel("PedersenSRK");
     attractiveTermNumber = 0;
@@ -76,10 +75,6 @@ public SystemSrkEos clone() {
       logger.error("Cloning failed.", ex);
     }
 
-    // clonedSystem.phaseArray = (PhaseInterface[]) phaseArray.clone();
-    // for(int i = 0; i < numberOfPhases; i++) {
-    // clonedSystem.phaseArray[i] = (PhaseInterface) phaseArray[i].clone();
-    // }
     return clonedSystem;
   }
 }
diff --git a/src/main/java/neqsim/thermo/system/SystemTSTEos.java b/src/main/java/neqsim/thermo/system/SystemTSTEos.java
@@ -46,8 +46,7 @@ public SystemTSTEos(double T, double P) {
    * @param checkForSolids Set true to do solid phase check and calculations
    */
   public SystemTSTEos(double T, double P, boolean checkForSolids) {
-    super(T, P);
-    this.solidPhaseCheck = checkForSolids;;
+    super(T, P, checkForSolids);
     attractiveTermNumber = 14;
     modelName = "TST-EOS";
 
@@ -83,11 +82,6 @@ public SystemTSTEos clone() {
       logger.error("Cloning failed.", ex);
     }
 
-    // clonedSystem.phaseArray = (PhaseInterface[]) phaseArray.clone();
-    // for(int i = 0; i < numberOfPhases; i++) {
-    // clonedSystem.phaseArray[i] = (PhaseInterface) phaseArray[i].clone();
-    // }
-
     return clonedSystem;
   }
 }
diff --git a/src/main/java/neqsim/thermo/system/SystemThermo.java b/src/main/java/neqsim/thermo/system/SystemThermo.java
@@ -150,8 +150,9 @@ public SystemThermo() {
    *
    * @param T The temperature in unit Kelvin
    * @param P The pressure in unit bara (absolute pressure)
+   * @param checkForSolids Set true to do solid phase check and calculations
    */
-  public SystemThermo(double T, double P) {
+  public SystemThermo(double T, double P, boolean checkForSolids) {
     this();
     if (T < 0.0) {
       neqsim.util.exception.InvalidInputException ex =
@@ -166,6 +167,8 @@ public SystemThermo(double T, double P) {
               "SystemThermo", "P", "is negative");
       throw new RuntimeException(ex);
     }
+
+    this.solidPhaseCheck = checkForSolids;
   }
 
   /** {@inheritDoc} */
@@ -547,6 +550,7 @@ public SystemThermo clone() {
     for (int i = 0; i < getMaxNumberOfPhases(); i++) {
       clonedSystem.phaseArray[i] = phaseArray[i].clone();
     }
+
     return clonedSystem;
   }
 
diff --git a/src/main/java/neqsim/thermo/system/SystemUNIFAC.java b/src/main/java/neqsim/thermo/system/SystemUNIFAC.java
@@ -45,8 +45,7 @@ public SystemUNIFAC(double T, double P) {
    * @param checkForSolids Set true to do solid phase check and calculations
    */
   public SystemUNIFAC(double T, double P, boolean checkForSolids) {
-    super(T, P);
-    this.solidPhaseCheck = checkForSolids;;
+    super(T, P, checkForSolids);
     attractiveTermNumber = 0;
     modelName = "UNIFAC-GE-model";
     solidPhaseCheck = checkForSolids;
@@ -79,10 +78,6 @@ public SystemUNIFAC clone() {
       logger.error("Cloning failed.", ex);
     }
 
-    // for(int i = 0; i < numberOfPhases; i++) {
-    // clonedSystem.phaseArray[i] = (PhaseInterface) phaseArray[i].clone();
-    // }
-
     return clonedSystem;
   }
 }
diff --git a/src/main/java/neqsim/thermo/system/SystemUNIFACpsrk.java b/src/main/java/neqsim/thermo/system/SystemUNIFACpsrk.java
@@ -44,8 +44,7 @@ public SystemUNIFACpsrk(double T, double P) {
    * @param checkForSolids Set true to do solid phase check and calculations
    */
   public SystemUNIFACpsrk(double T, double P, boolean checkForSolids) {
-    super(T, P);
-    this.solidPhaseCheck = checkForSolids;;
+    super(T, P, checkForSolids);
     attractiveTermNumber = 0;
     modelName = "UNIFAC-GE-model";
     solidPhaseCheck = checkForSolids;
@@ -78,10 +77,6 @@ public SystemUNIFACpsrk clone() {
       logger.error("Cloning failed.", ex);
     }
 
-    // for(int i = 0; i < numberOfPhases; i++) {
-    // clonedSystem.phaseArray[i] = (PhaseInterface) phaseArray[i].clone();
-    // }
-
     return clonedSystem;
   }
 }
diff --git a/src/main/java/neqsim/thermodynamicOperations/ThermodynamicOperations.java b/src/main/java/neqsim/thermodynamicOperations/ThermodynamicOperations.java
@@ -169,7 +169,7 @@ public void TPflash() {
    * TPflash.
    * </p>
    *
-   * @param checkForSolids Set true to check for solid phase and do solid phase calculations.
+   * @param checkForSolids Set true to do solid phase check and calculations
    */
   public void TPflash(boolean checkForSolids) {
     operation = new neqsim.thermodynamicOperations.flashOps.TPflash(system, checkForSolids);
diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/Flash.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/Flash.java
@@ -47,7 +47,7 @@ public abstract class Flash extends BaseOperation {
   double[] tm;
   int lowestGibbsEnergyPhase = 0;
   sysNewtonRhapsonTPflash secondOrderSolver;
-  /** Set true to check for solid phase and do solid phase calculations. */
+  /** Set true to do solid phase check and calculations */
   protected boolean solidCheck = false;
   protected boolean stabilityCheck = false;
   protected boolean findLowestGibbsPhaseIsChecked = false;
diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/SolidFlash.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/SolidFlash.java
@@ -56,7 +56,7 @@ public void setSolidComponent(int i) {
    * </p>
    *
    * @param system a {@link neqsim.thermo.system.SystemInterface} object
-   * @param checkForSolids Set true to check for solid phase and do solid phase calculations.
+   * @param checkForSolids Set true to do solid phase check and calculations
    */
   public SolidFlash(SystemInterface system, boolean checkForSolids) {
     super(system, checkForSolids);
diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/TPflash.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/TPflash.java
@@ -55,7 +55,7 @@ public TPflash(SystemInterface system) {
    * </p>
    *
    * @param system a {@link neqsim.thermo.system.SystemInterface} object
-   * @param checkForSolids Set true to check for solid phase and do solid phase calculations.
+   * @param checkForSolids Set true to do solid phase check and calculations
    */
   public TPflash(SystemInterface system, boolean checkForSolids) {
     this(system);
diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/TPmultiflash.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/TPmultiflash.java
diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/TPmultiflashWAX.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/TPmultiflashWAX.java
diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/TPmultiflash_1.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/TPmultiflash_1.java

Original file line number	Diff line number	Diff line change
`@@ -1835,7 +1835,7 @@ public default double getLogFugacityCoefficient() {`
`1835`	`1835`	`* Setter for field <code>solidCheck</code>.`
`1836`	`1836`	`* </p>`
`1837`	`1837`	`*`
`1838`		`- * @param checkForSolids Set true to check for solid phase and do solid phase calculations.`
	`1838`	`+ * @param checkForSolids Set true to do solid phase check and calculations`
`1839`	`1839`	`*/`
`1840`	`1840`	`public void setSolidCheck(boolean checkForSolids);`
`1841`	`1841`
Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,7 @@ public SystemBWRSEos(double T, double P) {`
`46`	`46`	`* @param checkForSolids Set true to do solid phase check and calculations`
`47`	`47`	`*/`
`48`	`48`	`public SystemBWRSEos(double T, double P, boolean checkForSolids) {`
`49`		`- super(T, P);`
`50`		`- this.solidPhaseCheck = checkForSolids;;`
	`49`	`+ super(T, P, checkForSolids);`
`51`	`50`	`modelName = "BWRS-EOS";`
`52`	`51`	`attractiveTermNumber = 0;`
`53`	`52`
`@@ -83,11 +82,6 @@ public SystemBWRSEos clone() {`
`83`	`82`	`logger.error("Cloning failed.", ex);`
`84`	`83`	`}`
`85`	`84`
`86`		`- // clonedSystem.phaseArray = (PhaseInterface[]) phaseArray.clone();`
`87`		`- // for(int i = 0; i < numberOfPhases; i++) {`
`88`		`- // clonedSystem.phaseArray[i] = (PhaseInterface) phaseArray[i].clone();`
`89`		`- // }`
`90`		`-`
`91`	`85`	`return clonedSystem;`
`92`	`86`	`}`
`93`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,10 +52,6 @@ public SystemElectrolyteCPA clone() {`
`52`	`52`	`logger.error("Cloning failed.", ex);`
`53`	`53`	`}`
`54`	`54`
`55`		`- // for(int i = 0; i < numberOfPhases; i++) {`
`56`		`- // clonedSystem.phaseArray[i] =(PhaseElectrolyteCPA) phaseArray[i].clone();`
`57`		`- // }`
`58`		`-`
`59`	`55`	`return clonedSystem;`
`60`	`56`	`}`
`61`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package neqsim.thermo.system;`
`2`	`2`
`3`	`3`	`/**`
	`4`	`+ * Base class for system with EOS.`
`4`	`5`	`*`
`5`	`6`	`* @author Even Solbraa`
`6`	`7`	`*/`
`@@ -23,13 +24,9 @@ public SystemEos() {`
`23`	`24`	`*`
`24`	`25`	`* @param T The temperature in unit Kelvin`
`25`	`26`	`* @param P The pressure in unit bara (absolute pressure)`
	`27`	`+ * @param checkForSolids Set true to do solid phase check and calculations`
`26`	`28`	`*/`
`27`		`- public SystemEos(double T, double P) {`
`28`		`- this(T, P, false);`
`29`		`- }`
`30`		`-`
`31`	`29`	`public SystemEos(double T, double P, boolean checkForSolids) {`
`32`		`- super(T, P);`
`33`		`- this.solidPhaseCheck = checkForSolids;`
	`30`	`+ super(T, P, checkForSolids);`
`34`	`31`	`}`
`35`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,12 +50,6 @@ public SystemFurstElectrolyteEos clone() {`
`50`	`50`	`logger.error("Cloning failed.", ex);`
`51`	`51`	`}`
`52`	`52`
`53`		`- // clonedSystem.phaseArray = (PhaseInterface[]) phaseArray.clone();`
`54`		`- // for(int i = 0; i < numberOfPhases; i++) {`
`55`		`- // clonedSystem.phaseArray[i] = (PhaseModifiedFurstElectrolyteEos)`
`56`		`- // phaseArray[i].clone();`
`57`		`- // }`
`58`		`-`
`59`	`53`	`return clonedSystem;`
`60`	`54`	`}`
`61`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,7 @@ public SystemGEWilson(double T, double P) {`
`44`	`44`	`* @param checkForSolids Set true to do solid phase check and calculations`
`45`	`45`	`*/`
`46`	`46`	`public SystemGEWilson(double T, double P, boolean checkForSolids) {`
`47`		`- super(T, P);`
`48`		`- this.solidPhaseCheck = checkForSolids;;`
	`47`	`+ super(T, P, checkForSolids);`
`49`	`48`	`attractiveTermNumber = 0;`
`50`	`49`	`modelName = "UNIFAC-GE-model";`
`51`	`50`
`@@ -77,10 +76,6 @@ public SystemGEWilson clone() {`
`77`	`76`	`logger.error("Cloning failed.", ex);`
`78`	`77`	`}`
`79`	`78`
`80`		`- // for(int i = 0; i < numberOfPhases; i++) {`
`81`		`- // clonedSystem.phaseArray[i] = (PhaseInterface) phaseArray[i].clone();`
`82`		`- // }`
`83`		`-`
`84`	`79`	`return clonedSystem;`
`85`	`80`	`}`
`86`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,7 @@ public SystemKentEisenberg(double T, double P) {`
`44`	`44`	`* @param checkForSolids Set true to do solid phase check and calculations`
`45`	`45`	`*/`
`46`	`46`	`public SystemKentEisenberg(double T, double P, boolean checkForSolids) {`
`47`		`- super(T, P);`
`48`		`- this.solidPhaseCheck = checkForSolids;;`
	`47`	`+ super(T, P, checkForSolids);`
`49`	`48`	`attractiveTermNumber = 0;`
`50`	`49`	`modelName = "Kent Eisenberg-model";`
`51`	`50`
`@@ -77,10 +76,6 @@ public SystemKentEisenberg clone() {`
`77`	`76`	`logger.error("Cloning failed.", ex);`
`78`	`77`	`}`
`79`	`78`
`80`		`- // for(int i = 0; i < numberOfPhases; i++) {`
`81`		`- // clonedSystem.phaseArray[i] = (PhaseInterface) phaseArray[i].clone();`
`82`		`- // }`
`83`		`-`
`84`	`79`	`return clonedSystem;`
`85`	`80`	`}`
`86`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,7 @@ public SystemNRTL(double T, double P) {`
`44`	`44`	`* @param checkForSolids Set true to do solid phase check and calculations`
`45`	`45`	`*/`
`46`	`46`	`public SystemNRTL(double T, double P, boolean checkForSolids) {`
`47`		`- super(T, P);`
`48`		`- this.solidPhaseCheck = checkForSolids;;`
	`47`	`+ super(T, P, checkForSolids);`
`49`	`48`	`attractiveTermNumber = 0;`
`50`	`49`	`modelName = "NRTL-GE-model";`
`51`	`50`
`@@ -77,10 +76,6 @@ public SystemNRTL clone() {`
`77`	`76`	`logger.error("Cloning failed.", ex);`
`78`	`77`	`}`
`79`	`78`
`80`		`- // for(int i = 0; i < numberOfPhases; i++) {`
`81`		`- // clonedSystem.phaseArray[i] = (PhaseInterface) phaseArray[i].clone();`
`82`		`- // }`
`83`		`-`
`84`	`79`	`return clonedSystem;`
`85`	`80`	`}`
`86`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,7 @@ public SystemPrEos(double T, double P) {`
`38`	`38`	`* @param checkForSolids Set true to do solid phase check and calculations`
`39`	`39`	`*/`
`40`	`40`	`public SystemPrEos(double T, double P, boolean checkForSolids) {`
`41`		`- super(T, P);`
`42`		`- this.solidPhaseCheck = checkForSolids;;`
	`41`	`+ super(T, P, checkForSolids);`
`43`	`42`	`attractiveTermNumber = 1;`
`44`	`43`	`modelName = "PR-EOS";`
`45`	`44`	`getCharacterization().setTBPModel("PedersenPR");`
`@@ -76,10 +75,6 @@ public SystemPrEos clone() {`
`76`	`75`	`logger.error("Cloning failed.", ex);`
`77`	`76`	`}`
`78`	`77`
`79`		`- // clonedSystem.phaseArray = (PhaseInterface[]) phaseArray.clone();`
`80`		`- // for(int i = 0; i < numberOfPhases; i++) {`
`81`		`- // clonedSystem.phaseArray[i] = (PhaseInterface) phaseArray[i].clone();`
`82`		`- // }`
`83`	`78`	`return clonedSystem;`
`84`	`79`	`}`
`85`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,7 @@ public SystemPrEos1978(double T, double P) {`
`44`	`44`	`* @param checkForSolids Set true to do solid phase check and calculations`
`45`	`45`	`*/`
`46`	`46`	`public SystemPrEos1978(double T, double P, boolean checkForSolids) {`
`47`		`- super(T, P);`
`48`		`- this.solidPhaseCheck = checkForSolids;;`
	`47`	`+ super(T, P, checkForSolids);`
`49`	`48`	`attractiveTermNumber = 13;`
`50`	`49`	`modelName = "PR1978-EOS";`
`51`	`50`
`@@ -81,11 +80,6 @@ public SystemPrEos1978 clone() {`
`81`	`80`	`logger.error("Cloning failed.", ex);`
`82`	`81`	`}`
`83`	`82`
`84`		`- // clonedSystem.phaseArray = (PhaseInterface[]) phaseArray.clone();`
`85`		`- // for(int i = 0; i < numberOfPhases; i++) {`
`86`		`- // clonedSystem.phaseArray[i] = (PhaseInterface) phaseArray[i].clone();`
`87`		`- // }`
`88`		`-`
`89`	`83`	`return clonedSystem;`
`90`	`84`	`}`
`91`	`85`	`}`