revert

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

src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/CommonPhysicalPropertyMethod.java

@@ -14,18 +14,19 @@
 public abstract class CommonPhysicalPropertyMethod extends PhysicalPropertyMethod {
   private static final long serialVersionUID = 1000;
 
-  protected PhysicalProperties phase;
+  protected neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties phase;
 
   /**
    * <p>
    * Constructor for CommonPhysicalPropertyMethod.
    * </p>
    *
-   * @param phase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties}
+   * @param phase a
+   *        {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface}
    *        object
    */
   public CommonPhysicalPropertyMethod(PhysicalProperties phase) {
-    super(phase);
+    this.phase = phase;
   }
 
   /** {@inheritDoc} */

src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/LiquidPhysicalPropertyMethod.java

@@ -14,18 +14,19 @@
 public abstract class LiquidPhysicalPropertyMethod extends PhysicalPropertyMethod {
   private static final long serialVersionUID = 1000;
 
-  protected PhysicalProperties liquidPhase;
+  protected neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties liquidPhase;
 
   /**
    * <p>
    * Constructor for LiquidPhysicalPropertyMethod.
    * </p>
    *
    * @param liquidPhase a
-   *        {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} object
+   *        {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface}
+   *        object
    */
   public LiquidPhysicalPropertyMethod(PhysicalProperties liquidPhase) {
-    super(liquidPhase);
+    setPhase(liquidPhase);
   }
 
   /** {@inheritDoc} */

src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/SolidPhysicalPropertyMethod.java

@@ -1,7 +1,6 @@
 package neqsim.physicalproperties.physicalpropertymethods.solidphysicalproperties;
 
 import neqsim.physicalproperties.physicalpropertymethods.PhysicalPropertyMethod;
-import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties;
 
 /**
  * <p>
@@ -14,23 +13,25 @@
 public abstract class SolidPhysicalPropertyMethod extends PhysicalPropertyMethod {
   private static final long serialVersionUID = 1000;
 
-  protected PhysicalProperties solidPhase;
+  protected neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties solidPhase;
 
   /**
    * <p>
    * Constructor for SolidPhysicalPropertyMethod.
    * </p>
    *
-   * @param solidPhase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties}
+   * @param solidPhase a
+   *        {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface}
    *        object
    */
-  public SolidPhysicalPropertyMethod(PhysicalProperties solidPhase) {
-    super(solidPhase);
+  public SolidPhysicalPropertyMethod(
+      neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties solidPhase) {
+    setPhase(solidPhase);
   }
 
   /** {@inheritDoc} */
   @Override
-  public void setPhase(PhysicalProperties solidPhase) {
-    this.solidPhase = solidPhase;
+  public void setPhase(neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties phase) {
+    this.solidPhase = phase;
   }
 }

src/main/java/neqsim/processsimulation/mechanicaldesign/separator/SeparatorMechanicalDesign.java

@@ -158,10 +158,10 @@ public void calcDesign() {
     // double moduleWidth = 0.0, moduleHeight = 0.0, moduleLength = 0.0;
     double materialsCost = 0.0;
     double gasDensity = ((SeparatorInterface) getProcessEquipment()).getThermoSystem().getPhase(0)
-        .getDensity("kg/m3");
+        .getPhysicalProperties().getDensity();
 
     double liqDensity = ((SeparatorInterface) getProcessEquipment()).getThermoSystem().getPhase(1)
-        .getDensity("kg/m3");
+        .getPhysicalProperties().getDensity();
     double liqViscosity = ((SeparatorInterface) getProcessEquipment()).getThermoSystem().getPhase(1)
         .getPhysicalProperties().getViscosity();
     if (((SeparatorInterface) getProcessEquipment()).getThermoSystem().getNumberOfPhases() == 1) {

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);
@@ -1212,9 +1211,6 @@ public double getEntropydT() {
   /** {@inheritDoc} */
   @Override
   public double getViscosity() {
-    if (getPhysicalProperties() == null) {
-      initPhysicalProperties(PhysicalPropertyType.DYNAMIC_VISCOSITY);
-    }
     return getPhysicalProperties().getViscosity();
   }
 
@@ -1240,9 +1236,6 @@ public double getViscosity(String unit) {
   /** {@inheritDoc} */
   @Override
   public double getThermalConductivity() {
-    if (getPhysicalProperties() == null) {
-      initPhysicalProperties(PhysicalPropertyType.THERMAL_CONDUCTIVITY);
-    }
     return getPhysicalProperties().getConductivity();
   }
 
@@ -1649,23 +1642,13 @@ public double getJouleThomsonCoefficient() {
   /** {@inheritDoc} */
   @Override
   public double getDensity() {
-    /*
-     * if (getPhysicalProperties() == null) {
-     * initPhysicalProperties(PhysicalPropertyType.MASS_DENSITY); }
-     * 
-     * return getPhysicalProperties().getDensity();
-     */
     return 1.0 / getMolarVolume() * getMolarMass() * 1.0e5;
   }
 
   /** {@inheritDoc} */
   @Override
   public double getDensity(String unit) {
-    // double refDensity = getDensity(); // density in kg/m3
-    if (getPhysicalProperties() == null) {
-      initPhysicalProperties(PhysicalPropertyType.MASS_DENSITY);
-    }
-    double refDensity = getPhysicalProperties().getDensity();
+    double refDensity = getPhysicalProperties().getDensity(); // density in kg/m3
     double conversionFactor = 1.0;
     switch (unit) {
       case "kg/m3":

src/main/java/neqsim/thermo/phase/PhaseGEWilson.java

@@ -75,6 +75,12 @@ public void addComponent(String name, double moles, double molesInPhase, int com
     componentArray[compNumber] = new ComponentGEWilson(name, moles, molesInPhase, compNumber);
   }
 
+  /** {@inheritDoc} */
+  @Override
+  public void setMixingRule(int type) {
+    super.setMixingRule(type);
+  }
+
   /** {@inheritDoc} */
   @Override
   public double getGibbsEnergy() {

src/main/java/neqsim/thermo/system/SystemThermo.java

@@ -1883,9 +1883,6 @@ public double getDensity() {
   public double getDensity(String unit) {
     double density = 0;
     for (int i = 0; i < getNumberOfPhases(); i++) {
-      if (getPhase(i).getPhysicalProperties() == null) {
-        getPhase(i).initPhysicalProperties(PhysicalPropertyType.MASS_DENSITY);
-      }
       density +=
           getPhase(i).getVolume() / getVolume() * getPhase(i).getPhysicalProperties().getDensity();
     }