refact: remove physicalpropertiesinterface

equinor · Oct 27, 2024 · 14ce5ec · 14ce5ec
1 parent 8d1929d
commit 14ce5ec
Show file tree

Hide file tree

Showing 40 changed files with 375 additions and 558 deletions.
diff --git a/src/main/java/neqsim/physicalproperties/PhysicalPropertyHandler.java b/src/main/java/neqsim/physicalproperties/PhysicalPropertyHandler.java
@@ -2,7 +2,7 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface;
+import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties;
 import neqsim.physicalproperties.physicalpropertysystem.commonphasephysicalproperties.DefaultPhysicalProperties;
 import neqsim.physicalproperties.physicalpropertysystem.gasphysicalproperties.GasPhysicalProperties;
 import neqsim.physicalproperties.physicalpropertysystem.liquidphysicalproperties.AminePhysicalProperties;
@@ -25,10 +25,10 @@ public class PhysicalPropertyHandler implements Cloneable, java.io.Serializable
   private static final long serialVersionUID = 1000;
   static Logger logger = LogManager.getLogger(PhysicalPropertyHandler.class);
 
-  private PhysicalPropertiesInterface gasPhysicalProperties = null;
-  private PhysicalPropertiesInterface oilPhysicalProperties = null;
-  private PhysicalPropertiesInterface aqueousPhysicalProperties = null;
-  private PhysicalPropertiesInterface solidPhysicalProperties = null;
+  private PhysicalProperties gasPhysicalProperties = null;
+  private PhysicalProperties oilPhysicalProperties = null;
+  private PhysicalProperties aqueousPhysicalProperties = null;
+  private PhysicalProperties solidPhysicalProperties = null;
   private neqsim.physicalproperties.mixingrule.PhysicalPropertyMixingRule mixingRule = null;
 
   /**
@@ -98,10 +98,9 @@ public void setPhysicalProperties(PhaseInterface phase, int type) {
    * </p>
    *
    * @param phase a {@link neqsim.thermo.phase.PhaseInterface} object
-   * @return a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface}
-   *         object
+   * @return a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} object
    */
