fix: sometimes physical properties is not initialized

equinor · Oct 27, 2024 · 844658c · 844658c
1 parent 5b1103a
commit 844658c
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 17 deletions.
diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/PhysicalPropertyMethod.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/PhysicalPropertyMethod.java
@@ -8,7 +8,6 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties;
 
 /**
  * <p>
@@ -26,12 +25,8 @@ public abstract class PhysicalPropertyMethod implements PhysicalPropertyMethodIn
    * <p>
    * Constructor for PhysicalPropertyMethod.
    * </p>
-   *
-   * @param phase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} object
    */
-  public PhysicalPropertyMethod(PhysicalProperties phase) {
-    setPhase(phase);
-  }
+  public PhysicalPropertyMethod() {}
 
   /** {@inheritDoc} */
   @Override

diff --git a/...s/physicalpropertymethods/commonphasephysicalproperties/CommonPhysicalPropertyMethod.java b/...s/physicalpropertymethods/commonphasephysicalproperties/CommonPhysicalPropertyMethod.java
@@ -14,7 +14,7 @@
 public abstract class CommonPhysicalPropertyMethod extends PhysicalPropertyMethod {
   private static final long serialVersionUID = 1000;
 
-  protected PhysicalProperties phase;
+  protected neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties phase;
 
   /**
    * <p>
@@ -25,7 +25,7 @@ public abstract class CommonPhysicalPropertyMethod extends PhysicalPropertyMetho
    *        object
    */
   public CommonPhysicalPropertyMethod(PhysicalProperties phase) {
-    super(phase);
+    this.phase = phase;
   }
 
   /** {@inheritDoc} */

diff --git a/...alproperties/physicalpropertymethods/gasphysicalproperties/GasPhysicalPropertyMethod.java b/...alproperties/physicalpropertymethods/gasphysicalproperties/GasPhysicalPropertyMethod.java
@@ -28,7 +28,7 @@ public abstract class GasPhysicalPropertyMethod extends PhysicalPropertyMethod {
    *        object
    */
   public GasPhysicalPropertyMethod(PhysicalProperties gasPhase) {
-    super(gasPhase);
+    setPhase(gasPhase);
     binaryMolecularDiameter = new double[gasPhase.getPhase().getNumberOfComponents()][gasPhase
         .getPhase().getNumberOfComponents()];
     binaryMolecularMass = new double[gasPhase.getPhase().getNumberOfComponents()][gasPhase

diff --git a/...erties/physicalpropertymethods/liquidphysicalproperties/LiquidPhysicalPropertyMethod.java b/...erties/physicalpropertymethods/liquidphysicalproperties/LiquidPhysicalPropertyMethod.java
@@ -14,7 +14,7 @@
 public abstract class LiquidPhysicalPropertyMethod extends PhysicalPropertyMethod {
   private static final long serialVersionUID = 1000;
 
-  protected PhysicalProperties liquidPhase;
+  protected neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties liquidPhase;
 
   /**
    * <p>
@@ -25,7 +25,7 @@ public abstract class LiquidPhysicalPropertyMethod extends PhysicalPropertyMetho
    *        {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} object
    */
   public LiquidPhysicalPropertyMethod(PhysicalProperties liquidPhase) {
-    super(liquidPhase);
+    setPhase(liquidPhase);
   }
 
   /** {@inheritDoc} */

diff --git a/...operties/physicalpropertymethods/solidphysicalproperties/SolidPhysicalPropertyMethod.java b/...operties/physicalpropertymethods/solidphysicalproperties/SolidPhysicalPropertyMethod.java
@@ -14,7 +14,7 @@
 public abstract class SolidPhysicalPropertyMethod extends PhysicalPropertyMethod {
   private static final long serialVersionUID = 1000;
 
-  protected PhysicalProperties solidPhase;
+  protected neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties solidPhase;
 
   /**
    * <p>
@@ -25,12 +25,12 @@ public abstract class SolidPhysicalPropertyMethod extends PhysicalPropertyMethod
    *        object
    */
   public SolidPhysicalPropertyMethod(PhysicalProperties solidPhase) {
-    super(solidPhase);
+    setPhase(solidPhase);
   }
 
   /** {@inheritDoc} */
   @Override
-  public void setPhase(PhysicalProperties solidPhase) {
-    this.solidPhase = solidPhase;
+  public void setPhase(PhysicalProperties phase) {
+    this.solidPhase = phase;
   }
 }
diff --git a/src/main/java/neqsim/thermo/phase/Phase.java b/src/main/java/neqsim/thermo/phase/Phase.java
@@ -11,7 +11,6 @@
 import org.apache.logging.log4j.Logger;
 import neqsim.physicalproperties.PhysicalPropertyHandler;
 import neqsim.physicalproperties.PhysicalPropertyType;
-import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties;
 import neqsim.thermo.ThermodynamicConstantsInterface;
 import neqsim.thermo.ThermodynamicModelSettings;
 import neqsim.thermo.component.ComponentInterface;
@@ -426,7 +425,7 @@ public void setTemperature(double temp) {
 
   /** {@inheritDoc} */
   @Override
-  public PhysicalProperties getPhysicalProperties() {
+  public neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties getPhysicalProperties() {
     if (physicalPropertyHandler == null) {
       initPhysicalProperties();
       return physicalPropertyHandler.getPhysicalProperty(this);