refact: rename packages (#1156)

equinor · Oct 28, 2024 · 9c1068d · 9c1068d
1 parent e999736
commit 9c1068d
Show file tree

Hide file tree

Showing 66 changed files with 291 additions and 372 deletions.
diff --git a/...uidmechanics/flownode/twophasenode/twophasereactorflownode/TwoPhasePackedBedFlowNode.java b/...uidmechanics/flownode/twophasenode/twophasereactorflownode/TwoPhasePackedBedFlowNode.java
@@ -5,7 +5,7 @@
 import neqsim.fluidmechanics.flownode.twophasenode.TwoPhaseFlowNode;
 import neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface;
 import neqsim.fluidmechanics.geometrydefinitions.reactor.ReactorData;
-import neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertyModel;
+import neqsim.physicalproperties.system.PhysicalPropertyModel;
 import neqsim.thermo.system.SystemFurstElectrolyteEos;
 import neqsim.thermo.system.SystemInterface;
 import neqsim.thermodynamicoperations.ThermodynamicOperations;

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.PhysicalPropertyModel;
+import neqsim.physicalproperties.system.PhysicalPropertyModel;
 import neqsim.thermo.system.SystemFurstElectrolyteEos;
 import neqsim.thermo.system.SystemInterface;
 import neqsim.thermodynamicoperations.ThermodynamicOperations;

diff --git a/src/main/java/neqsim/physicalproperties/PhysicalPropertyHandler.java b/src/main/java/neqsim/physicalproperties/PhysicalPropertyHandler.java
@@ -2,16 +2,16 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties;
-import neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertyModel;
-import neqsim.physicalproperties.physicalpropertysystem.commonphasephysicalproperties.DefaultPhysicalProperties;
-import neqsim.physicalproperties.physicalpropertysystem.gasphysicalproperties.GasPhysicalProperties;
-import neqsim.physicalproperties.physicalpropertysystem.liquidphysicalproperties.AminePhysicalProperties;
-import neqsim.physicalproperties.physicalpropertysystem.liquidphysicalproperties.CO2waterPhysicalProperties;
-import neqsim.physicalproperties.physicalpropertysystem.liquidphysicalproperties.GlycolPhysicalProperties;
-import neqsim.physicalproperties.physicalpropertysystem.liquidphysicalproperties.LiquidPhysicalProperties;
-import neqsim.physicalproperties.physicalpropertysystem.liquidphysicalproperties.WaterPhysicalProperties;
-import neqsim.physicalproperties.physicalpropertysystem.solidphysicalproperties.SolidPhysicalProperties;
+import neqsim.physicalproperties.system.PhysicalProperties;
+import neqsim.physicalproperties.system.PhysicalPropertyModel;
+import neqsim.physicalproperties.system.commonphasephysicalproperties.DefaultPhysicalProperties;
+import neqsim.physicalproperties.system.gasphysicalproperties.GasPhysicalProperties;
+import neqsim.physicalproperties.system.liquidphysicalproperties.AminePhysicalProperties;
+import neqsim.physicalproperties.system.liquidphysicalproperties.CO2waterPhysicalProperties;
+import neqsim.physicalproperties.system.liquidphysicalproperties.GlycolPhysicalProperties;
+import neqsim.physicalproperties.system.liquidphysicalproperties.LiquidPhysicalProperties;
+import neqsim.physicalproperties.system.liquidphysicalproperties.WaterPhysicalProperties;
+import neqsim.physicalproperties.system.solidphysicalproperties.SolidPhysicalProperties;
 import neqsim.thermo.phase.PhaseInterface;
 
 /**
@@ -99,7 +99,7 @@ public void setPhysicalProperties(PhaseInterface phase, PhysicalPropertyModel pp
    * </p>
    *
    * @param phase a {@link neqsim.thermo.phase.PhaseInterface} object
-   * @return a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} object
+   * @return a {@link neqsim.physicalproperties.system.PhysicalProperties} object
    */
   public PhysicalProperties getPhysicalProperties(PhaseInterface phase) {
     switch (phase.getType()) {

diff --git a/...opertymethods/PhysicalPropertyMethod.java → ...rties/methods/PhysicalPropertyMethod.java b/...opertymethods/PhysicalPropertyMethod.java → ...rties/methods/PhysicalPropertyMethod.java
@@ -4,11 +4,11 @@
  * Created on 3. august 2001, 22:49
  */
 
-package neqsim.physicalproperties.physicalpropertymethods;
+package neqsim.physicalproperties.methods;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties;
+import neqsim.physicalproperties.system.PhysicalProperties;
 
 /**
  * <p>
@@ -27,7 +27,7 @@ public abstract class PhysicalPropertyMethod implements PhysicalPropertyMethodIn
    * Constructor for PhysicalPropertyMethod.
    * </p>
    *
-   * @param phase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} object
+   * @param phase a {@link neqsim.physicalproperties.system.PhysicalProperties} object
    */
   public PhysicalPropertyMethod(PhysicalProperties phase) {
     setPhase(phase);

diff --git a/...hods/PhysicalPropertyMethodInterface.java → ...hods/PhysicalPropertyMethodInterface.java b/...hods/PhysicalPropertyMethodInterface.java → ...hods/PhysicalPropertyMethodInterface.java
@@ -4,9 +4,9 @@
  * Created on 21. august 2001, 13:20
  */
 
-package neqsim.physicalproperties.physicalpropertymethods;
+package neqsim.physicalproperties.methods;
 
-import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties;
+import neqsim.physicalproperties.system.PhysicalProperties;
 
 /**
  * <p>
@@ -22,9 +22,7 @@ public interface PhysicalPropertyMethodInterface extends Cloneable, java.io.Seri
    * clone.
    * </p>
    *
-   * @return a
-   *         {@link neqsim.physicalproperties.physicalpropertymethods.PhysicalPropertyMethodInterface}
-   *         object
+   * @return a {@link neqsim.physicalproperties.methods.PhysicalPropertyMethodInterface} object
    */
   public PhysicalPropertyMethodInterface clone();
 
@@ -33,7 +31,7 @@ public interface PhysicalPropertyMethodInterface extends Cloneable, java.io.Seri
    * setPhase.
    * </p>
    *
-   * @param phase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} object
+   * @param phase a {@link neqsim.physicalproperties.system.PhysicalProperties} object
    */
   public void setPhase(PhysicalProperties phase);
 

diff --git a/...perties/CommonPhysicalPropertyMethod.java → ...perties/CommonPhysicalPropertyMethod.java b/...perties/CommonPhysicalPropertyMethod.java → ...perties/CommonPhysicalPropertyMethod.java
@@ -1,7 +1,7 @@
-package neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties;
+package neqsim.physicalproperties.methods.commonphasephysicalproperties;
 
-import neqsim.physicalproperties.physicalpropertymethods.PhysicalPropertyMethod;
-import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties;
+import neqsim.physicalproperties.methods.PhysicalPropertyMethod;
+import neqsim.physicalproperties.system.PhysicalProperties;
 
 /**
  * <p>
@@ -21,8 +21,7 @@ public abstract class CommonPhysicalPropertyMethod extends PhysicalPropertyMetho
    * Constructor for CommonPhysicalPropertyMethod.
    * </p>
    *
-   * @param phase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties}
-   *        object
+   * @param phase a {@link neqsim.physicalproperties.system.PhysicalProperties} object
    */
   public CommonPhysicalPropertyMethod(PhysicalProperties phase) {
     super(phase);

diff --git a/...properties/conductivity/Conductivity.java → ...properties/conductivity/Conductivity.java b/...properties/conductivity/Conductivity.java → ...properties/conductivity/Conductivity.java
@@ -1,10 +1,10 @@
-package neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.conductivity;
+package neqsim.physicalproperties.methods.commonphasephysicalproperties.conductivity;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.CommonPhysicalPropertyMethod;
-import neqsim.physicalproperties.physicalpropertymethods.methodinterface.ConductivityInterface;
-import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties;
+import neqsim.physicalproperties.methods.commonphasephysicalproperties.CommonPhysicalPropertyMethod;
+import neqsim.physicalproperties.methods.methodinterface.ConductivityInterface;
+import neqsim.physicalproperties.system.PhysicalProperties;
 
 /**
  * Abstract class for Conductivity.
@@ -23,8 +23,7 @@ public abstract class Conductivity extends CommonPhysicalPropertyMethod
    * Constructor for Conductivity.
    * </p>
    *
-   * @param phase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties}
-   *        object
+   * @param phase a {@link neqsim.physicalproperties.system.PhysicalProperties} object
    */
   public Conductivity(PhysicalProperties phase) {
     super(phase);

diff --git a/...uctivity/PFCTConductivityMethodMod86.java → ...uctivity/PFCTConductivityMethodMod86.java b/...uctivity/PFCTConductivityMethodMod86.java → ...uctivity/PFCTConductivityMethodMod86.java
@@ -1,6 +1,6 @@
-package neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.conductivity;
+package neqsim.physicalproperties.methods.commonphasephysicalproperties.conductivity;
 
-import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties;
+import neqsim.physicalproperties.system.PhysicalProperties;
 import neqsim.thermo.ThermodynamicConstantsInterface;
 import neqsim.thermo.system.SystemInterface;
 import neqsim.thermo.system.SystemSrkEos;
@@ -40,7 +40,7 @@ public class PFCTConductivityMethodMod86 extends Conductivity {
    * Constructor for PFCTConductivityMethodMod86.
    * </p>
    *
-   * @param phase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} object
+   * @param phase a {@link neqsim.physicalproperties.system.PhysicalProperties} object
    */
   public PFCTConductivityMethodMod86(PhysicalProperties phase) {
     super(phase);

diff --git a/...ivity/CorrespondingStatesDiffusivity.java → ...ivity/CorrespondingStatesDiffusivity.java b/...ivity/CorrespondingStatesDiffusivity.java → ...ivity/CorrespondingStatesDiffusivity.java
@@ -1,6 +1,6 @@
-package neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.diffusivity;
+package neqsim.physicalproperties.methods.commonphasephysicalproperties.diffusivity;
 
-import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties;
+import neqsim.physicalproperties.system.PhysicalProperties;
 import neqsim.thermo.phase.PhaseType;
 
 /**
@@ -22,7 +22,7 @@ public class CorrespondingStatesDiffusivity extends Diffusivity {
    * Constructor for CorrespondingStatesDiffusivity.
    * </p>
    *
-   * @param phase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} object
+   * @param phase a {@link neqsim.physicalproperties.system.PhysicalProperties} object
    */
   public CorrespondingStatesDiffusivity(PhysicalProperties phase) {
     super(phase);

diff --git a/...alproperties/diffusivity/Diffusivity.java → ...alproperties/diffusivity/Diffusivity.java b/...alproperties/diffusivity/Diffusivity.java → ...alproperties/diffusivity/Diffusivity.java
@@ -1,10 +1,10 @@
-package neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.diffusivity;
+package neqsim.physicalproperties.methods.commonphasephysicalproperties.diffusivity;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.CommonPhysicalPropertyMethod;
-import neqsim.physicalproperties.physicalpropertymethods.methodinterface.DiffusivityInterface;
-import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties;
+import neqsim.physicalproperties.methods.commonphasephysicalproperties.CommonPhysicalPropertyMethod;
+import neqsim.physicalproperties.methods.methodinterface.DiffusivityInterface;
+import neqsim.physicalproperties.system.PhysicalProperties;
 
 /**
  * <p>
@@ -27,8 +27,7 @@ public class Diffusivity extends CommonPhysicalPropertyMethod implements Diffusi
    * Constructor for Diffusivity.
    * </p>
    *
-   * @param phase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties}
-   *        object
+   * @param phase a {@link neqsim.physicalproperties.system.PhysicalProperties} object
    */
   public Diffusivity(PhysicalProperties phase) {
     super(phase);

diff --git a/...cosity/FrictionTheoryViscosityMethod.java → ...cosity/FrictionTheoryViscosityMethod.java b/...cosity/FrictionTheoryViscosityMethod.java → ...cosity/FrictionTheoryViscosityMethod.java
@@ -1,8 +1,8 @@
-package neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.viscosity;
+package neqsim.physicalproperties.methods.commonphasephysicalproperties.viscosity;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties;
+import neqsim.physicalproperties.system.PhysicalProperties;
 
 /**
  * <p>
@@ -55,7 +55,7 @@ public class FrictionTheoryViscosityMethod extends Viscosity
    * Constructor for FrictionTheoryViscosityMethod.
    * </p>
    *
-   * @param phase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} object
+   * @param phase a {@link neqsim.physicalproperties.system.PhysicalProperties} object
    */
   public FrictionTheoryViscosityMethod(PhysicalProperties phase) {
     super(phase);

diff --git a/...perties/viscosity/LBCViscosityMethod.java → ...perties/viscosity/LBCViscosityMethod.java b/...perties/viscosity/LBCViscosityMethod.java → ...perties/viscosity/LBCViscosityMethod.java
@@ -1,8 +1,8 @@
-package neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.viscosity;
+package neqsim.physicalproperties.methods.commonphasephysicalproperties.viscosity;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties;
+import neqsim.physicalproperties.system.PhysicalProperties;
 
 /**
  * <p>
@@ -23,7 +23,7 @@ public class LBCViscosityMethod extends Viscosity {
    * Constructor for LBCViscosityMethod.
    * </p>
    *
-   * @param phase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} object
+   * @param phase a {@link neqsim.physicalproperties.system.PhysicalProperties} object
    */
   public LBCViscosityMethod(PhysicalProperties phase) {
     super(phase);

diff --git a/...erties/viscosity/PFCTViscosityMethod.java → ...erties/viscosity/PFCTViscosityMethod.java b/...erties/viscosity/PFCTViscosityMethod.java → ...erties/viscosity/PFCTViscosityMethod.java
@@ -4,9 +4,9 @@
  * Created on 1. august 2001, 12:44
  */
 
-package neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.viscosity;
+package neqsim.physicalproperties.methods.commonphasephysicalproperties.viscosity;
 
-import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties;
+import neqsim.physicalproperties.system.PhysicalProperties;
 import neqsim.thermo.ThermodynamicConstantsInterface;
 import neqsim.thermo.system.SystemInterface;
 import neqsim.thermo.system.SystemSrkEos;
@@ -46,7 +46,7 @@ public class PFCTViscosityMethod extends Viscosity {
    * Constructor for PFCTViscosityMethod.
    * </p>
    *
-   * @param phase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} object
+   * @param phase a {@link neqsim.physicalproperties.system.PhysicalProperties} object
    */
   public PFCTViscosityMethod(PhysicalProperties phase) {
     super(phase);

diff --git a/...iscosity/PFCTViscosityMethodHeavyOil.java → ...iscosity/PFCTViscosityMethodHeavyOil.java b/...iscosity/PFCTViscosityMethodHeavyOil.java → ...iscosity/PFCTViscosityMethodHeavyOil.java
@@ -1,6 +1,6 @@
-package neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.viscosity;
+package neqsim.physicalproperties.methods.commonphasephysicalproperties.viscosity;
 
-import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties;
+import neqsim.physicalproperties.system.PhysicalProperties;
 import neqsim.thermo.ThermodynamicConstantsInterface;
 import neqsim.thermo.system.SystemInterface;
 import neqsim.thermo.system.SystemSrkEos;
@@ -46,7 +46,7 @@ public class PFCTViscosityMethodHeavyOil extends Viscosity {
    * Constructor for PFCTViscosityMethodHeavyOil.
    * </p>
    *
-   * @param phase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} object
+   * @param phase a {@link neqsim.physicalproperties.system.PhysicalProperties} object
    */
   public PFCTViscosityMethodHeavyOil(PhysicalProperties phase) {
     super(phase);

diff --git a/...s/viscosity/PFCTViscosityMethodMod86.java → ...s/viscosity/PFCTViscosityMethodMod86.java b/...s/viscosity/PFCTViscosityMethodMod86.java → ...s/viscosity/PFCTViscosityMethodMod86.java
@@ -1,6 +1,6 @@
-package neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.viscosity;
+package neqsim.physicalproperties.methods.commonphasephysicalproperties.viscosity;
 
-import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties;
+import neqsim.physicalproperties.system.PhysicalProperties;
 import neqsim.thermo.ThermodynamicConstantsInterface;
 import neqsim.thermo.system.SystemInterface;
 import neqsim.thermo.system.SystemSrkEos;
@@ -41,7 +41,7 @@ public class PFCTViscosityMethodMod86 extends Viscosity {
    * Constructor for PFCTViscosityMethodMod86.
    * </p>
    *
-   * @param phase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} object
+   * @param phase a {@link neqsim.physicalproperties.system.PhysicalProperties} object
    */
   public PFCTViscosityMethodMod86(PhysicalProperties phase) {
     super(phase);

diff --git a/...ysicalproperties/viscosity/Viscosity.java → ...ysicalproperties/viscosity/Viscosity.java b/...ysicalproperties/viscosity/Viscosity.java → ...ysicalproperties/viscosity/Viscosity.java
@@ -1,10 +1,10 @@
-package neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.viscosity;
+package neqsim.physicalproperties.methods.commonphasephysicalproperties.viscosity;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.CommonPhysicalPropertyMethod;
-import neqsim.physicalproperties.physicalpropertymethods.methodinterface.ViscosityInterface;
-import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties;
+import neqsim.physicalproperties.methods.commonphasephysicalproperties.CommonPhysicalPropertyMethod;
+import neqsim.physicalproperties.methods.methodinterface.ViscosityInterface;
+import neqsim.physicalproperties.system.PhysicalProperties;
 
 /**
  * Abstract class for Viscosity property.
@@ -22,8 +22,7 @@ public abstract class Viscosity extends CommonPhysicalPropertyMethod implements
    * Constructor for Viscosity.
    * </p>
    *
-   * @param phase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties}
-   *        object
+   * @param phase a {@link neqsim.physicalproperties.system.PhysicalProperties} object
    */
   public Viscosity(PhysicalProperties phase) {
     super(phase);

diff --git a/...properties/GasPhysicalPropertyMethod.java → ...properties/GasPhysicalPropertyMethod.java b/...properties/GasPhysicalPropertyMethod.java → ...properties/GasPhysicalPropertyMethod.java
@@ -1,7 +1,7 @@
-package neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties;
+package neqsim.physicalproperties.methods.gasphysicalproperties;
 
-import neqsim.physicalproperties.physicalpropertymethods.PhysicalPropertyMethod;
-import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties;
+import neqsim.physicalproperties.methods.PhysicalPropertyMethod;
+import neqsim.physicalproperties.system.PhysicalProperties;
 
 /**
  * <p>
@@ -24,8 +24,7 @@ public abstract class GasPhysicalPropertyMethod extends PhysicalPropertyMethod {
    * Constructor for GasPhysicalPropertyMethod.
    * </p>
    *
-   * @param gasPhase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties}
-   *        object
+   * @param gasPhase a {@link neqsim.physicalproperties.system.PhysicalProperties} object
    */
   public GasPhysicalPropertyMethod(PhysicalProperties gasPhase) {
     super(gasPhase);

diff --git a/...conductivity/ChungConductivityMethod.java → ...conductivity/ChungConductivityMethod.java b/...conductivity/ChungConductivityMethod.java → ...conductivity/ChungConductivityMethod.java
@@ -1,6 +1,6 @@
-package neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.conductivity;
+package neqsim.physicalproperties.methods.gasphysicalproperties.conductivity;
 
-import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties;
+import neqsim.physicalproperties.system.PhysicalProperties;
 
 /**
  * <p>
@@ -20,7 +20,7 @@ public class ChungConductivityMethod extends Conductivity {
    * Constructor for ChungConductivityMethod.
    * </p>
    *
-   * @param gasPhase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} object
+   * @param gasPhase a {@link neqsim.physicalproperties.system.PhysicalProperties} object
    */
   public ChungConductivityMethod(PhysicalProperties gasPhase) {
     super(gasPhase);