-  public PhysicalPropertiesInterface getPhysicalProperty(PhaseInterface phase) {
+  public PhysicalProperties getPhysicalProperty(PhaseInterface phase) {
     switch (phase.getType()) {
       case GAS:
         return gasPhysicalProperties;

diff --git a/...va/neqsim/physicalproperties/physicalpropertymethods/PhysicalPropertyMethodInterface.java b/...va/neqsim/physicalproperties/physicalpropertymethods/PhysicalPropertyMethodInterface.java
@@ -6,6 +6,8 @@
 
 package neqsim.physicalproperties.physicalpropertymethods;
 
+import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties;
+
 /**
  * <p>
  * PhysicalPropertyMethodInterface interface.
@@ -31,12 +33,9 @@ public interface PhysicalPropertyMethodInterface extends Cloneable, java.io.Seri
    * setPhase.
    * </p>
    *
-   * @param phase a
-   *        {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface}
-   *        object
+   * @param phase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} object
    */
-  public void setPhase(
-      neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface phase);
+  public void setPhase(PhysicalProperties phase);
 
   /**
    * <p>

diff --git a/...s/physicalpropertymethods/commonphasephysicalproperties/CommonPhysicalPropertyMethod.java b/...s/physicalpropertymethods/commonphasephysicalproperties/CommonPhysicalPropertyMethod.java
@@ -1,7 +1,7 @@
 package neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties;
 
 import neqsim.physicalproperties.physicalpropertymethods.PhysicalPropertyMethod;
-import neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface;
+import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties;
 
 /**
  * <p>
@@ -14,24 +14,23 @@
 public abstract class CommonPhysicalPropertyMethod extends PhysicalPropertyMethod {
   private static final long serialVersionUID = 1000;
 
-  protected neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface phase;
+  protected PhysicalProperties phase;
 
   /**
    * <p>
    * Constructor for CommonPhysicalPropertyMethod.
    * </p>
    *
-   * @param phase a
-   *        {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface}
+   * @param phase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties}
    *        object
    */
-  public CommonPhysicalPropertyMethod(PhysicalPropertiesInterface phase) {
+  public CommonPhysicalPropertyMethod(PhysicalProperties phase) {
     this.phase = phase;
   }
 
   /** {@inheritDoc} */
   @Override
-  public void setPhase(PhysicalPropertiesInterface phase) {
+  public void setPhase(PhysicalProperties phase) {
     this.phase = phase;
   }
 }
diff --git a/...ties/physicalpropertymethods/commonphasephysicalproperties/conductivity/Conductivity.java b/...ties/physicalpropertymethods/commonphasephysicalproperties/conductivity/Conductivity.java
@@ -4,6 +4,7 @@
 import org.apache.logging.log4j.Logger;
 import neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.CommonPhysicalPropertyMethod;
 import neqsim.physicalproperties.physicalpropertymethods.methodinterface.ConductivityInterface;
+import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties;
 
 /**
  * Abstract class for Conductivity.
@@ -22,12 +23,10 @@ public abstract class Conductivity extends CommonPhysicalPropertyMethod
    * Constructor for Conductivity.
    * </p>
    *
-   * @param phase a
-   *        {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface}
+   * @param phase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties}
    *        object
    */
-  public Conductivity(
-      neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface phase) {
+  public Conductivity(PhysicalProperties phase) {
     super(phase);
   }
 

diff --git a/...opertymethods/commonphasephysicalproperties/conductivity/PFCTConductivityMethodMod86.java b/...opertymethods/commonphasephysicalproperties/conductivity/PFCTConductivityMethodMod86.java
@@ -1,5 +1,6 @@
 package neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.conductivity;
 
+import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties;
 import neqsim.thermo.ThermodynamicConstantsInterface;
 import neqsim.thermo.system.SystemInterface;
 import neqsim.thermo.system.SystemSrkEos;
@@ -39,12 +40,9 @@ public class PFCTConductivityMethodMod86 extends Conductivity {
    * Constructor for PFCTConductivityMethodMod86.
    * </p>
    *
-   * @param phase a
-   *        {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface}
-   *        object
+   * @param phase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} object
    */
-  public PFCTConductivityMethodMod86(
-      neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface phase) {
+  public PFCTConductivityMethodMod86(PhysicalProperties phase) {
     super(phase);
     if (referenceSystem.getNumberOfMoles() < 1e-10) {
       referenceSystem.addComponent("methane", 10.0);

diff --git a/...ertymethods/commonphasephysicalproperties/diffusivity/CorrespondingStatesDiffusivity.java b/...ertymethods/commonphasephysicalproperties/diffusivity/CorrespondingStatesDiffusivity.java
@@ -1,5 +1,6 @@
 package neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.diffusivity;
 
+import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties;
 import neqsim.thermo.phase.PhaseType;
 
 /**
@@ -21,12 +22,9 @@ public class CorrespondingStatesDiffusivity extends Diffusivity {
    * Constructor for CorrespondingStatesDiffusivity.
    * </p>
    *
-   * @param phase a
-   *        {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface}
-   *        object
+   * @param phase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} object
    */
-  public CorrespondingStatesDiffusivity(
-      neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface phase) {
+  public CorrespondingStatesDiffusivity(PhysicalProperties phase) {
     super(phase);
     binaryDiffusionCoefficients = new double[phase.getPhase().getNumberOfComponents()][phase
         .getPhase().getNumberOfComponents()];

diff --git a/...erties/physicalpropertymethods/commonphasephysicalproperties/diffusivity/Diffusivity.java b/...erties/physicalpropertymethods/commonphasephysicalproperties/diffusivity/Diffusivity.java
@@ -4,6 +4,7 @@
 import org.apache.logging.log4j.Logger;
 import neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.CommonPhysicalPropertyMethod;
 import neqsim.physicalproperties.physicalpropertymethods.methodinterface.DiffusivityInterface;
+import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties;
 
 /**
  * <p>
@@ -26,12 +27,10 @@ public class Diffusivity extends CommonPhysicalPropertyMethod implements Diffusi
    * Constructor for Diffusivity.
    * </p>
    *
-   * @param phase a
-   *        {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface}
+   * @param phase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties}
    *        object
    */
-  public Diffusivity(
-      neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface phase) {
+  public Diffusivity(PhysicalProperties phase) {
     super(phase);
     binaryDiffusionCoefficients = new double[phase.getPhase().getNumberOfComponents()][phase
         .getPhase().getNumberOfComponents()];

diff --git a/...ropertymethods/commonphasephysicalproperties/viscosity/FrictionTheoryViscosityMethod.java b/...ropertymethods/commonphasephysicalproperties/viscosity/FrictionTheoryViscosityMethod.java
@@ -2,6 +2,7 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties;
 
 /**
  * <p>
@@ -54,12 +55,9 @@ public class FrictionTheoryViscosityMethod extends Viscosity
    * Constructor for FrictionTheoryViscosityMethod.
    * </p>
    *
-   * @param phase a
-   *        {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface}
-   *        object
+   * @param phase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} object
    */
-  public FrictionTheoryViscosityMethod(
-      neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface phase) {
+  public FrictionTheoryViscosityMethod(PhysicalProperties phase) {
     super(phase);
     pureComponentViscosity = new double[phase.getPhase().getNumberOfComponents()];
     Fc = new double[phase.getPhase().getNumberOfComponents()];

diff --git a/...s/physicalpropertymethods/commonphasephysicalproperties/viscosity/LBCViscosityMethod.java b/...s/physicalpropertymethods/commonphasephysicalproperties/viscosity/LBCViscosityMethod.java
@@ -2,6 +2,7 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties;
 
 /**
  * <p>
@@ -22,12 +23,9 @@ public class LBCViscosityMethod extends Viscosity {
    * Constructor for LBCViscosityMethod.
    * </p>
    *
-   * @param phase a
-   *        {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface}
-   *        object
+   * @param phase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} object
    */
-  public LBCViscosityMethod(
-      neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface phase) {
+  public LBCViscosityMethod(PhysicalProperties phase) {
     super(phase);
   }
 

diff --git a/.../physicalpropertymethods/commonphasephysicalproperties/viscosity/PFCTViscosityMethod.java b/.../physicalpropertymethods/commonphasephysicalproperties/viscosity/PFCTViscosityMethod.java
@@ -6,6 +6,7 @@
 
 package neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.viscosity;
 
+import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties;
 import neqsim.thermo.ThermodynamicConstantsInterface;
 import neqsim.thermo.system.SystemInterface;
 import neqsim.thermo.system.SystemSrkEos;
@@ -45,12 +46,9 @@ public class PFCTViscosityMethod extends Viscosity {
    * Constructor for PFCTViscosityMethod.
    * </p>
    *
-   * @param phase a
-   *        {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface}
-   *        object
+   * @param phase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} object
    */
-  public PFCTViscosityMethod(
-      neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface phase) {
+  public PFCTViscosityMethod(PhysicalProperties phase) {
     super(phase);
     referenceSystem.addComponent("methane", 10.0);
     referenceSystem.init(0);

diff --git a/...lpropertymethods/commonphasephysicalproperties/viscosity/PFCTViscosityMethodHeavyOil.java b/...lpropertymethods/commonphasephysicalproperties/viscosity/PFCTViscosityMethodHeavyOil.java
@@ -1,5 +1,6 @@
 package neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.viscosity;
 
+import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties;
 import neqsim.thermo.ThermodynamicConstantsInterface;
 import neqsim.thermo.system.SystemInterface;
 import neqsim.thermo.system.SystemSrkEos;
@@ -45,12 +46,9 @@ public class PFCTViscosityMethodHeavyOil extends Viscosity {
    * Constructor for PFCTViscosityMethodHeavyOil.
    * </p>
    *
-   * @param phase a
-   *        {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface}
-   *        object
+   * @param phase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} object
    */
-  public PFCTViscosityMethodHeavyOil(
-      neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface phase) {
+  public PFCTViscosityMethodHeavyOil(PhysicalProperties phase) {
     super(phase);
     if (referenceSystem.getNumberOfMoles() < 1e-10) {
       referenceSystem.addComponent("methane", 10.0);

diff --git a/...icalpropertymethods/commonphasephysicalproperties/viscosity/PFCTViscosityMethodMod86.java b/...icalpropertymethods/commonphasephysicalproperties/viscosity/PFCTViscosityMethodMod86.java
@@ -1,5 +1,6 @@
 package neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.viscosity;
 
+import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties;
 import neqsim.thermo.ThermodynamicConstantsInterface;
 import neqsim.thermo.system.SystemInterface;
 import neqsim.thermo.system.SystemSrkEos;
@@ -40,12 +41,9 @@ public class PFCTViscosityMethodMod86 extends Viscosity {
    * Constructor for PFCTViscosityMethodMod86.
    * </p>
    *
-   * @param phase a
-   *        {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface}
-   *        object
+   * @param phase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} object
    */
-  public PFCTViscosityMethodMod86(
-      neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface phase) {
+  public PFCTViscosityMethodMod86(PhysicalProperties phase) {
     super(phase);
     if (referenceSystem.getNumberOfMoles() < 1e-10) {
       referenceSystem.addComponent("methane", 10.0);

diff --git a/...properties/physicalpropertymethods/commonphasephysicalproperties/viscosity/Viscosity.java b/...properties/physicalpropertymethods/commonphasephysicalproperties/viscosity/Viscosity.java
@@ -4,6 +4,7 @@
 import org.apache.logging.log4j.Logger;
 import neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.CommonPhysicalPropertyMethod;
 import neqsim.physicalproperties.physicalpropertymethods.methodinterface.ViscosityInterface;
+import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties;
 
 /**
  * Abstract class for Viscosity property.
@@ -21,12 +22,10 @@ public abstract class Viscosity extends CommonPhysicalPropertyMethod implements
    * Constructor for Viscosity.
    * </p>
    *
-   * @param phase a
-   *        {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface}
+   * @param phase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties}
    *        object
    */
-  public Viscosity(
-      neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface phase) {
+  public Viscosity(PhysicalProperties phase) {
     super(phase);
     pureComponentViscosity = new double[phase.getPhase().getNumberOfComponents()];
   }

diff --git a/...alproperties/physicalpropertymethods/gasphysicalproperties/GasPhysicalPropertyMethod.java b/...alproperties/physicalpropertymethods/gasphysicalproperties/GasPhysicalPropertyMethod.java
@@ -1,7 +1,7 @@
 package neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties;
 
 import neqsim.physicalproperties.physicalpropertymethods.PhysicalPropertyMethod;
-import neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface;
+import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties;
 
 /**
  * <p>
@@ -14,7 +14,7 @@
 public abstract class GasPhysicalPropertyMethod extends PhysicalPropertyMethod {
   private static final long serialVersionUID = 1000;
 
-  protected neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface gasPhase;
+  protected PhysicalProperties gasPhase;
   public double[][] binaryMolecularDiameter;
   public double[][] binaryEnergyParameter;
   public double[][] binaryMolecularMass;
@@ -24,11 +24,10 @@ public abstract class GasPhysicalPropertyMethod extends PhysicalPropertyMethod {
    * Constructor for GasPhysicalPropertyMethod.
    * </p>
    *
-   * @param gasPhase a
-   *        {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface}
+   * @param gasPhase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties}
    *        object
    */
-  public GasPhysicalPropertyMethod(PhysicalPropertiesInterface gasPhase) {
+  public GasPhysicalPropertyMethod(PhysicalProperties gasPhase) {
     this.gasPhase = gasPhase;
     binaryMolecularDiameter = new double[gasPhase.getPhase().getNumberOfComponents()][gasPhase
         .getPhase().getNumberOfComponents()];
@@ -57,8 +56,7 @@ public GasPhysicalPropertyMethod(PhysicalPropertiesInterface gasPhase) {
 
   /** {@inheritDoc} */
   @Override
-  public void setPhase(
-      neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface phase) {
+  public void setPhase(PhysicalProperties phase) {
     this.gasPhase = phase;
   }
 }
diff --git a/...s/physicalpropertymethods/gasphysicalproperties/conductivity/ChungConductivityMethod.java b/...s/physicalpropertymethods/gasphysicalproperties/conductivity/ChungConductivityMethod.java
@@ -1,5 +1,7 @@
 package neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.conductivity;
 
+import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties;
+
 /**
  * <p>
  * ChungConductivityMethod class extending conductivity for gases.
@@ -18,12 +20,9 @@ public class ChungConductivityMethod extends Conductivity {
    * Constructor for ChungConductivityMethod.
    * </p>
    *
-   * @param gasPhase a
-   *        {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface}
-   *        object
+   * @param gasPhase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} object
    */
-  public ChungConductivityMethod(
-      neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface gasPhase) {
+  public ChungConductivityMethod(PhysicalProperties gasPhase) {
     super(gasPhase);
     pureComponentConductivity = new double[gasPhase.getPhase().getNumberOfComponents()];
   }