From 9c1068dc85190688e398ae8d749df007e79fd681 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=85smund=20V=C3=A5ge=20Fannemel?= <34712686+asmfstatoil@users.noreply.github.com> Date: Mon, 28 Oct 2024 16:05:37 +0100 Subject: [PATCH] refact: rename packages (#1156) --- .../TwoPhasePackedBedFlowNode.java | 2 +- .../TwoPhasePipeFlowSystemReac.java | 2 +- .../PhysicalPropertyHandler.java | 22 ++++----- .../PhysicalPropertyMethod.java | 6 +-- .../PhysicalPropertyMethodInterface.java | 10 ++-- .../CommonPhysicalPropertyMethod.java | 9 ++-- .../conductivity/Conductivity.java | 11 ++--- .../PFCTConductivityMethodMod86.java | 6 +-- .../CorrespondingStatesDiffusivity.java | 6 +-- .../diffusivity/Diffusivity.java | 11 ++--- .../FrictionTheoryViscosityMethod.java | 6 +-- .../viscosity/LBCViscosityMethod.java | 6 +-- .../viscosity/PFCTViscosityMethod.java | 6 +-- .../PFCTViscosityMethodHeavyOil.java | 6 +-- .../viscosity/PFCTViscosityMethodMod86.java | 6 +-- .../viscosity/Viscosity.java | 11 ++--- .../GasPhysicalPropertyMethod.java | 9 ++-- .../conductivity/ChungConductivityMethod.java | 6 +-- .../conductivity/Conductivity.java | 11 ++--- .../density/Density.java | 11 ++--- .../diffusivity/Diffusivity.java | 11 ++--- .../diffusivity/WilkeLeeDiffusivity.java | 6 +-- .../viscosity/ChungViscosityMethod.java | 6 +-- .../viscosity/Viscosity.java | 11 ++--- .../LiquidPhysicalPropertyMethod.java | 9 ++-- .../conductivity/Conductivity.java | 11 ++--- .../density/Costald.java | 11 ++--- .../density/Density.java | 11 ++--- .../diffusivity/AmineDiffusivity.java | 6 +-- .../diffusivity/CO2water.java | 6 +-- .../diffusivity/Diffusivity.java | 11 ++--- .../diffusivity/SiddiqiLucasMethod.java | 6 +-- .../viscosity/AmineViscosity.java | 6 +-- .../viscosity/Viscosity.java | 11 ++--- .../ConductivityInterface.java | 4 +- .../methodinterface/DensityInterface.java | 4 +- .../methodinterface/DiffusivityInterface.java | 4 +- .../methodinterface/ViscosityInterface.java | 4 +- .../SolidPhysicalPropertyMethod.java | 9 ++-- .../conductivity/Conductivity.java | 11 ++--- .../density/Density.java | 11 ++--- .../diffusivity/Diffusivity.java | 11 ++--- .../viscosity/Viscosity.java | 11 ++--- .../liquidphysicalproperties/density/temp | 39 --------------- .../SolidPhysicalProperties.java | 40 --------------- .../PhysicalProperties.java | 49 +++++++++---------- .../PhysicalPropertyModel.java | 6 +-- .../DefaultPhysicalProperties.java | 14 +++--- .../AirPhysicalProperties.java | 13 ++--- .../GasPhysicalProperties.java | 15 +++--- .../NaturalGasPhysicalProperties.java | 13 ++--- .../AminePhysicalProperties.java | 10 ++-- .../CO2waterPhysicalProperties.java | 12 ++--- .../GlycolPhysicalProperties.java | 10 ++-- .../LiquidPhysicalProperties.java | 12 ++--- .../WaterPhysicalProperties.java | 10 ++-- .../SolidPhysicalProperties.java | 37 ++++++++++++++ .../parameterfitting/ViscosityFunction.java | 2 +- src/main/java/neqsim/thermo/phase/Phase.java | 4 +- .../neqsim/thermo/phase/PhaseInterface.java | 11 ++--- .../neqsim/thermo/system/SystemInterface.java | 2 +- .../FrictionTheoryViscosityMethodTest.java | 2 +- .../viscosity/PFCTViscosityMethodTest.java | 2 +- .../density/CostaldTest.java | 2 +- .../PhysicalPropertyModelTest.java | 2 +- .../util/examples/TestCondensate.java | 2 +- 66 files changed, 291 insertions(+), 372 deletions(-) rename src/main/java/neqsim/physicalproperties/{physicalpropertymethods => methods}/PhysicalPropertyMethod.java (82%) rename src/main/java/neqsim/physicalproperties/{physicalpropertymethods => methods}/PhysicalPropertyMethodInterface.java (65%) rename src/main/java/neqsim/physicalproperties/{physicalpropertymethods => methods}/commonphasephysicalproperties/CommonPhysicalPropertyMethod.java (61%) rename src/main/java/neqsim/physicalproperties/{physicalpropertymethods => methods}/commonphasephysicalproperties/conductivity/Conductivity.java (62%) rename src/main/java/neqsim/physicalproperties/{physicalpropertymethods => methods}/commonphasephysicalproperties/conductivity/PFCTConductivityMethodMod86.java (98%) rename src/main/java/neqsim/physicalproperties/{physicalpropertymethods => methods}/commonphasephysicalproperties/diffusivity/CorrespondingStatesDiffusivity.java (86%) rename src/main/java/neqsim/physicalproperties/{physicalpropertymethods => methods}/commonphasephysicalproperties/diffusivity/Diffusivity.java (87%) rename src/main/java/neqsim/physicalproperties/{physicalpropertymethods => methods}/commonphasephysicalproperties/viscosity/FrictionTheoryViscosityMethod.java (97%) rename src/main/java/neqsim/physicalproperties/{physicalpropertymethods => methods}/commonphasephysicalproperties/viscosity/LBCViscosityMethod.java (91%) rename src/main/java/neqsim/physicalproperties/{physicalpropertymethods => methods}/commonphasephysicalproperties/viscosity/PFCTViscosityMethod.java (96%) rename src/main/java/neqsim/physicalproperties/{physicalpropertymethods => methods}/commonphasephysicalproperties/viscosity/PFCTViscosityMethodHeavyOil.java (97%) rename src/main/java/neqsim/physicalproperties/{physicalpropertymethods => methods}/commonphasephysicalproperties/viscosity/PFCTViscosityMethodMod86.java (96%) rename src/main/java/neqsim/physicalproperties/{physicalpropertymethods => methods}/commonphasephysicalproperties/viscosity/Viscosity.java (90%) rename src/main/java/neqsim/physicalproperties/{physicalpropertymethods => methods}/gasphysicalproperties/GasPhysicalPropertyMethod.java (85%) rename src/main/java/neqsim/physicalproperties/{physicalpropertymethods => methods}/gasphysicalproperties/conductivity/ChungConductivityMethod.java (92%) rename src/main/java/neqsim/physicalproperties/{physicalpropertymethods => methods}/gasphysicalproperties/conductivity/Conductivity.java (65%) rename src/main/java/neqsim/physicalproperties/{physicalpropertymethods => methods}/gasphysicalproperties/density/Density.java (76%) rename src/main/java/neqsim/physicalproperties/{physicalpropertymethods => methods}/gasphysicalproperties/diffusivity/Diffusivity.java (90%) rename src/main/java/neqsim/physicalproperties/{physicalpropertymethods => methods}/gasphysicalproperties/diffusivity/WilkeLeeDiffusivity.java (87%) rename src/main/java/neqsim/physicalproperties/{physicalpropertymethods => methods}/gasphysicalproperties/viscosity/ChungViscosityMethod.java (95%) rename src/main/java/neqsim/physicalproperties/{physicalpropertymethods => methods}/gasphysicalproperties/viscosity/Viscosity.java (61%) rename src/main/java/neqsim/physicalproperties/{physicalpropertymethods => methods}/liquidphysicalproperties/LiquidPhysicalPropertyMethod.java (62%) rename src/main/java/neqsim/physicalproperties/{physicalpropertymethods => methods}/liquidphysicalproperties/conductivity/Conductivity.java (85%) rename src/main/java/neqsim/physicalproperties/{physicalpropertymethods => methods}/liquidphysicalproperties/density/Costald.java (91%) rename src/main/java/neqsim/physicalproperties/{physicalpropertymethods => methods}/liquidphysicalproperties/density/Density.java (76%) rename src/main/java/neqsim/physicalproperties/{physicalpropertymethods => methods}/liquidphysicalproperties/diffusivity/AmineDiffusivity.java (92%) rename src/main/java/neqsim/physicalproperties/{physicalpropertymethods => methods}/liquidphysicalproperties/diffusivity/CO2water.java (70%) rename src/main/java/neqsim/physicalproperties/{physicalpropertymethods => methods}/liquidphysicalproperties/diffusivity/Diffusivity.java (88%) rename src/main/java/neqsim/physicalproperties/{physicalpropertymethods => methods}/liquidphysicalproperties/diffusivity/SiddiqiLucasMethod.java (87%) rename src/main/java/neqsim/physicalproperties/{physicalpropertymethods => methods}/liquidphysicalproperties/viscosity/AmineViscosity.java (80%) rename src/main/java/neqsim/physicalproperties/{physicalpropertymethods => methods}/liquidphysicalproperties/viscosity/Viscosity.java (92%) rename src/main/java/neqsim/physicalproperties/{physicalpropertymethods => methods}/methodinterface/ConductivityInterface.java (74%) rename src/main/java/neqsim/physicalproperties/{physicalpropertymethods => methods}/methodinterface/DensityInterface.java (75%) rename src/main/java/neqsim/physicalproperties/{physicalpropertymethods => methods}/methodinterface/DiffusivityInterface.java (90%) rename src/main/java/neqsim/physicalproperties/{physicalpropertymethods => methods}/methodinterface/ViscosityInterface.java (76%) rename src/main/java/neqsim/physicalproperties/{physicalpropertymethods => methods}/solidphysicalproperties/SolidPhysicalPropertyMethod.java (62%) rename src/main/java/neqsim/physicalproperties/{physicalpropertymethods => methods}/solidphysicalproperties/conductivity/Conductivity.java (71%) rename src/main/java/neqsim/physicalproperties/{physicalpropertymethods => methods}/solidphysicalproperties/density/Density.java (76%) rename src/main/java/neqsim/physicalproperties/{physicalpropertymethods => methods}/solidphysicalproperties/diffusivity/Diffusivity.java (84%) rename src/main/java/neqsim/physicalproperties/{physicalpropertymethods => methods}/solidphysicalproperties/viscosity/Viscosity.java (75%) delete mode 100644 src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/density/temp delete mode 100644 src/main/java/neqsim/physicalproperties/physicalpropertysystem/solidphysicalproperties/SolidPhysicalProperties.java rename src/main/java/neqsim/physicalproperties/{physicalpropertysystem => system}/PhysicalProperties.java (85%) rename src/main/java/neqsim/physicalproperties/{physicalpropertysystem => system}/PhysicalPropertyModel.java (95%) rename src/main/java/neqsim/physicalproperties/{physicalpropertysystem => system}/commonphasephysicalproperties/DefaultPhysicalProperties.java (61%) rename src/main/java/neqsim/physicalproperties/{physicalpropertysystem => system}/gasphysicalproperties/AirPhysicalProperties.java (64%) rename src/main/java/neqsim/physicalproperties/{physicalpropertysystem => system}/gasphysicalproperties/GasPhysicalProperties.java (72%) rename src/main/java/neqsim/physicalproperties/{physicalpropertysystem => system}/gasphysicalproperties/NaturalGasPhysicalProperties.java (66%) rename src/main/java/neqsim/physicalproperties/{physicalpropertysystem => system}/liquidphysicalproperties/AminePhysicalProperties.java (66%) rename src/main/java/neqsim/physicalproperties/{physicalpropertysystem => system}/liquidphysicalproperties/CO2waterPhysicalProperties.java (70%) rename src/main/java/neqsim/physicalproperties/{physicalpropertysystem => system}/liquidphysicalproperties/GlycolPhysicalProperties.java (66%) rename src/main/java/neqsim/physicalproperties/{physicalpropertysystem => system}/liquidphysicalproperties/LiquidPhysicalProperties.java (73%) rename src/main/java/neqsim/physicalproperties/{physicalpropertysystem => system}/liquidphysicalproperties/WaterPhysicalProperties.java (66%) create mode 100644 src/main/java/neqsim/physicalproperties/system/solidphysicalproperties/SolidPhysicalProperties.java rename src/test/java/neqsim/physicalproperties/{physicalpropertymethods => methods}/commonphasephysicalproperties/viscosity/FrictionTheoryViscosityMethodTest.java (91%) rename src/test/java/neqsim/physicalproperties/{physicalpropertymethods => methods}/commonphasephysicalproperties/viscosity/PFCTViscosityMethodTest.java (88%) rename src/test/java/neqsim/physicalproperties/{physicalpropertymethods => methods}/liquidphysicalproperties/density/CostaldTest.java (91%) rename src/test/java/neqsim/physicalproperties/{physicalpropertysystem => system}/PhysicalPropertyModelTest.java (95%) diff --git a/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasereactorflownode/TwoPhasePackedBedFlowNode.java b/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasereactorflownode/TwoPhasePackedBedFlowNode.java index b021619985..8ef9098563 100644 --- a/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasereactorflownode/TwoPhasePackedBedFlowNode.java +++ b/src/main/java/neqsim/fluidmechanics/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/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/twophasepipeflowsystem/TwoPhasePipeFlowSystemReac.java b/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/twophasepipeflowsystem/TwoPhasePipeFlowSystemReac.java index a0d5e97371..5d34bb84eb 100644 --- a/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/twophasepipeflowsystem/TwoPhasePipeFlowSystemReac.java +++ b/src/main/java/neqsim/fluidmechanics/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 index 68964c2282..27365ccd74 100644 --- 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 *

* * @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/src/main/java/neqsim/physicalproperties/physicalpropertymethods/PhysicalPropertyMethod.java b/src/main/java/neqsim/physicalproperties/methods/PhysicalPropertyMethod.java similarity index 82% rename from src/main/java/neqsim/physicalproperties/physicalpropertymethods/PhysicalPropertyMethod.java rename to src/main/java/neqsim/physicalproperties/methods/PhysicalPropertyMethod.java index 545de796da..a35fceb9a2 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/PhysicalPropertyMethod.java +++ b/src/main/java/neqsim/physicalproperties/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; /** *

@@ -27,7 +27,7 @@ public abstract class PhysicalPropertyMethod implements PhysicalPropertyMethodIn * Constructor for PhysicalPropertyMethod. *

* - * @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/src/main/java/neqsim/physicalproperties/physicalpropertymethods/PhysicalPropertyMethodInterface.java b/src/main/java/neqsim/physicalproperties/methods/PhysicalPropertyMethodInterface.java similarity index 65% rename from src/main/java/neqsim/physicalproperties/physicalpropertymethods/PhysicalPropertyMethodInterface.java rename to src/main/java/neqsim/physicalproperties/methods/PhysicalPropertyMethodInterface.java index 2004878dc2..a4b56a26f9 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/PhysicalPropertyMethodInterface.java +++ b/src/main/java/neqsim/physicalproperties/methods/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; /** *

@@ -22,9 +22,7 @@ public interface PhysicalPropertyMethodInterface extends Cloneable, java.io.Seri * clone. *

* - * @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. *

* - * @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/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/CommonPhysicalPropertyMethod.java b/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/CommonPhysicalPropertyMethod.java similarity index 61% rename from src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/CommonPhysicalPropertyMethod.java rename to src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/CommonPhysicalPropertyMethod.java index 573016374c..c3964368e2 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/CommonPhysicalPropertyMethod.java +++ b/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/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; /** *

@@ -21,8 +21,7 @@ public abstract class CommonPhysicalPropertyMethod extends PhysicalPropertyMetho * Constructor for CommonPhysicalPropertyMethod. *

* - * @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/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/conductivity/Conductivity.java b/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/conductivity/Conductivity.java similarity index 62% rename from src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/conductivity/Conductivity.java rename to src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/conductivity/Conductivity.java index 6e2ad85341..4a88d97126 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/conductivity/Conductivity.java +++ b/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/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. *

* - * @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/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/conductivity/PFCTConductivityMethodMod86.java b/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/conductivity/PFCTConductivityMethodMod86.java similarity index 98% rename from src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/conductivity/PFCTConductivityMethodMod86.java rename to src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/conductivity/PFCTConductivityMethodMod86.java index 74bd52338f..1ed649637f 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/conductivity/PFCTConductivityMethodMod86.java +++ b/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/conductivity/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. *

* - * @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/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/diffusivity/CorrespondingStatesDiffusivity.java b/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/diffusivity/CorrespondingStatesDiffusivity.java similarity index 86% rename from src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/diffusivity/CorrespondingStatesDiffusivity.java rename to src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/diffusivity/CorrespondingStatesDiffusivity.java index 61b7495fa8..90aca812ac 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/diffusivity/CorrespondingStatesDiffusivity.java +++ b/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/diffusivity/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. *

* - * @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/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/diffusivity/Diffusivity.java b/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/diffusivity/Diffusivity.java similarity index 87% rename from src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/diffusivity/Diffusivity.java rename to src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/diffusivity/Diffusivity.java index 69db59f3f6..2a279b0acd 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/diffusivity/Diffusivity.java +++ b/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/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; /** *

@@ -27,8 +27,7 @@ public class Diffusivity extends CommonPhysicalPropertyMethod implements Diffusi * Constructor for Diffusivity. *

* - * @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/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/viscosity/FrictionTheoryViscosityMethod.java b/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/FrictionTheoryViscosityMethod.java similarity index 97% rename from src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/viscosity/FrictionTheoryViscosityMethod.java rename to src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/FrictionTheoryViscosityMethod.java index 71d3dda998..c14cf4ae7e 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/viscosity/FrictionTheoryViscosityMethod.java +++ b/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/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; /** *

@@ -55,7 +55,7 @@ public class FrictionTheoryViscosityMethod extends Viscosity * Constructor for FrictionTheoryViscosityMethod. *

* - * @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/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/viscosity/LBCViscosityMethod.java b/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/LBCViscosityMethod.java similarity index 91% rename from src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/viscosity/LBCViscosityMethod.java rename to src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/LBCViscosityMethod.java index 646f1ef621..d593db718f 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/viscosity/LBCViscosityMethod.java +++ b/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/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; /** *

@@ -23,7 +23,7 @@ public class LBCViscosityMethod extends Viscosity { * Constructor for LBCViscosityMethod. *

* - * @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/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/viscosity/PFCTViscosityMethod.java b/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/PFCTViscosityMethod.java similarity index 96% rename from src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/viscosity/PFCTViscosityMethod.java rename to src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/PFCTViscosityMethod.java index 7b25eed37b..e6d40eea1c 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/viscosity/PFCTViscosityMethod.java +++ b/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/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. *

* - * @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/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/viscosity/PFCTViscosityMethodHeavyOil.java b/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/PFCTViscosityMethodHeavyOil.java similarity index 97% rename from src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/viscosity/PFCTViscosityMethodHeavyOil.java rename to src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/PFCTViscosityMethodHeavyOil.java index 796afedb3c..3b21867b06 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/viscosity/PFCTViscosityMethodHeavyOil.java +++ b/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/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. *

* - * @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/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/viscosity/PFCTViscosityMethodMod86.java b/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/PFCTViscosityMethodMod86.java similarity index 96% rename from src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/viscosity/PFCTViscosityMethodMod86.java rename to src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/PFCTViscosityMethodMod86.java index 38856215a7..516eb19aec 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/viscosity/PFCTViscosityMethodMod86.java +++ b/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/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. *

* - * @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/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/viscosity/Viscosity.java b/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/Viscosity.java similarity index 90% rename from src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/viscosity/Viscosity.java rename to src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/Viscosity.java index 9067e1b744..7dc3e76f77 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/viscosity/Viscosity.java +++ b/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/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. *

* - * @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/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/GasPhysicalPropertyMethod.java b/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/GasPhysicalPropertyMethod.java similarity index 85% rename from src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/GasPhysicalPropertyMethod.java rename to src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/GasPhysicalPropertyMethod.java index 9cc61ada19..8fd20b1b75 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/GasPhysicalPropertyMethod.java +++ b/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/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; /** *

@@ -24,8 +24,7 @@ public abstract class GasPhysicalPropertyMethod extends PhysicalPropertyMethod { * Constructor for GasPhysicalPropertyMethod. *

* - * @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/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/conductivity/ChungConductivityMethod.java b/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/conductivity/ChungConductivityMethod.java similarity index 92% rename from src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/conductivity/ChungConductivityMethod.java rename to src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/conductivity/ChungConductivityMethod.java index b2cb78fbc3..99b318f0d3 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/conductivity/ChungConductivityMethod.java +++ b/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/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; /** *

@@ -20,7 +20,7 @@ public class ChungConductivityMethod extends Conductivity { * Constructor for ChungConductivityMethod. *

* - * @param gasPhase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} object + * @param gasPhase a {@link neqsim.physicalproperties.system.PhysicalProperties} object */ public ChungConductivityMethod(PhysicalProperties gasPhase) { super(gasPhase); diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/conductivity/Conductivity.java b/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/conductivity/Conductivity.java similarity index 65% rename from src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/conductivity/Conductivity.java rename to src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/conductivity/Conductivity.java index 366491d2ac..20765be306 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/conductivity/Conductivity.java +++ b/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/conductivity/Conductivity.java @@ -4,13 +4,13 @@ * Created on 1. november 2000, 19:00 */ -package neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.conductivity; +package neqsim.physicalproperties.methods.gasphysicalproperties.conductivity; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.GasPhysicalPropertyMethod; -import neqsim.physicalproperties.physicalpropertymethods.methodinterface.ConductivityInterface; -import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties; +import neqsim.physicalproperties.methods.gasphysicalproperties.GasPhysicalPropertyMethod; +import neqsim.physicalproperties.methods.methodinterface.ConductivityInterface; +import neqsim.physicalproperties.system.PhysicalProperties; /** * Abstract class Conductivity for gases. @@ -29,8 +29,7 @@ public abstract class Conductivity extends GasPhysicalPropertyMethod * Constructor for Conductivity. *

* - * @param gasPhase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} - * object + * @param gasPhase a {@link neqsim.physicalproperties.system.PhysicalProperties} object */ public Conductivity(PhysicalProperties gasPhase) { super(gasPhase); diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/density/Density.java b/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/density/Density.java similarity index 76% rename from src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/density/Density.java rename to src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/density/Density.java index 5db9a9124c..f8c7821373 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/density/Density.java +++ b/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/density/Density.java @@ -4,13 +4,13 @@ * Created on 24. januar 2001, 19:49 */ -package neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.density; +package neqsim.physicalproperties.methods.gasphysicalproperties.density; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.GasPhysicalPropertyMethod; -import neqsim.physicalproperties.physicalpropertymethods.methodinterface.DensityInterface; -import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties; +import neqsim.physicalproperties.methods.gasphysicalproperties.GasPhysicalPropertyMethod; +import neqsim.physicalproperties.methods.methodinterface.DensityInterface; +import neqsim.physicalproperties.system.PhysicalProperties; /** *

@@ -29,8 +29,7 @@ public class Density extends GasPhysicalPropertyMethod implements DensityInterfa * Constructor for Density. *

* - * @param gasPhase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} - * object + * @param gasPhase a {@link neqsim.physicalproperties.system.PhysicalProperties} object */ public Density(PhysicalProperties gasPhase) { super(gasPhase); diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/diffusivity/Diffusivity.java b/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/diffusivity/Diffusivity.java similarity index 90% rename from src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/diffusivity/Diffusivity.java rename to src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/diffusivity/Diffusivity.java index a3e50e73a1..6f2d5902dc 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/diffusivity/Diffusivity.java +++ b/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/diffusivity/Diffusivity.java @@ -1,10 +1,10 @@ -package neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.diffusivity; +package neqsim.physicalproperties.methods.gasphysicalproperties.diffusivity; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.GasPhysicalPropertyMethod; -import neqsim.physicalproperties.physicalpropertymethods.methodinterface.DiffusivityInterface; -import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties; +import neqsim.physicalproperties.methods.gasphysicalproperties.GasPhysicalPropertyMethod; +import neqsim.physicalproperties.methods.methodinterface.DiffusivityInterface; +import neqsim.physicalproperties.system.PhysicalProperties; /** *

@@ -27,8 +27,7 @@ public class Diffusivity extends GasPhysicalPropertyMethod implements Diffusivit * Constructor for Diffusivity. *

* - * @param gasPhase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} - * object + * @param gasPhase a {@link neqsim.physicalproperties.system.PhysicalProperties} object */ public Diffusivity(PhysicalProperties gasPhase) { super(gasPhase); diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/diffusivity/WilkeLeeDiffusivity.java b/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/diffusivity/WilkeLeeDiffusivity.java similarity index 87% rename from src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/diffusivity/WilkeLeeDiffusivity.java rename to src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/diffusivity/WilkeLeeDiffusivity.java index 86395c246f..ae1b46d8d9 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/diffusivity/WilkeLeeDiffusivity.java +++ b/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/diffusivity/WilkeLeeDiffusivity.java @@ -1,6 +1,6 @@ -package neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.diffusivity; +package neqsim.physicalproperties.methods.gasphysicalproperties.diffusivity; -import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties; +import neqsim.physicalproperties.system.PhysicalProperties; /** *

@@ -22,7 +22,7 @@ public class WilkeLeeDiffusivity extends Diffusivity { * Constructor for WilkeLeeDiffusivity. *

* - * @param gasPhase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} object + * @param gasPhase a {@link neqsim.physicalproperties.system.PhysicalProperties} object */ public WilkeLeeDiffusivity(PhysicalProperties gasPhase) { super(gasPhase); diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/viscosity/ChungViscosityMethod.java b/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/viscosity/ChungViscosityMethod.java similarity index 95% rename from src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/viscosity/ChungViscosityMethod.java rename to src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/viscosity/ChungViscosityMethod.java index 879f1d19fc..328784d668 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/viscosity/ChungViscosityMethod.java +++ b/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/viscosity/ChungViscosityMethod.java @@ -4,9 +4,9 @@ * Created on 1. august 2001, 12:44 */ -package neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.viscosity; +package neqsim.physicalproperties.methods.gasphysicalproperties.viscosity; -import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties; +import neqsim.physicalproperties.system.PhysicalProperties; /** *

@@ -40,7 +40,7 @@ public class ChungViscosityMethod extends Viscosity { * Constructor for ChungViscosityMethod. *

* - * @param gasPhase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} object + * @param gasPhase a {@link neqsim.physicalproperties.system.PhysicalProperties} object */ public ChungViscosityMethod(PhysicalProperties gasPhase) { super(gasPhase); diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/viscosity/Viscosity.java b/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/viscosity/Viscosity.java similarity index 61% rename from src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/viscosity/Viscosity.java rename to src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/viscosity/Viscosity.java index 6a69c2a78a..b73c4eb79c 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/viscosity/Viscosity.java +++ b/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/viscosity/Viscosity.java @@ -1,10 +1,10 @@ -package neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.viscosity; +package neqsim.physicalproperties.methods.gasphysicalproperties.viscosity; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.GasPhysicalPropertyMethod; -import neqsim.physicalproperties.physicalpropertymethods.methodinterface.ViscosityInterface; -import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties; +import neqsim.physicalproperties.methods.gasphysicalproperties.GasPhysicalPropertyMethod; +import neqsim.physicalproperties.methods.methodinterface.ViscosityInterface; +import neqsim.physicalproperties.system.PhysicalProperties; /** * Abstract class for Viscosity property. @@ -20,8 +20,7 @@ public abstract class Viscosity extends GasPhysicalPropertyMethod implements Vis * Constructor for Viscosity. *

* - * @param gasPhase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} - * object + * @param gasPhase a {@link neqsim.physicalproperties.system.PhysicalProperties} object */ public Viscosity(PhysicalProperties gasPhase) { super(gasPhase); diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/LiquidPhysicalPropertyMethod.java b/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/LiquidPhysicalPropertyMethod.java similarity index 62% rename from src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/LiquidPhysicalPropertyMethod.java rename to src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/LiquidPhysicalPropertyMethod.java index 9a7b80c859..8d74315996 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/LiquidPhysicalPropertyMethod.java +++ b/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/LiquidPhysicalPropertyMethod.java @@ -1,7 +1,7 @@ -package neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties; +package neqsim.physicalproperties.methods.liquidphysicalproperties; -import neqsim.physicalproperties.physicalpropertymethods.PhysicalPropertyMethod; -import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties; +import neqsim.physicalproperties.methods.PhysicalPropertyMethod; +import neqsim.physicalproperties.system.PhysicalProperties; /** *

@@ -21,8 +21,7 @@ public abstract class LiquidPhysicalPropertyMethod extends PhysicalPropertyMetho * Constructor for LiquidPhysicalPropertyMethod. *

* - * @param liquidPhase a - * {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} object + * @param liquidPhase a {@link neqsim.physicalproperties.system.PhysicalProperties} object */ public LiquidPhysicalPropertyMethod(PhysicalProperties liquidPhase) { super(liquidPhase); diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/conductivity/Conductivity.java b/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/conductivity/Conductivity.java similarity index 85% rename from src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/conductivity/Conductivity.java rename to src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/conductivity/Conductivity.java index d08cddc33b..ee0f2b82f8 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/conductivity/Conductivity.java +++ b/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/conductivity/Conductivity.java @@ -4,13 +4,13 @@ * Created on 1. november 2000, 19:00 */ -package neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.conductivity; +package neqsim.physicalproperties.methods.liquidphysicalproperties.conductivity; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.LiquidPhysicalPropertyMethod; -import neqsim.physicalproperties.physicalpropertymethods.methodinterface.ConductivityInterface; -import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties; +import neqsim.physicalproperties.methods.liquidphysicalproperties.LiquidPhysicalPropertyMethod; +import neqsim.physicalproperties.methods.methodinterface.ConductivityInterface; +import neqsim.physicalproperties.system.PhysicalProperties; /** *

@@ -32,8 +32,7 @@ public class Conductivity extends LiquidPhysicalPropertyMethod implements Conduc * Constructor for Conductivity. *

* - * @param liquidPhase a - * {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} object + * @param liquidPhase a {@link neqsim.physicalproperties.system.PhysicalProperties} object */ public Conductivity(PhysicalProperties liquidPhase) { super(liquidPhase); diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/density/Costald.java b/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/density/Costald.java similarity index 91% rename from src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/density/Costald.java rename to src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/density/Costald.java index e7b62de7f1..2557810003 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/density/Costald.java +++ b/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/density/Costald.java @@ -4,13 +4,13 @@ * Created on 13. July 2022 */ -package neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.density; +package neqsim.physicalproperties.methods.liquidphysicalproperties.density; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.LiquidPhysicalPropertyMethod; -import neqsim.physicalproperties.physicalpropertymethods.methodinterface.DensityInterface; -import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties; +import neqsim.physicalproperties.methods.liquidphysicalproperties.LiquidPhysicalPropertyMethod; +import neqsim.physicalproperties.methods.methodinterface.DensityInterface; +import neqsim.physicalproperties.system.PhysicalProperties; /** *

@@ -29,8 +29,7 @@ public class Costald extends LiquidPhysicalPropertyMethod implements DensityInte * Constructor for Costald. *

* - * @param liquidPhase a - * {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} object + * @param liquidPhase a {@link neqsim.physicalproperties.system.PhysicalProperties} object */ public Costald(PhysicalProperties liquidPhase) { super(liquidPhase); diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/density/Density.java b/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/density/Density.java similarity index 76% rename from src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/density/Density.java rename to src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/density/Density.java index e92a43c0da..d891dee534 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/density/Density.java +++ b/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/density/Density.java @@ -4,13 +4,13 @@ * Created on 24. januar 2001, 19:49 */ -package neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.density; +package neqsim.physicalproperties.methods.liquidphysicalproperties.density; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.LiquidPhysicalPropertyMethod; -import neqsim.physicalproperties.physicalpropertymethods.methodinterface.DensityInterface; -import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties; +import neqsim.physicalproperties.methods.liquidphysicalproperties.LiquidPhysicalPropertyMethod; +import neqsim.physicalproperties.methods.methodinterface.DensityInterface; +import neqsim.physicalproperties.system.PhysicalProperties; /** *

@@ -29,8 +29,7 @@ public class Density extends LiquidPhysicalPropertyMethod implements DensityInte * Constructor for Density. *

* - * @param liquidPhase a - * {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} object + * @param liquidPhase a {@link neqsim.physicalproperties.system.PhysicalProperties} object */ public Density(PhysicalProperties liquidPhase) { super(liquidPhase); diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/diffusivity/AmineDiffusivity.java b/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/diffusivity/AmineDiffusivity.java similarity index 92% rename from src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/diffusivity/AmineDiffusivity.java rename to src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/diffusivity/AmineDiffusivity.java index 3e240911d2..cd7c78b444 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/diffusivity/AmineDiffusivity.java +++ b/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/diffusivity/AmineDiffusivity.java @@ -1,8 +1,8 @@ -package neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.diffusivity; +package neqsim.physicalproperties.methods.liquidphysicalproperties.diffusivity; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties; +import neqsim.physicalproperties.system.PhysicalProperties; /** *

@@ -21,7 +21,7 @@ public class AmineDiffusivity extends SiddiqiLucasMethod { * Constructor for AmineDiffusivity. *

* - * @param liquidPhase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} object + * @param liquidPhase a {@link neqsim.physicalproperties.system.PhysicalProperties} object */ public AmineDiffusivity(PhysicalProperties liquidPhase) { super(liquidPhase); diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/diffusivity/CO2water.java b/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/diffusivity/CO2water.java similarity index 70% rename from src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/diffusivity/CO2water.java rename to src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/diffusivity/CO2water.java index cbb3bd95d1..f2bf8a768c 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/diffusivity/CO2water.java +++ b/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/diffusivity/CO2water.java @@ -1,6 +1,6 @@ -package neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.diffusivity; +package neqsim.physicalproperties.methods.liquidphysicalproperties.diffusivity; -import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties; +import neqsim.physicalproperties.system.PhysicalProperties; /** *

@@ -18,7 +18,7 @@ public class CO2water extends Diffusivity { * Constructor for CO2water. *

* - * @param liquidPhase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} object + * @param liquidPhase a {@link neqsim.physicalproperties.system.PhysicalProperties} object */ public CO2water(PhysicalProperties liquidPhase) { super(liquidPhase); diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/diffusivity/Diffusivity.java b/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/diffusivity/Diffusivity.java similarity index 88% rename from src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/diffusivity/Diffusivity.java rename to src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/diffusivity/Diffusivity.java index 230f42545f..b50b2dc0f6 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/diffusivity/Diffusivity.java +++ b/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/diffusivity/Diffusivity.java @@ -1,10 +1,10 @@ -package neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.diffusivity; +package neqsim.physicalproperties.methods.liquidphysicalproperties.diffusivity; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.LiquidPhysicalPropertyMethod; -import neqsim.physicalproperties.physicalpropertymethods.methodinterface.DiffusivityInterface; -import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties; +import neqsim.physicalproperties.methods.liquidphysicalproperties.LiquidPhysicalPropertyMethod; +import neqsim.physicalproperties.methods.methodinterface.DiffusivityInterface; +import neqsim.physicalproperties.system.PhysicalProperties; /** * Diffusivity class. @@ -23,8 +23,7 @@ abstract class Diffusivity extends LiquidPhysicalPropertyMethod implements Diffu * Constructor for Diffusivity. *

* - * @param liquidPhase a - * {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} object + * @param liquidPhase a {@link neqsim.physicalproperties.system.PhysicalProperties} object */ public Diffusivity(PhysicalProperties liquidPhase) { super(liquidPhase); diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/diffusivity/SiddiqiLucasMethod.java b/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/diffusivity/SiddiqiLucasMethod.java similarity index 87% rename from src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/diffusivity/SiddiqiLucasMethod.java rename to src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/diffusivity/SiddiqiLucasMethod.java index ff7448ea8d..12157e6705 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/diffusivity/SiddiqiLucasMethod.java +++ b/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/diffusivity/SiddiqiLucasMethod.java @@ -1,6 +1,6 @@ -package neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.diffusivity; +package neqsim.physicalproperties.methods.liquidphysicalproperties.diffusivity; -import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties; +import neqsim.physicalproperties.system.PhysicalProperties; /** *

@@ -18,7 +18,7 @@ public class SiddiqiLucasMethod extends Diffusivity { * Constructor for SiddiqiLucasMethod. *

* - * @param liquidPhase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} object + * @param liquidPhase a {@link neqsim.physicalproperties.system.PhysicalProperties} object */ public SiddiqiLucasMethod(PhysicalProperties liquidPhase) { super(liquidPhase); diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/viscosity/AmineViscosity.java b/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/viscosity/AmineViscosity.java similarity index 80% rename from src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/viscosity/AmineViscosity.java rename to src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/viscosity/AmineViscosity.java index 72ee3acd4b..dd2bb2253b 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/viscosity/AmineViscosity.java +++ b/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/viscosity/AmineViscosity.java @@ -1,6 +1,6 @@ -package neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.viscosity; +package neqsim.physicalproperties.methods.liquidphysicalproperties.viscosity; -import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties; +import neqsim.physicalproperties.system.PhysicalProperties; /** *

@@ -18,7 +18,7 @@ public class AmineViscosity extends Viscosity { * Constructor for AmineViscosity. *

* - * @param liquidPhase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} object + * @param liquidPhase a {@link neqsim.physicalproperties.system.PhysicalProperties} object */ public AmineViscosity(PhysicalProperties liquidPhase) { super(liquidPhase); diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/viscosity/Viscosity.java b/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/viscosity/Viscosity.java similarity index 92% rename from src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/viscosity/Viscosity.java rename to src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/viscosity/Viscosity.java index 873a0d0695..6e5f42766c 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/viscosity/Viscosity.java +++ b/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/viscosity/Viscosity.java @@ -1,10 +1,10 @@ -package neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.viscosity; +package neqsim.physicalproperties.methods.liquidphysicalproperties.viscosity; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.LiquidPhysicalPropertyMethod; -import neqsim.physicalproperties.physicalpropertymethods.methodinterface.ViscosityInterface; -import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties; +import neqsim.physicalproperties.methods.liquidphysicalproperties.LiquidPhysicalPropertyMethod; +import neqsim.physicalproperties.methods.methodinterface.ViscosityInterface; +import neqsim.physicalproperties.system.PhysicalProperties; /** *

@@ -25,8 +25,7 @@ public class Viscosity extends LiquidPhysicalPropertyMethod implements Viscosity * Constructor for Viscosity. *

* - * @param liquidPhase a - * {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} object + * @param liquidPhase a {@link neqsim.physicalproperties.system.PhysicalProperties} object */ public Viscosity(PhysicalProperties liquidPhase) { super(liquidPhase); diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/methodinterface/ConductivityInterface.java b/src/main/java/neqsim/physicalproperties/methods/methodinterface/ConductivityInterface.java similarity index 74% rename from src/main/java/neqsim/physicalproperties/physicalpropertymethods/methodinterface/ConductivityInterface.java rename to src/main/java/neqsim/physicalproperties/methods/methodinterface/ConductivityInterface.java index 4355a512cc..3ef329605f 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/methodinterface/ConductivityInterface.java +++ b/src/main/java/neqsim/physicalproperties/methods/methodinterface/ConductivityInterface.java @@ -1,6 +1,6 @@ -package neqsim.physicalproperties.physicalpropertymethods.methodinterface; +package neqsim.physicalproperties.methods.methodinterface; -import neqsim.physicalproperties.physicalpropertymethods.PhysicalPropertyMethodInterface; +import neqsim.physicalproperties.methods.PhysicalPropertyMethodInterface; import neqsim.thermo.ThermodynamicConstantsInterface; /** diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/methodinterface/DensityInterface.java b/src/main/java/neqsim/physicalproperties/methods/methodinterface/DensityInterface.java similarity index 75% rename from src/main/java/neqsim/physicalproperties/physicalpropertymethods/methodinterface/DensityInterface.java rename to src/main/java/neqsim/physicalproperties/methods/methodinterface/DensityInterface.java index 3654877225..cec0ef6c6f 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/methodinterface/DensityInterface.java +++ b/src/main/java/neqsim/physicalproperties/methods/methodinterface/DensityInterface.java @@ -1,6 +1,6 @@ -package neqsim.physicalproperties.physicalpropertymethods.methodinterface; +package neqsim.physicalproperties.methods.methodinterface; -import neqsim.physicalproperties.physicalpropertymethods.PhysicalPropertyMethodInterface; +import neqsim.physicalproperties.methods.PhysicalPropertyMethodInterface; import neqsim.thermo.ThermodynamicConstantsInterface; /** diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/methodinterface/DiffusivityInterface.java b/src/main/java/neqsim/physicalproperties/methods/methodinterface/DiffusivityInterface.java similarity index 90% rename from src/main/java/neqsim/physicalproperties/physicalpropertymethods/methodinterface/DiffusivityInterface.java rename to src/main/java/neqsim/physicalproperties/methods/methodinterface/DiffusivityInterface.java index bb7ae9f1e4..c0826e6bdd 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/methodinterface/DiffusivityInterface.java +++ b/src/main/java/neqsim/physicalproperties/methods/methodinterface/DiffusivityInterface.java @@ -1,6 +1,6 @@ -package neqsim.physicalproperties.physicalpropertymethods.methodinterface; +package neqsim.physicalproperties.methods.methodinterface; -import neqsim.physicalproperties.physicalpropertymethods.PhysicalPropertyMethodInterface; +import neqsim.physicalproperties.methods.PhysicalPropertyMethodInterface; import neqsim.thermo.ThermodynamicConstantsInterface; /** diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/methodinterface/ViscosityInterface.java b/src/main/java/neqsim/physicalproperties/methods/methodinterface/ViscosityInterface.java similarity index 76% rename from src/main/java/neqsim/physicalproperties/physicalpropertymethods/methodinterface/ViscosityInterface.java rename to src/main/java/neqsim/physicalproperties/methods/methodinterface/ViscosityInterface.java index 9d34b48439..7934dc1e5d 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/methodinterface/ViscosityInterface.java +++ b/src/main/java/neqsim/physicalproperties/methods/methodinterface/ViscosityInterface.java @@ -1,6 +1,6 @@ -package neqsim.physicalproperties.physicalpropertymethods.methodinterface; +package neqsim.physicalproperties.methods.methodinterface; -import neqsim.physicalproperties.physicalpropertymethods.PhysicalPropertyMethodInterface; +import neqsim.physicalproperties.methods.PhysicalPropertyMethodInterface; /** *

diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/SolidPhysicalPropertyMethod.java b/src/main/java/neqsim/physicalproperties/methods/solidphysicalproperties/SolidPhysicalPropertyMethod.java similarity index 62% rename from src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/SolidPhysicalPropertyMethod.java rename to src/main/java/neqsim/physicalproperties/methods/solidphysicalproperties/SolidPhysicalPropertyMethod.java index 14e259087f..57859df9ac 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/SolidPhysicalPropertyMethod.java +++ b/src/main/java/neqsim/physicalproperties/methods/solidphysicalproperties/SolidPhysicalPropertyMethod.java @@ -1,7 +1,7 @@ -package neqsim.physicalproperties.physicalpropertymethods.solidphysicalproperties; +package neqsim.physicalproperties.methods.solidphysicalproperties; -import neqsim.physicalproperties.physicalpropertymethods.PhysicalPropertyMethod; -import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties; +import neqsim.physicalproperties.methods.PhysicalPropertyMethod; +import neqsim.physicalproperties.system.PhysicalProperties; /** *

@@ -21,8 +21,7 @@ public abstract class SolidPhysicalPropertyMethod extends PhysicalPropertyMethod * Constructor for SolidPhysicalPropertyMethod. *

* - * @param solidPhase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} - * object + * @param solidPhase a {@link neqsim.physicalproperties.system.PhysicalProperties} object */ public SolidPhysicalPropertyMethod(PhysicalProperties solidPhase) { super(solidPhase); diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/conductivity/Conductivity.java b/src/main/java/neqsim/physicalproperties/methods/solidphysicalproperties/conductivity/Conductivity.java similarity index 71% rename from src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/conductivity/Conductivity.java rename to src/main/java/neqsim/physicalproperties/methods/solidphysicalproperties/conductivity/Conductivity.java index a9e9c56c57..bae6fd4b16 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/conductivity/Conductivity.java +++ b/src/main/java/neqsim/physicalproperties/methods/solidphysicalproperties/conductivity/Conductivity.java @@ -4,13 +4,13 @@ * Created on 1. november 2000, 19:00 */ -package neqsim.physicalproperties.physicalpropertymethods.solidphysicalproperties.conductivity; +package neqsim.physicalproperties.methods.solidphysicalproperties.conductivity; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.physicalproperties.physicalpropertymethods.methodinterface.ConductivityInterface; -import neqsim.physicalproperties.physicalpropertymethods.solidphysicalproperties.SolidPhysicalPropertyMethod; -import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties; +import neqsim.physicalproperties.methods.methodinterface.ConductivityInterface; +import neqsim.physicalproperties.methods.solidphysicalproperties.SolidPhysicalPropertyMethod; +import neqsim.physicalproperties.system.PhysicalProperties; import neqsim.thermo.phase.PhaseType; /** @@ -32,8 +32,7 @@ public class Conductivity extends SolidPhysicalPropertyMethod implements Conduct * Constructor for Conductivity. *

* - * @param solidPhase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} - * object + * @param solidPhase a {@link neqsim.physicalproperties.system.PhysicalProperties} object */ public Conductivity(PhysicalProperties solidPhase) { super(solidPhase); diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/density/Density.java b/src/main/java/neqsim/physicalproperties/methods/solidphysicalproperties/density/Density.java similarity index 76% rename from src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/density/Density.java rename to src/main/java/neqsim/physicalproperties/methods/solidphysicalproperties/density/Density.java index 732d973704..83a485e1a7 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/density/Density.java +++ b/src/main/java/neqsim/physicalproperties/methods/solidphysicalproperties/density/Density.java @@ -4,13 +4,13 @@ * Created on 24. januar 2001, 19:49 */ -package neqsim.physicalproperties.physicalpropertymethods.solidphysicalproperties.density; +package neqsim.physicalproperties.methods.solidphysicalproperties.density; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.physicalproperties.physicalpropertymethods.methodinterface.DensityInterface; -import neqsim.physicalproperties.physicalpropertymethods.solidphysicalproperties.SolidPhysicalPropertyMethod; -import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties; +import neqsim.physicalproperties.methods.methodinterface.DensityInterface; +import neqsim.physicalproperties.methods.solidphysicalproperties.SolidPhysicalPropertyMethod; +import neqsim.physicalproperties.system.PhysicalProperties; /** *

@@ -29,8 +29,7 @@ public class Density extends SolidPhysicalPropertyMethod implements DensityInter * Constructor for Density. *

* - * @param liquidPhase a - * {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} object + * @param liquidPhase a {@link neqsim.physicalproperties.system.PhysicalProperties} object */ public Density(PhysicalProperties liquidPhase) { super(liquidPhase); diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/diffusivity/Diffusivity.java b/src/main/java/neqsim/physicalproperties/methods/solidphysicalproperties/diffusivity/Diffusivity.java similarity index 84% rename from src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/diffusivity/Diffusivity.java rename to src/main/java/neqsim/physicalproperties/methods/solidphysicalproperties/diffusivity/Diffusivity.java index 81aff805ae..3dd3ff1785 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/diffusivity/Diffusivity.java +++ b/src/main/java/neqsim/physicalproperties/methods/solidphysicalproperties/diffusivity/Diffusivity.java @@ -1,10 +1,10 @@ -package neqsim.physicalproperties.physicalpropertymethods.solidphysicalproperties.diffusivity; +package neqsim.physicalproperties.methods.solidphysicalproperties.diffusivity; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.physicalproperties.physicalpropertymethods.methodinterface.DiffusivityInterface; -import neqsim.physicalproperties.physicalpropertymethods.solidphysicalproperties.SolidPhysicalPropertyMethod; -import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties; +import neqsim.physicalproperties.methods.methodinterface.DiffusivityInterface; +import neqsim.physicalproperties.methods.solidphysicalproperties.SolidPhysicalPropertyMethod; +import neqsim.physicalproperties.system.PhysicalProperties; /** *

@@ -26,8 +26,7 @@ public class Diffusivity extends SolidPhysicalPropertyMethod implements Diffusiv * Constructor for Diffusivity. *

* - * @param solidPhase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} - * object + * @param solidPhase a {@link neqsim.physicalproperties.system.PhysicalProperties} object */ public Diffusivity(PhysicalProperties solidPhase) { super(solidPhase); diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/viscosity/Viscosity.java b/src/main/java/neqsim/physicalproperties/methods/solidphysicalproperties/viscosity/Viscosity.java similarity index 75% rename from src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/viscosity/Viscosity.java rename to src/main/java/neqsim/physicalproperties/methods/solidphysicalproperties/viscosity/Viscosity.java index 1f3d13f5f5..3e63cc1e9e 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/viscosity/Viscosity.java +++ b/src/main/java/neqsim/physicalproperties/methods/solidphysicalproperties/viscosity/Viscosity.java @@ -1,11 +1,11 @@ -package neqsim.physicalproperties.physicalpropertymethods.solidphysicalproperties.viscosity; +package neqsim.physicalproperties.methods.solidphysicalproperties.viscosity; import static java.lang.Double.NaN; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.physicalproperties.physicalpropertymethods.methodinterface.ViscosityInterface; -import neqsim.physicalproperties.physicalpropertymethods.solidphysicalproperties.SolidPhysicalPropertyMethod; -import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties; +import neqsim.physicalproperties.methods.methodinterface.ViscosityInterface; +import neqsim.physicalproperties.methods.solidphysicalproperties.SolidPhysicalPropertyMethod; +import neqsim.physicalproperties.system.PhysicalProperties; /** *

@@ -26,8 +26,7 @@ public class Viscosity extends SolidPhysicalPropertyMethod implements ViscosityI * Constructor for Viscosity. *

* - * @param solidPhase a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} - * object + * @param solidPhase a {@link neqsim.physicalproperties.system.PhysicalProperties} object */ public Viscosity(PhysicalProperties solidPhase) { super(solidPhase); diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/density/temp b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/density/temp deleted file mode 100644 index 046fa3c51d..0000000000 --- a/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/density/temp +++ /dev/null @@ -1,39 +0,0 @@ - public double calcDensity() { - //This class need to be changed to the Costald method - double tempVar = 0.0; - double acsFaactMix =0; - for (int i = 0; i < liquidPhase.getPhase().getNumberOfComponents(); i++) { - acsFaactMix += liquidPhase.getPhase().getComponents()[i].getAcentricFactor()|*Math.sqrt(liquidPhase.getPhase().getComponents()[i].getx()) - - -acsFaactMix Math.pow(acsFaactMix, 2.0) - - liquidPhase.getPhase().getComponents()[i].getCriticalVolume() - liquidPhase.getPhase().getComponents()[i].getTC() - liquidPhase.getPhase().getComponents()[i].PC() - liquidPhase.getPhase().getComponents()[i].getAcentricFactor() - liquidPhase.getPhase().getTemperature() - - liquidPhase.getPhase().getComponent(i).getTriplePointPressure() - - tempVar += liquidPhase.getPhase().getComponents()[i].getx() - * (liquidPhase.getPhase().getComponents()[i].getVolumeCorrection() - + liquidPhase.getPhase().getComponents()[i].getVolumeCorrectionT() - * (liquidPhase.getPhase().getTemperature() - 288.15)); - } - // System.out.println("density correction tempvar " + tempVar); - return 1.0 / (liquidPhase.getPhase().getMolarVolume() - tempVar) - * liquidPhase.getPhase().getMolarMass() * 1.0e5; - } - - - } - - @Test - void testCalcDensity() { - testSystem.getPhase("oil").getPhysicalProperties().setDensityModel("Costald"); - double costaldDensity = testSystem.getPhase("oil").getPhysicalProperties().calcDensity(); - double costaldVolume = 1.0/costaldDensity * testSystem.getPhase("oil").getMolarMass() *1e6; - assertEquals(99.05, costaldVolume, 1e-3); - } -} diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertysystem/solidphysicalproperties/SolidPhysicalProperties.java b/src/main/java/neqsim/physicalproperties/physicalpropertysystem/solidphysicalproperties/SolidPhysicalProperties.java deleted file mode 100644 index f74ae48b9f..0000000000 --- a/src/main/java/neqsim/physicalproperties/physicalpropertysystem/solidphysicalproperties/SolidPhysicalProperties.java +++ /dev/null @@ -1,40 +0,0 @@ -package neqsim.physicalproperties.physicalpropertysystem.solidphysicalproperties; - -import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties; -import neqsim.thermo.phase.PhaseInterface; - -/** - *

- * SolidPhysicalProperties class. - *

- * - * @author esol - * @version $Id: $Id - */ -public class SolidPhysicalProperties extends PhysicalProperties { - private static final long serialVersionUID = 1000; - - /** - *

- * Constructor for SolidPhysicalProperties. - *

- * - * @param phase a {@link neqsim.thermo.phase.PhaseInterface} object - */ - public SolidPhysicalProperties(PhaseInterface phase) { - super(phase); - conductivityCalc = - new neqsim.physicalproperties.physicalpropertymethods.solidphysicalproperties.conductivity.Conductivity( - this); - viscosityCalc = - new neqsim.physicalproperties.physicalpropertymethods.solidphysicalproperties.viscosity.Viscosity( - this); - diffusivityCalc = - new neqsim.physicalproperties.physicalpropertymethods.solidphysicalproperties.diffusivity.Diffusivity( - this); - densityCalc = - new neqsim.physicalproperties.physicalpropertymethods.solidphysicalproperties.density.Density( - this); - this.init(phase); - } -} diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertysystem/PhysicalProperties.java b/src/main/java/neqsim/physicalproperties/system/PhysicalProperties.java similarity index 85% rename from src/main/java/neqsim/physicalproperties/physicalpropertysystem/PhysicalProperties.java rename to src/main/java/neqsim/physicalproperties/system/PhysicalProperties.java index 5cbedb54d7..47d97814e6 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertysystem/PhysicalProperties.java +++ b/src/main/java/neqsim/physicalproperties/system/PhysicalProperties.java @@ -4,27 +4,27 @@ * Created on 29. oktober 2000, 16:13 */ -package neqsim.physicalproperties.physicalpropertysystem; +package neqsim.physicalproperties.system; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import neqsim.physicalproperties.PhysicalPropertyType; +import neqsim.physicalproperties.methods.commonphasephysicalproperties.conductivity.PFCTConductivityMethodMod86; +import neqsim.physicalproperties.methods.commonphasephysicalproperties.diffusivity.CorrespondingStatesDiffusivity; +import neqsim.physicalproperties.methods.commonphasephysicalproperties.viscosity.FrictionTheoryViscosityMethod; +import neqsim.physicalproperties.methods.commonphasephysicalproperties.viscosity.LBCViscosityMethod; +import neqsim.physicalproperties.methods.commonphasephysicalproperties.viscosity.PFCTViscosityMethodHeavyOil; +import neqsim.physicalproperties.methods.commonphasephysicalproperties.viscosity.PFCTViscosityMethodMod86; +import neqsim.physicalproperties.methods.gasphysicalproperties.conductivity.ChungConductivityMethod; +import neqsim.physicalproperties.methods.gasphysicalproperties.diffusivity.WilkeLeeDiffusivity; +import neqsim.physicalproperties.methods.liquidphysicalproperties.density.Costald; +import neqsim.physicalproperties.methods.liquidphysicalproperties.diffusivity.AmineDiffusivity; +import neqsim.physicalproperties.methods.liquidphysicalproperties.diffusivity.SiddiqiLucasMethod; +import neqsim.physicalproperties.methods.methodinterface.ConductivityInterface; +import neqsim.physicalproperties.methods.methodinterface.DensityInterface; +import neqsim.physicalproperties.methods.methodinterface.DiffusivityInterface; +import neqsim.physicalproperties.methods.methodinterface.ViscosityInterface; import neqsim.physicalproperties.mixingrule.PhysicalPropertyMixingRuleInterface; -import neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.conductivity.PFCTConductivityMethodMod86; -import neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.diffusivity.CorrespondingStatesDiffusivity; -import neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.viscosity.FrictionTheoryViscosityMethod; -import neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.viscosity.LBCViscosityMethod; -import neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.viscosity.PFCTViscosityMethodHeavyOil; -import neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.viscosity.PFCTViscosityMethodMod86; -import neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.conductivity.ChungConductivityMethod; -import neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.diffusivity.WilkeLeeDiffusivity; -import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.density.Costald; -import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.diffusivity.AmineDiffusivity; -import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.diffusivity.SiddiqiLucasMethod; -import neqsim.physicalproperties.physicalpropertymethods.methodinterface.ConductivityInterface; -import neqsim.physicalproperties.physicalpropertymethods.methodinterface.DensityInterface; -import neqsim.physicalproperties.physicalpropertymethods.methodinterface.DiffusivityInterface; -import neqsim.physicalproperties.physicalpropertymethods.methodinterface.ViscosityInterface; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.phase.PhaseInterface; @@ -86,7 +86,7 @@ public PhysicalProperties(PhaseInterface phase, int binaryDiffusionCoefficientMe * clone. *

* - * @return a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} object + * @return a {@link neqsim.physicalproperties.system.PhysicalProperties} object */ public PhysicalProperties clone() { PhysicalProperties properties = null; @@ -155,9 +155,7 @@ public void setMixingRuleNull() { * getViscosityModel. *

* - * @return a - * {@link neqsim.physicalproperties.physicalpropertymethods.methodinterface.ViscosityInterface} - * object + * @return a {@link neqsim.physicalproperties.methods.methodinterface.ViscosityInterface} object */ public ViscosityInterface getViscosityModel() { return viscosityCalc; @@ -173,8 +171,7 @@ public ViscosityInterface getViscosityModel() { public void setDensityModel(String model) { if ("Peneloux volume shift".equals(model)) { densityCalc = - new neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.density.Density( - this); + new neqsim.physicalproperties.methods.liquidphysicalproperties.density.Density(this); } else if ("Costald".equals(model)) { densityCalc = new Costald(this); } @@ -192,7 +189,7 @@ public void setConductivityModel(String model) { conductivityCalc = new PFCTConductivityMethodMod86(this); } else if ("polynom".equals(model)) { conductivityCalc = - new neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.conductivity.Conductivity( + new neqsim.physicalproperties.methods.liquidphysicalproperties.conductivity.Conductivity( this); } else if ("Chung".equals(model)) { conductivityCalc = new ChungConductivityMethod(this); @@ -211,8 +208,7 @@ public void setConductivityModel(String model) { public void setViscosityModel(String model) { if ("polynom".equals(model)) { viscosityCalc = - new neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.viscosity.Viscosity( - this); + new neqsim.physicalproperties.methods.liquidphysicalproperties.viscosity.Viscosity(this); } else if ("friction theory".equals(model)) { viscosityCalc = new FrictionTheoryViscosityMethod(this); } else if ("LBC".equals(model)) { @@ -248,8 +244,7 @@ public void setDiffusionCoefficientModel(String model) { * getConductivityModel. *

* - * @return a - * {@link neqsim.physicalproperties.physicalpropertymethods.methodinterface.ConductivityInterface} + * @return a {@link neqsim.physicalproperties.methods.methodinterface.ConductivityInterface} * object */ public ConductivityInterface getConductivityModel() { diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertysystem/PhysicalPropertyModel.java b/src/main/java/neqsim/physicalproperties/system/PhysicalPropertyModel.java similarity index 95% rename from src/main/java/neqsim/physicalproperties/physicalpropertysystem/PhysicalPropertyModel.java rename to src/main/java/neqsim/physicalproperties/system/PhysicalPropertyModel.java index 17cc2b3e3a..d6d9c59b3d 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertysystem/PhysicalPropertyModel.java +++ b/src/main/java/neqsim/physicalproperties/system/PhysicalPropertyModel.java @@ -1,10 +1,10 @@ -package neqsim.physicalproperties.physicalpropertysystem; +package neqsim.physicalproperties.system; import neqsim.util.exception.InvalidInputException; /** - * Types of PhysicalPropertyModel. This is used when initializing PhysicalPropertyhandler. - * + * Types of PhysicalPropertyModel. This is used when initializing PhysicalPropertyhandler. Ω + * * @author ASMF */ public enum PhysicalPropertyModel { diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertysystem/commonphasephysicalproperties/DefaultPhysicalProperties.java b/src/main/java/neqsim/physicalproperties/system/commonphasephysicalproperties/DefaultPhysicalProperties.java similarity index 61% rename from src/main/java/neqsim/physicalproperties/physicalpropertysystem/commonphasephysicalproperties/DefaultPhysicalProperties.java rename to src/main/java/neqsim/physicalproperties/system/commonphasephysicalproperties/DefaultPhysicalProperties.java index 84d22796a1..284bb36954 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertysystem/commonphasephysicalproperties/DefaultPhysicalProperties.java +++ b/src/main/java/neqsim/physicalproperties/system/commonphasephysicalproperties/DefaultPhysicalProperties.java @@ -1,9 +1,9 @@ -package neqsim.physicalproperties.physicalpropertysystem.commonphasephysicalproperties; +package neqsim.physicalproperties.system.commonphasephysicalproperties; -import neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.conductivity.PFCTConductivityMethodMod86; -import neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.diffusivity.CorrespondingStatesDiffusivity; -import neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.viscosity.FrictionTheoryViscosityMethod; -import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties; +import neqsim.physicalproperties.methods.commonphasephysicalproperties.conductivity.PFCTConductivityMethodMod86; +import neqsim.physicalproperties.methods.commonphasephysicalproperties.diffusivity.CorrespondingStatesDiffusivity; +import neqsim.physicalproperties.methods.commonphasephysicalproperties.viscosity.FrictionTheoryViscosityMethod; +import neqsim.physicalproperties.system.PhysicalProperties; import neqsim.thermo.phase.PhaseInterface; /** @@ -36,9 +36,7 @@ public DefaultPhysicalProperties(PhaseInterface phase, int binaryDiffusionCoeffi // viscosityCalc = new LBCViscosityMethod(this); viscosityCalc = new FrictionTheoryViscosityMethod(this); diffusivityCalc = new CorrespondingStatesDiffusivity(this); - densityCalc = - new neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.density.Density( - this); + densityCalc = new neqsim.physicalproperties.methods.gasphysicalproperties.density.Density(this); this.init(phase); } } diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertysystem/gasphysicalproperties/AirPhysicalProperties.java b/src/main/java/neqsim/physicalproperties/system/gasphysicalproperties/AirPhysicalProperties.java similarity index 64% rename from src/main/java/neqsim/physicalproperties/physicalpropertysystem/gasphysicalproperties/AirPhysicalProperties.java rename to src/main/java/neqsim/physicalproperties/system/gasphysicalproperties/AirPhysicalProperties.java index 99535368ca..e45d589a00 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertysystem/gasphysicalproperties/AirPhysicalProperties.java +++ b/src/main/java/neqsim/physicalproperties/system/gasphysicalproperties/AirPhysicalProperties.java @@ -4,10 +4,10 @@ * Created on 13. august 2001, 10:34 */ -package neqsim.physicalproperties.physicalpropertysystem.gasphysicalproperties; +package neqsim.physicalproperties.system.gasphysicalproperties; -import neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.conductivity.ChungConductivityMethod; -import neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.viscosity.ChungViscosityMethod; +import neqsim.physicalproperties.methods.gasphysicalproperties.conductivity.ChungConductivityMethod; +import neqsim.physicalproperties.methods.gasphysicalproperties.viscosity.ChungViscosityMethod; import neqsim.thermo.phase.PhaseInterface; /** @@ -36,13 +36,10 @@ public AirPhysicalProperties(PhaseInterface phase, int binaryDiffusionCoefficien conductivityCalc = new ChungConductivityMethod(this); viscosityCalc = new ChungViscosityMethod(this); diffusivityCalc = - new neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.diffusivity.Diffusivity( - this); + new neqsim.physicalproperties.methods.gasphysicalproperties.diffusivity.Diffusivity(this); // diffusivityCalc = new WilkeLeeDiffusivity(this); - densityCalc = - new neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.density.Density( - this); + densityCalc = new neqsim.physicalproperties.methods.gasphysicalproperties.density.Density(this); this.init(phase); } } diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertysystem/gasphysicalproperties/GasPhysicalProperties.java b/src/main/java/neqsim/physicalproperties/system/gasphysicalproperties/GasPhysicalProperties.java similarity index 72% rename from src/main/java/neqsim/physicalproperties/physicalpropertysystem/gasphysicalproperties/GasPhysicalProperties.java rename to src/main/java/neqsim/physicalproperties/system/gasphysicalproperties/GasPhysicalProperties.java index a9f8d7871a..c96b3a7add 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertysystem/gasphysicalproperties/GasPhysicalProperties.java +++ b/src/main/java/neqsim/physicalproperties/system/gasphysicalproperties/GasPhysicalProperties.java @@ -4,13 +4,13 @@ * Created on 29. oktober 2000, 16:18 */ -package neqsim.physicalproperties.physicalpropertysystem.gasphysicalproperties; +package neqsim.physicalproperties.system.gasphysicalproperties; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.conductivity.PFCTConductivityMethodMod86; -import neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.viscosity.PFCTViscosityMethodHeavyOil; -import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties; +import neqsim.physicalproperties.methods.commonphasephysicalproperties.conductivity.PFCTConductivityMethodMod86; +import neqsim.physicalproperties.methods.commonphasephysicalproperties.viscosity.PFCTViscosityMethodHeavyOil; +import neqsim.physicalproperties.system.PhysicalProperties; import neqsim.thermo.phase.PhaseInterface; /** @@ -46,12 +46,9 @@ public GasPhysicalProperties(PhaseInterface phase, int binaryDiffusionCoefficien // viscosityCalc = new LBCViscosityMethod(this); diffusivityCalc = - new neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.diffusivity.Diffusivity( - this); + new neqsim.physicalproperties.methods.gasphysicalproperties.diffusivity.Diffusivity(this); // diffusivityCalc = new WilkeLeeDiffusivity(this); - densityCalc = - new neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.density.Density( - this); + densityCalc = new neqsim.physicalproperties.methods.gasphysicalproperties.density.Density(this); } /** {@inheritDoc} */ diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertysystem/gasphysicalproperties/NaturalGasPhysicalProperties.java b/src/main/java/neqsim/physicalproperties/system/gasphysicalproperties/NaturalGasPhysicalProperties.java similarity index 66% rename from src/main/java/neqsim/physicalproperties/physicalpropertysystem/gasphysicalproperties/NaturalGasPhysicalProperties.java rename to src/main/java/neqsim/physicalproperties/system/gasphysicalproperties/NaturalGasPhysicalProperties.java index e6568690ec..f6dbd388cb 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertysystem/gasphysicalproperties/NaturalGasPhysicalProperties.java +++ b/src/main/java/neqsim/physicalproperties/system/gasphysicalproperties/NaturalGasPhysicalProperties.java @@ -4,10 +4,10 @@ * Created on 13. august 2001, 10:32 */ -package neqsim.physicalproperties.physicalpropertysystem.gasphysicalproperties; +package neqsim.physicalproperties.system.gasphysicalproperties; -import neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.conductivity.ChungConductivityMethod; -import neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.viscosity.ChungViscosityMethod; +import neqsim.physicalproperties.methods.gasphysicalproperties.conductivity.ChungConductivityMethod; +import neqsim.physicalproperties.methods.gasphysicalproperties.viscosity.ChungViscosityMethod; import neqsim.thermo.phase.PhaseInterface; /** @@ -37,13 +37,10 @@ public NaturalGasPhysicalProperties(PhaseInterface phase, int binaryDiffusionCoe viscosityCalc = new ChungViscosityMethod(this); // viscosityCalc = new PFCTViscosityMethodMod86(this); diffusivityCalc = - new neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.diffusivity.Diffusivity( - this); + new neqsim.physicalproperties.methods.gasphysicalproperties.diffusivity.Diffusivity(this); // diffusivityCalc = new WilkeLeeDiffusivity(this); - densityCalc = - new neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.density.Density( - this); + densityCalc = new neqsim.physicalproperties.methods.gasphysicalproperties.density.Density(this); this.init(phase); } } diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertysystem/liquidphysicalproperties/AminePhysicalProperties.java b/src/main/java/neqsim/physicalproperties/system/liquidphysicalproperties/AminePhysicalProperties.java similarity index 66% rename from src/main/java/neqsim/physicalproperties/physicalpropertysystem/liquidphysicalproperties/AminePhysicalProperties.java rename to src/main/java/neqsim/physicalproperties/system/liquidphysicalproperties/AminePhysicalProperties.java index 9fcb1c01eb..b776fb8689 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertysystem/liquidphysicalproperties/AminePhysicalProperties.java +++ b/src/main/java/neqsim/physicalproperties/system/liquidphysicalproperties/AminePhysicalProperties.java @@ -4,12 +4,12 @@ * Created on 13. august 2001, 10:31 */ -package neqsim.physicalproperties.physicalpropertysystem.liquidphysicalproperties; +package neqsim.physicalproperties.system.liquidphysicalproperties; -import neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.density.Density; -import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.conductivity.Conductivity; -import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.diffusivity.AmineDiffusivity; -import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.viscosity.AmineViscosity; +import neqsim.physicalproperties.methods.gasphysicalproperties.density.Density; +import neqsim.physicalproperties.methods.liquidphysicalproperties.conductivity.Conductivity; +import neqsim.physicalproperties.methods.liquidphysicalproperties.diffusivity.AmineDiffusivity; +import neqsim.physicalproperties.methods.liquidphysicalproperties.viscosity.AmineViscosity; import neqsim.thermo.phase.PhaseInterface; /** diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertysystem/liquidphysicalproperties/CO2waterPhysicalProperties.java b/src/main/java/neqsim/physicalproperties/system/liquidphysicalproperties/CO2waterPhysicalProperties.java similarity index 70% rename from src/main/java/neqsim/physicalproperties/physicalpropertysystem/liquidphysicalproperties/CO2waterPhysicalProperties.java rename to src/main/java/neqsim/physicalproperties/system/liquidphysicalproperties/CO2waterPhysicalProperties.java index 60a8e13935..c79ecdebd5 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertysystem/liquidphysicalproperties/CO2waterPhysicalProperties.java +++ b/src/main/java/neqsim/physicalproperties/system/liquidphysicalproperties/CO2waterPhysicalProperties.java @@ -1,12 +1,12 @@ -package neqsim.physicalproperties.physicalpropertysystem.liquidphysicalproperties; +package neqsim.physicalproperties.system.liquidphysicalproperties; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.conductivity.Conductivity; -import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.density.Density; -import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.diffusivity.CO2water; -import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.viscosity.Viscosity; -import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties; +import neqsim.physicalproperties.methods.liquidphysicalproperties.conductivity.Conductivity; +import neqsim.physicalproperties.methods.liquidphysicalproperties.density.Density; +import neqsim.physicalproperties.methods.liquidphysicalproperties.diffusivity.CO2water; +import neqsim.physicalproperties.methods.liquidphysicalproperties.viscosity.Viscosity; +import neqsim.physicalproperties.system.PhysicalProperties; import neqsim.thermo.phase.PhaseInterface; /** diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertysystem/liquidphysicalproperties/GlycolPhysicalProperties.java b/src/main/java/neqsim/physicalproperties/system/liquidphysicalproperties/GlycolPhysicalProperties.java similarity index 66% rename from src/main/java/neqsim/physicalproperties/physicalpropertysystem/liquidphysicalproperties/GlycolPhysicalProperties.java rename to src/main/java/neqsim/physicalproperties/system/liquidphysicalproperties/GlycolPhysicalProperties.java index fc6fd30b84..ed3e35c366 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertysystem/liquidphysicalproperties/GlycolPhysicalProperties.java +++ b/src/main/java/neqsim/physicalproperties/system/liquidphysicalproperties/GlycolPhysicalProperties.java @@ -4,12 +4,12 @@ * Created on 13. august 2001, 10:31 */ -package neqsim.physicalproperties.physicalpropertysystem.liquidphysicalproperties; +package neqsim.physicalproperties.system.liquidphysicalproperties; -import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.conductivity.Conductivity; -import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.density.Density; -import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.diffusivity.SiddiqiLucasMethod; -import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.viscosity.Viscosity; +import neqsim.physicalproperties.methods.liquidphysicalproperties.conductivity.Conductivity; +import neqsim.physicalproperties.methods.liquidphysicalproperties.density.Density; +import neqsim.physicalproperties.methods.liquidphysicalproperties.diffusivity.SiddiqiLucasMethod; +import neqsim.physicalproperties.methods.liquidphysicalproperties.viscosity.Viscosity; import neqsim.thermo.phase.PhaseInterface; /** diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertysystem/liquidphysicalproperties/LiquidPhysicalProperties.java b/src/main/java/neqsim/physicalproperties/system/liquidphysicalproperties/LiquidPhysicalProperties.java similarity index 73% rename from src/main/java/neqsim/physicalproperties/physicalpropertysystem/liquidphysicalproperties/LiquidPhysicalProperties.java rename to src/main/java/neqsim/physicalproperties/system/liquidphysicalproperties/LiquidPhysicalProperties.java index 90d401f612..62d749b6a1 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertysystem/liquidphysicalproperties/LiquidPhysicalProperties.java +++ b/src/main/java/neqsim/physicalproperties/system/liquidphysicalproperties/LiquidPhysicalProperties.java @@ -4,15 +4,15 @@ * Created on 29. oktober 2000, 16:17 */ -package neqsim.physicalproperties.physicalpropertysystem.liquidphysicalproperties; +package neqsim.physicalproperties.system.liquidphysicalproperties; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.conductivity.PFCTConductivityMethodMod86; -import neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.viscosity.PFCTViscosityMethodHeavyOil; -import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.density.Density; -import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.diffusivity.SiddiqiLucasMethod; -import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties; +import neqsim.physicalproperties.methods.commonphasephysicalproperties.conductivity.PFCTConductivityMethodMod86; +import neqsim.physicalproperties.methods.commonphasephysicalproperties.viscosity.PFCTViscosityMethodHeavyOil; +import neqsim.physicalproperties.methods.liquidphysicalproperties.density.Density; +import neqsim.physicalproperties.methods.liquidphysicalproperties.diffusivity.SiddiqiLucasMethod; +import neqsim.physicalproperties.system.PhysicalProperties; import neqsim.thermo.phase.PhaseInterface; /** diff --git a/src/main/java/neqsim/physicalproperties/physicalpropertysystem/liquidphysicalproperties/WaterPhysicalProperties.java b/src/main/java/neqsim/physicalproperties/system/liquidphysicalproperties/WaterPhysicalProperties.java similarity index 66% rename from src/main/java/neqsim/physicalproperties/physicalpropertysystem/liquidphysicalproperties/WaterPhysicalProperties.java rename to src/main/java/neqsim/physicalproperties/system/liquidphysicalproperties/WaterPhysicalProperties.java index 5a58c55e47..f66c46e6f3 100644 --- a/src/main/java/neqsim/physicalproperties/physicalpropertysystem/liquidphysicalproperties/WaterPhysicalProperties.java +++ b/src/main/java/neqsim/physicalproperties/system/liquidphysicalproperties/WaterPhysicalProperties.java @@ -4,12 +4,12 @@ * Created on 13. august 2001, 10:34 */ -package neqsim.physicalproperties.physicalpropertysystem.liquidphysicalproperties; +package neqsim.physicalproperties.system.liquidphysicalproperties; -import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.conductivity.Conductivity; -import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.density.Density; -import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.diffusivity.SiddiqiLucasMethod; -import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.viscosity.Viscosity; +import neqsim.physicalproperties.methods.liquidphysicalproperties.conductivity.Conductivity; +import neqsim.physicalproperties.methods.liquidphysicalproperties.density.Density; +import neqsim.physicalproperties.methods.liquidphysicalproperties.diffusivity.SiddiqiLucasMethod; +import neqsim.physicalproperties.methods.liquidphysicalproperties.viscosity.Viscosity; import neqsim.thermo.phase.PhaseInterface; /** diff --git a/src/main/java/neqsim/physicalproperties/system/solidphysicalproperties/SolidPhysicalProperties.java b/src/main/java/neqsim/physicalproperties/system/solidphysicalproperties/SolidPhysicalProperties.java new file mode 100644 index 0000000000..7d5e5e3eca --- /dev/null +++ b/src/main/java/neqsim/physicalproperties/system/solidphysicalproperties/SolidPhysicalProperties.java @@ -0,0 +1,37 @@ +package neqsim.physicalproperties.system.solidphysicalproperties; + +import neqsim.physicalproperties.system.PhysicalProperties; +import neqsim.thermo.phase.PhaseInterface; + +/** + *

+ * SolidPhysicalProperties class. + *

+ * + * @author esol + * @version $Id: $Id + */ +public class SolidPhysicalProperties extends PhysicalProperties { + private static final long serialVersionUID = 1000; + + /** + *

+ * Constructor for SolidPhysicalProperties. + *

+ * + * @param phase a {@link neqsim.thermo.phase.PhaseInterface} object + */ + public SolidPhysicalProperties(PhaseInterface phase) { + super(phase); + conductivityCalc = + new neqsim.physicalproperties.methods.solidphysicalproperties.conductivity.Conductivity( + this); + viscosityCalc = + new neqsim.physicalproperties.methods.solidphysicalproperties.viscosity.Viscosity(this); + diffusivityCalc = + new neqsim.physicalproperties.methods.solidphysicalproperties.diffusivity.Diffusivity(this); + densityCalc = + new neqsim.physicalproperties.methods.solidphysicalproperties.density.Density(this); + this.init(phase); + } +} diff --git a/src/main/java/neqsim/pvtsimulation/util/parameterfitting/ViscosityFunction.java b/src/main/java/neqsim/pvtsimulation/util/parameterfitting/ViscosityFunction.java index 09a1fc004f..305c113228 100644 --- a/src/main/java/neqsim/pvtsimulation/util/parameterfitting/ViscosityFunction.java +++ b/src/main/java/neqsim/pvtsimulation/util/parameterfitting/ViscosityFunction.java @@ -1,6 +1,6 @@ package neqsim.pvtsimulation.util.parameterfitting; -import neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.viscosity.FrictionTheoryViscosityMethod; +import neqsim.physicalproperties.methods.commonphasephysicalproperties.viscosity.FrictionTheoryViscosityMethod; import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardtFunction; /** diff --git a/src/main/java/neqsim/thermo/phase/Phase.java b/src/main/java/neqsim/thermo/phase/Phase.java index 301cf8e103..d87e94d92f 100644 --- a/src/main/java/neqsim/thermo/phase/Phase.java +++ b/src/main/java/neqsim/thermo/phase/Phase.java @@ -11,8 +11,8 @@ import org.apache.logging.log4j.Logger; import neqsim.physicalproperties.PhysicalPropertyHandler; import neqsim.physicalproperties.PhysicalPropertyType; -import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties; -import neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertyModel; +import neqsim.physicalproperties.system.PhysicalProperties; +import neqsim.physicalproperties.system.PhysicalPropertyModel; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.ThermodynamicModelSettings; import neqsim.thermo.component.ComponentInterface; diff --git a/src/main/java/neqsim/thermo/phase/PhaseInterface.java b/src/main/java/neqsim/thermo/phase/PhaseInterface.java index 3bb13d39ad..cd0423b2e6 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseInterface.java +++ b/src/main/java/neqsim/thermo/phase/PhaseInterface.java @@ -7,8 +7,8 @@ package neqsim.thermo.phase; import neqsim.physicalproperties.PhysicalPropertyType; -import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties; -import neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertyModel; +import neqsim.physicalproperties.system.PhysicalProperties; +import neqsim.physicalproperties.system.PhysicalPropertyModel; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.component.ComponentInterface; import neqsim.thermo.system.SystemInterface; @@ -786,7 +786,7 @@ public default void addMolesChemReac(int component, double dn) { * getPhysicalProperties. *

* - * @return a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties} object + * @return a {@link neqsim.physicalproperties.system.PhysicalProperties} object */ public PhysicalProperties getPhysicalProperties(); @@ -820,7 +820,7 @@ public default void setPhysicalProperties() { * Getter for property ppm. *

* - * @return a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertyModel} object + * @return a {@link neqsim.physicalproperties.system.PhysicalPropertyModel} object */ public PhysicalPropertyModel getPhysicalPropertyModel(); @@ -838,8 +838,7 @@ public default void setPhysicalProperties() { * setPhysicalPropertyModel. *

* - * @param ppm a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertyModel} - * object + * @param ppm a {@link neqsim.physicalproperties.system.PhysicalPropertyModel} object */ public void setPhysicalPropertyModel(PhysicalPropertyModel ppm); diff --git a/src/main/java/neqsim/thermo/system/SystemInterface.java b/src/main/java/neqsim/thermo/system/SystemInterface.java index e7f6c6bc34..adb122649c 100644 --- a/src/main/java/neqsim/thermo/system/SystemInterface.java +++ b/src/main/java/neqsim/thermo/system/SystemInterface.java @@ -3,7 +3,7 @@ import neqsim.chemicalreactions.ChemicalReactionOperations; import neqsim.physicalproperties.PhysicalPropertyType; import neqsim.physicalproperties.interfaceproperties.InterphasePropertiesInterface; -import neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertyModel; +import neqsim.physicalproperties.system.PhysicalPropertyModel; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.characterization.WaxModelInterface; import neqsim.thermo.component.ComponentInterface; diff --git a/src/test/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/viscosity/FrictionTheoryViscosityMethodTest.java b/src/test/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/FrictionTheoryViscosityMethodTest.java similarity index 91% rename from src/test/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/viscosity/FrictionTheoryViscosityMethodTest.java rename to src/test/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/FrictionTheoryViscosityMethodTest.java index c68847c4cc..cbc3520b26 100644 --- a/src/test/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/viscosity/FrictionTheoryViscosityMethodTest.java +++ b/src/test/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/FrictionTheoryViscosityMethodTest.java @@ -1,4 +1,4 @@ -package neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.viscosity; +package neqsim.physicalproperties.methods.commonphasephysicalproperties.viscosity; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.BeforeAll; diff --git a/src/test/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/viscosity/PFCTViscosityMethodTest.java b/src/test/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/PFCTViscosityMethodTest.java similarity index 88% rename from src/test/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/viscosity/PFCTViscosityMethodTest.java rename to src/test/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/PFCTViscosityMethodTest.java index c03b956f75..41a7950b0d 100644 --- a/src/test/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/viscosity/PFCTViscosityMethodTest.java +++ b/src/test/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/PFCTViscosityMethodTest.java @@ -1,4 +1,4 @@ -package neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.viscosity; +package neqsim.physicalproperties.methods.commonphasephysicalproperties.viscosity; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/density/CostaldTest.java b/src/test/java/neqsim/physicalproperties/methods/liquidphysicalproperties/density/CostaldTest.java similarity index 91% rename from src/test/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/density/CostaldTest.java rename to src/test/java/neqsim/physicalproperties/methods/liquidphysicalproperties/density/CostaldTest.java index ce94fac163..72d8227202 100644 --- a/src/test/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/density/CostaldTest.java +++ b/src/test/java/neqsim/physicalproperties/methods/liquidphysicalproperties/density/CostaldTest.java @@ -1,4 +1,4 @@ -package neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.density; +package neqsim.physicalproperties.methods.liquidphysicalproperties.density; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.BeforeAll; diff --git a/src/test/java/neqsim/physicalproperties/physicalpropertysystem/PhysicalPropertyModelTest.java b/src/test/java/neqsim/physicalproperties/system/PhysicalPropertyModelTest.java similarity index 95% rename from src/test/java/neqsim/physicalproperties/physicalpropertysystem/PhysicalPropertyModelTest.java rename to src/test/java/neqsim/physicalproperties/system/PhysicalPropertyModelTest.java index 012ef78e13..e0833531b9 100644 --- a/src/test/java/neqsim/physicalproperties/physicalpropertysystem/PhysicalPropertyModelTest.java +++ b/src/test/java/neqsim/physicalproperties/system/PhysicalPropertyModelTest.java @@ -1,4 +1,4 @@ -package neqsim.physicalproperties.physicalpropertysystem; +package neqsim.physicalproperties.system; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/physicalproperties/util/examples/TestCondensate.java b/src/test/java/neqsim/physicalproperties/util/examples/TestCondensate.java index 3cdc83c80b..788b180391 100644 --- a/src/test/java/neqsim/physicalproperties/util/examples/TestCondensate.java +++ b/src/test/java/neqsim/physicalproperties/util/examples/TestCondensate.java @@ -2,7 +2,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertyModel; +import neqsim.physicalproperties.system.PhysicalPropertyModel; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemPrEos;