wip

equinor · Oct 26, 2024 · 43437e6 · 43437e6
1 parent e161200
commit 43437e6
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/...nics/flowsystem/twophaseflowsystem/twophasepipeflowsystem/TwoPhasePipeFlowSystemReac.java b/...nics/flowsystem/twophaseflowsystem/twophasepipeflowsystem/TwoPhasePipeFlowSystemReac.java
@@ -1,6 +1,6 @@
 package neqsim.fluidmechanics.flowsystem.twophaseflowsystem.twophasepipeflowsystem;
 
-import neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertySystemType;
+import neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertyModel;
 import neqsim.thermo.system.SystemFurstElectrolyteEos;
 import neqsim.thermo.system.SystemInterface;
 import neqsim.thermodynamicoperations.ThermodynamicOperations;
@@ -43,7 +43,7 @@ public static void main(String[] args) {
     testSystem.chemicalReactionInit();
     testSystem.createDatabase(true);
     testSystem.setMixingRule(4);
-    testSystem.setPhysicalPropertyModel(PhysicalPropertySystemType.AMINE);
+    testSystem.setPhysicalPropertyModel(PhysicalPropertyModel.AMINE);
     // testOps.TPflash();
     // testSystem.display();
 

diff --git a/...alproperties/physicalpropertymethods/gasphysicalproperties/GasPhysicalPropertyMethod.java b/...alproperties/physicalpropertymethods/gasphysicalproperties/GasPhysicalPropertyMethod.java
@@ -10,7 +10,7 @@
  * @author Even Solbraa
  * @version $Id: $Id
  */
-public class GasPhysicalPropertyMethod extends PhysicalPropertyMethod {
+public abstract class GasPhysicalPropertyMethod extends PhysicalPropertyMethod {
   private static final long serialVersionUID = 1000;
 
   protected neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface gasPhase;

diff --git a/...alproperties/physicalpropertymethods/gasphysicalproperties/conductivity/Conductivity.java b/...alproperties/physicalpropertymethods/gasphysicalproperties/conductivity/Conductivity.java
@@ -16,7 +16,8 @@
  *
  * @author Even Solbraa
  */
-abstract class Conductivity extends GasPhysicalPropertyMethod implements ConductivityInterface {
+public abstract class Conductivity extends GasPhysicalPropertyMethod
+    implements ConductivityInterface {
   private static final long serialVersionUID = 1000;
   static Logger logger = LogManager.getLogger(Conductivity.class);
 

diff --git a/...hysicalproperties/physicalpropertysystem/gasphysicalproperties/GasPhysicalProperties.java b/...hysicalproperties/physicalpropertysystem/gasphysicalproperties/GasPhysicalProperties.java
@@ -52,7 +52,6 @@ public GasPhysicalProperties(PhaseInterface phase, int binaryDiffusionCoefficien
     densityCalc =
         new neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.density.Density(
             this);
-    // this.init(phase);
   }
 
   /** {@inheritDoc} */

diff --git a/src/main/java/neqsim/thermo/phase/Phase.java b/src/main/java/neqsim/thermo/phase/Phase.java
@@ -75,7 +75,7 @@ public abstract class Phase implements PhaseInterface {
   private int initType = 0;
   int mixingRuleNumber = 0;
 
-  /** Temperature of phase */
+  /** Temperature of phase. */
   double temperature = 0;
 
   /** Pressure of phase. */
@@ -471,11 +471,11 @@ public void init(double totalNumberOfMoles, int numberOfComponents, int initType
 
   /** {@inheritDoc} */
   @Override
-  public void setPhysicalPropertyHandlerType(PhysicalPropertyModel ppm) {
+  public void setPhysicalPropertyModel(PhysicalPropertyModel ppm) {
     if (physicalPropertyHandler == null) {
       physicalPropertyHandler = new PhysicalPropertyHandler();
     }
-    physicalPropertyHandler.setPhysicalProperties(this, ppm);
+    physicalPropertyHandler.init(this, ppm);
   }
 
   /** {@inheritDoc} */
@@ -1912,13 +1912,13 @@ public void setRefPhase(neqsim.thermo.phase.PhaseInterface[] refPhase) {
 
   /** {@inheritDoc} */
   @Override
-  public final PhysicalPropertySystemType getPhysicalPropertySystemType() {
+  public final PhysicalPropertyModel getPhysicalPropertyModel() {
     return this.ppm;
   }
 
   /** {@inheritDoc} */
   @Override
-  public void setPhysicalPropertySystemType(PhysicalPropertyModel ppm) {
+  public void setPhysicalPropertyModel(PhysicalPropertyModel ppm) {
     this.ppm = ppm;
   }