diff --git a/src/main/java/neqsim/processsimulation/SimulationBaseClass.java b/src/main/java/neqsim/process/SimulationBaseClass.java similarity index 98% rename from src/main/java/neqsim/processsimulation/SimulationBaseClass.java rename to src/main/java/neqsim/process/SimulationBaseClass.java index 84494d32a3..63b776867e 100644 --- a/src/main/java/neqsim/processsimulation/SimulationBaseClass.java +++ b/src/main/java/neqsim/process/SimulationBaseClass.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation; +package neqsim.process; import java.util.UUID; import neqsim.util.NamedBaseClass; diff --git a/src/main/java/neqsim/processsimulation/SimulationInterface.java b/src/main/java/neqsim/process/SimulationInterface.java similarity index 99% rename from src/main/java/neqsim/processsimulation/SimulationInterface.java rename to src/main/java/neqsim/process/SimulationInterface.java index ef7ca9670b..3bd5962eb1 100644 --- a/src/main/java/neqsim/processsimulation/SimulationInterface.java +++ b/src/main/java/neqsim/process/SimulationInterface.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation; +package neqsim.process; import java.io.Serializable; import java.util.UUID; diff --git a/src/main/java/neqsim/processsimulation/conditionmonitor/ConditionMonitor.java b/src/main/java/neqsim/process/conditionmonitor/ConditionMonitor.java similarity index 71% rename from src/main/java/neqsim/processsimulation/conditionmonitor/ConditionMonitor.java rename to src/main/java/neqsim/process/conditionmonitor/ConditionMonitor.java index b29c49c1fa..cfb1dd09a7 100644 --- a/src/main/java/neqsim/processsimulation/conditionmonitor/ConditionMonitor.java +++ b/src/main/java/neqsim/process/conditionmonitor/ConditionMonitor.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.conditionmonitor; +package neqsim.process.conditionmonitor; import java.util.ArrayList; -import neqsim.processsimulation.processsystem.ProcessSystem; +import neqsim.process.processmodel.ProcessSystem; /** *

@@ -29,7 +29,7 @@ public ConditionMonitor() {} * Constructor for ConditionMonitor. *

* - * @param refprocess a {@link neqsim.processsimulation.processsystem.ProcessSystem} object + * @param refprocess a {@link neqsim.process.processmodel.ProcessSystem} object */ public ConditionMonitor(ProcessSystem refprocess) { this.refprocess = refprocess; @@ -44,12 +44,12 @@ public ConditionMonitor(ProcessSystem refprocess) { * @param unitName a {@link java.lang.String} object */ public void conditionAnalysis(String unitName) { - neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass refUn = - (neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass) refprocess + neqsim.process.equipment.ProcessEquipmentBaseClass refUn = + (neqsim.process.equipment.ProcessEquipmentBaseClass) refprocess .getUnit(unitName); - ((neqsim.processsimulation.processequipment.ProcessEquipmentInterface) process + ((neqsim.process.equipment.ProcessEquipmentInterface) process .getUnit(unitName)).runConditionAnalysis(refUn); - report += ((neqsim.processsimulation.processequipment.ProcessEquipmentInterface) process + report += ((neqsim.process.equipment.ProcessEquipmentInterface) process .getUnit(unitName)).getConditionAnalysisMessage(); } @@ -81,7 +81,7 @@ public String getReport() { * Getter for the field process. *

* - * @return a {@link neqsim.processsimulation.processsystem.ProcessSystem} object + * @return a {@link neqsim.process.processmodel.ProcessSystem} object */ public ProcessSystem getProcess() { return process; diff --git a/src/main/java/neqsim/processsimulation/conditionmonitor/ConditionMonitorSpecifications.java b/src/main/java/neqsim/process/conditionmonitor/ConditionMonitorSpecifications.java similarity index 90% rename from src/main/java/neqsim/processsimulation/conditionmonitor/ConditionMonitorSpecifications.java rename to src/main/java/neqsim/process/conditionmonitor/ConditionMonitorSpecifications.java index 261f5eff69..f3574ad192 100644 --- a/src/main/java/neqsim/processsimulation/conditionmonitor/ConditionMonitorSpecifications.java +++ b/src/main/java/neqsim/process/conditionmonitor/ConditionMonitorSpecifications.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.conditionmonitor; +package neqsim.process.conditionmonitor; /** *

diff --git a/src/main/java/neqsim/processsimulation/controllerdevice/ControllerDeviceBaseClass.java b/src/main/java/neqsim/process/controllerdevice/ControllerDeviceBaseClass.java similarity index 97% rename from src/main/java/neqsim/processsimulation/controllerdevice/ControllerDeviceBaseClass.java rename to src/main/java/neqsim/process/controllerdevice/ControllerDeviceBaseClass.java index 6f60ac2913..28f0c1c444 100644 --- a/src/main/java/neqsim/processsimulation/controllerdevice/ControllerDeviceBaseClass.java +++ b/src/main/java/neqsim/process/controllerdevice/ControllerDeviceBaseClass.java @@ -4,12 +4,12 @@ * Created on 10. oktober 2006, 19:59 */ -package neqsim.processsimulation.controllerdevice; +package neqsim.process.controllerdevice; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.measurementdevice.MeasurementDeviceInterface; +import neqsim.process.measurementdevice.MeasurementDeviceInterface; import neqsim.util.NamedBaseClass; /** diff --git a/src/main/java/neqsim/processsimulation/controllerdevice/ControllerDeviceInterface.java b/src/main/java/neqsim/process/controllerdevice/ControllerDeviceInterface.java similarity index 92% rename from src/main/java/neqsim/processsimulation/controllerdevice/ControllerDeviceInterface.java rename to src/main/java/neqsim/process/controllerdevice/ControllerDeviceInterface.java index ae580c1194..ae336a29ae 100644 --- a/src/main/java/neqsim/processsimulation/controllerdevice/ControllerDeviceInterface.java +++ b/src/main/java/neqsim/process/controllerdevice/ControllerDeviceInterface.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.controllerdevice; +package neqsim.process.controllerdevice; import java.util.UUID; -import neqsim.processsimulation.measurementdevice.MeasurementDeviceInterface; +import neqsim.process.measurementdevice.MeasurementDeviceInterface; /** *

@@ -53,7 +53,7 @@ public interface ControllerDeviceInterface extends java.io.Serializable { * setTransmitter. *

* - * @param device a {@link neqsim.processsimulation.measurementdevice.MeasurementDeviceInterface} + * @param device a {@link neqsim.process.measurementdevice.MeasurementDeviceInterface} * object */ public void setTransmitter(MeasurementDeviceInterface device); diff --git a/src/main/java/neqsim/processsimulation/costestimation/CostEstimateBaseClass.java b/src/main/java/neqsim/process/costestimation/CostEstimateBaseClass.java similarity index 85% rename from src/main/java/neqsim/processsimulation/costestimation/CostEstimateBaseClass.java rename to src/main/java/neqsim/process/costestimation/CostEstimateBaseClass.java index e8fb6492d8..7510c75e25 100644 --- a/src/main/java/neqsim/processsimulation/costestimation/CostEstimateBaseClass.java +++ b/src/main/java/neqsim/process/costestimation/CostEstimateBaseClass.java @@ -1,11 +1,11 @@ -package neqsim.processsimulation.costestimation; +package neqsim.process.costestimation; import java.util.ArrayList; import java.util.Objects; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.mechanicaldesign.SystemMechanicalDesign; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.mechanicaldesign.SystemMechanicalDesign; /** *

@@ -27,7 +27,7 @@ public class CostEstimateBaseClass implements java.io.Serializable { * Constructor for CostEstimateBaseClass. *

* - * @param processdesign a {@link neqsim.processsimulation.mechanicaldesign.SystemMechanicalDesign} + * @param processdesign a {@link neqsim.process.mechanicaldesign.SystemMechanicalDesign} * object */ public CostEstimateBaseClass(SystemMechanicalDesign processdesign) { @@ -39,7 +39,7 @@ public CostEstimateBaseClass(SystemMechanicalDesign processdesign) { * Constructor for CostEstimateBaseClass. *

* - * @param processdesign a {@link neqsim.processsimulation.mechanicaldesign.SystemMechanicalDesign} + * @param processdesign a {@link neqsim.process.mechanicaldesign.SystemMechanicalDesign} * @param costFactor cost factor */ public CostEstimateBaseClass(SystemMechanicalDesign processdesign, double costFactor) { diff --git a/src/main/java/neqsim/processsimulation/costestimation/UnitCostEstimateBaseClass.java b/src/main/java/neqsim/process/costestimation/UnitCostEstimateBaseClass.java similarity index 87% rename from src/main/java/neqsim/processsimulation/costestimation/UnitCostEstimateBaseClass.java rename to src/main/java/neqsim/process/costestimation/UnitCostEstimateBaseClass.java index 789433df80..c61509d51d 100644 --- a/src/main/java/neqsim/processsimulation/costestimation/UnitCostEstimateBaseClass.java +++ b/src/main/java/neqsim/process/costestimation/UnitCostEstimateBaseClass.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.costestimation; +package neqsim.process.costestimation; import java.util.Objects; -import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; +import neqsim.process.mechanicaldesign.MechanicalDesign; /** *

@@ -29,7 +29,7 @@ public UnitCostEstimateBaseClass() {} * Constructor for UnitCostEstimateBaseClass. *

* - * @param mechanicalEquipment a {@link neqsim.processsimulation.mechanicaldesign.MechanicalDesign} + * @param mechanicalEquipment a {@link neqsim.process.mechanicaldesign.MechanicalDesign} * object */ public UnitCostEstimateBaseClass(MechanicalDesign mechanicalEquipment) { diff --git a/src/main/java/neqsim/processsimulation/costestimation/compressor/CompressorCostEstimate.java b/src/main/java/neqsim/process/costestimation/compressor/CompressorCostEstimate.java similarity index 70% rename from src/main/java/neqsim/processsimulation/costestimation/compressor/CompressorCostEstimate.java rename to src/main/java/neqsim/process/costestimation/compressor/CompressorCostEstimate.java index f2d159bae3..b011938351 100644 --- a/src/main/java/neqsim/processsimulation/costestimation/compressor/CompressorCostEstimate.java +++ b/src/main/java/neqsim/process/costestimation/compressor/CompressorCostEstimate.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.costestimation.compressor; +package neqsim.process.costestimation.compressor; -import neqsim.processsimulation.costestimation.UnitCostEstimateBaseClass; -import neqsim.processsimulation.mechanicaldesign.compressor.CompressorMechanicalDesign; +import neqsim.process.costestimation.UnitCostEstimateBaseClass; +import neqsim.process.mechanicaldesign.compressor.CompressorMechanicalDesign; /** *

@@ -20,7 +20,7 @@ public class CompressorCostEstimate extends UnitCostEstimateBaseClass { *

* * @param mechanicalEquipment a - * {@link neqsim.processsimulation.mechanicaldesign.compressor.CompressorMechanicalDesign} + * {@link neqsim.process.mechanicaldesign.compressor.CompressorMechanicalDesign} * object */ public CompressorCostEstimate(CompressorMechanicalDesign mechanicalEquipment) { diff --git a/src/main/java/neqsim/processsimulation/costestimation/separator/SeparatorCostEstimate.java b/src/main/java/neqsim/process/costestimation/separator/SeparatorCostEstimate.java similarity index 70% rename from src/main/java/neqsim/processsimulation/costestimation/separator/SeparatorCostEstimate.java rename to src/main/java/neqsim/process/costestimation/separator/SeparatorCostEstimate.java index 4ebbf8d30a..83027014d3 100644 --- a/src/main/java/neqsim/processsimulation/costestimation/separator/SeparatorCostEstimate.java +++ b/src/main/java/neqsim/process/costestimation/separator/SeparatorCostEstimate.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.costestimation.separator; +package neqsim.process.costestimation.separator; -import neqsim.processsimulation.costestimation.UnitCostEstimateBaseClass; -import neqsim.processsimulation.mechanicaldesign.separator.SeparatorMechanicalDesign; +import neqsim.process.costestimation.UnitCostEstimateBaseClass; +import neqsim.process.mechanicaldesign.separator.SeparatorMechanicalDesign; /** *

@@ -20,7 +20,7 @@ public class SeparatorCostEstimate extends UnitCostEstimateBaseClass { *

* * @param mechanicalEquipment a - * {@link neqsim.processsimulation.mechanicaldesign.separator.SeparatorMechanicalDesign} + * {@link neqsim.process.mechanicaldesign.separator.SeparatorMechanicalDesign} * object */ public SeparatorCostEstimate(SeparatorMechanicalDesign mechanicalEquipment) { diff --git a/src/main/java/neqsim/processsimulation/costestimation/valve/ValveCostEstimate.java b/src/main/java/neqsim/process/costestimation/valve/ValveCostEstimate.java similarity index 70% rename from src/main/java/neqsim/processsimulation/costestimation/valve/ValveCostEstimate.java rename to src/main/java/neqsim/process/costestimation/valve/ValveCostEstimate.java index 63adc89133..cff037ac81 100644 --- a/src/main/java/neqsim/processsimulation/costestimation/valve/ValveCostEstimate.java +++ b/src/main/java/neqsim/process/costestimation/valve/ValveCostEstimate.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.costestimation.valve; +package neqsim.process.costestimation.valve; -import neqsim.processsimulation.costestimation.UnitCostEstimateBaseClass; -import neqsim.processsimulation.mechanicaldesign.valve.ValveMechanicalDesign; +import neqsim.process.costestimation.UnitCostEstimateBaseClass; +import neqsim.process.mechanicaldesign.valve.ValveMechanicalDesign; /** *

@@ -20,7 +20,7 @@ public class ValveCostEstimate extends UnitCostEstimateBaseClass { *

* * @param mechanicalEquipment a - * {@link neqsim.processsimulation.mechanicaldesign.valve.ValveMechanicalDesign} object + * {@link neqsim.process.mechanicaldesign.valve.ValveMechanicalDesign} object */ public ValveCostEstimate(ValveMechanicalDesign mechanicalEquipment) { super(mechanicalEquipment); diff --git a/src/main/java/neqsim/processsimulation/processequipment/ProcessEquipmentBaseClass.java b/src/main/java/neqsim/process/equipment/ProcessEquipmentBaseClass.java similarity index 91% rename from src/main/java/neqsim/processsimulation/processequipment/ProcessEquipmentBaseClass.java rename to src/main/java/neqsim/process/equipment/ProcessEquipmentBaseClass.java index f16324b364..9a13857738 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/ProcessEquipmentBaseClass.java +++ b/src/main/java/neqsim/process/equipment/ProcessEquipmentBaseClass.java @@ -4,18 +4,18 @@ * Created on 6. juni 2006, 15:12 */ -package neqsim.processsimulation.processequipment; +package neqsim.process.equipment; import java.util.Arrays; import java.util.HashMap; import java.util.Objects; import java.util.UUID; import org.apache.commons.lang.SerializationUtils; -import neqsim.processsimulation.SimulationBaseClass; -import neqsim.processsimulation.controllerdevice.ControllerDeviceInterface; -import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; -import neqsim.processsimulation.processequipment.stream.EnergyStream; -import neqsim.processsimulation.util.report.Report; +import neqsim.process.SimulationBaseClass; +import neqsim.process.controllerdevice.ControllerDeviceInterface; +import neqsim.process.equipment.stream.EnergyStream; +import neqsim.process.mechanicaldesign.MechanicalDesign; +import neqsim.process.util.report.Report; import neqsim.thermo.system.SystemInterface; /** @@ -102,7 +102,7 @@ public void setController(ControllerDeviceInterface controller) { * Setter for the field flowValveController. *

* - * @param controller a {@link neqsim.processsimulation.controllerdevice.ControllerDeviceInterface} + * @param controller a {@link neqsim.process.controllerdevice.ControllerDeviceInterface} * object */ public void setFlowValveController(ControllerDeviceInterface controller) { @@ -154,7 +154,7 @@ public boolean solved() { * Getter for the field energyStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.EnergyStream} object + * @return a {@link neqsim.process.equipment.stream.EnergyStream} object */ public EnergyStream getEnergyStream() { return energyStream; @@ -165,7 +165,7 @@ public EnergyStream getEnergyStream() { * Setter for the field energyStream. *

* - * @param energyStream a {@link neqsim.processsimulation.processequipment.stream.EnergyStream} + * @param energyStream a {@link neqsim.process.equipment.stream.EnergyStream} * object */ public void setEnergyStream(EnergyStream energyStream) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/ProcessEquipmentInterface.java b/src/main/java/neqsim/process/equipment/ProcessEquipmentInterface.java similarity index 86% rename from src/main/java/neqsim/processsimulation/processequipment/ProcessEquipmentInterface.java rename to src/main/java/neqsim/process/equipment/ProcessEquipmentInterface.java index b6324b6e49..ee6b796da8 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/ProcessEquipmentInterface.java +++ b/src/main/java/neqsim/process/equipment/ProcessEquipmentInterface.java @@ -1,8 +1,8 @@ -package neqsim.processsimulation.processequipment; +package neqsim.process.equipment; -import neqsim.processsimulation.SimulationInterface; -import neqsim.processsimulation.controllerdevice.ControllerDeviceInterface; -import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; +import neqsim.process.SimulationInterface; +import neqsim.process.controllerdevice.ControllerDeviceInterface; +import neqsim.process.mechanicaldesign.MechanicalDesign; import neqsim.thermo.system.SystemInterface; /** @@ -35,7 +35,7 @@ default void initMechanicalDesign() {} * Get a mechanicalDesign for the equipment. *

* - * @return a {@link neqsim.processsimulation.mechanicaldesign.MechanicalDesign} object + * @return a {@link neqsim.process.mechanicaldesign.MechanicalDesign} object */ public MechanicalDesign getMechanicalDesign(); @@ -89,7 +89,7 @@ public default boolean needRecalculation() { * setController. *

* - * @param controller a {@link neqsim.processsimulation.controllerdevice.ControllerDeviceInterface} + * @param controller a {@link neqsim.process.controllerdevice.ControllerDeviceInterface} * object */ public void setController(ControllerDeviceInterface controller); @@ -99,7 +99,7 @@ public default boolean needRecalculation() { * getController. *

* - * @return a {@link neqsim.processsimulation.controllerdevice.ControllerDeviceInterface} object + * @return a {@link neqsim.process.controllerdevice.ControllerDeviceInterface} object */ public ControllerDeviceInterface getController(); @@ -167,7 +167,7 @@ public default SystemInterface getFluid() { *

* * @param refExchanger a - * {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} object + * {@link neqsim.process.equipment.ProcessEquipmentInterface} object */ public void runConditionAnalysis(ProcessEquipmentInterface refExchanger); diff --git a/src/main/java/neqsim/processsimulation/processequipment/TwoPortEquipment.java b/src/main/java/neqsim/process/equipment/TwoPortEquipment.java similarity index 95% rename from src/main/java/neqsim/processsimulation/processequipment/TwoPortEquipment.java rename to src/main/java/neqsim/process/equipment/TwoPortEquipment.java index b7fff9d05d..0833e753f8 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/TwoPortEquipment.java +++ b/src/main/java/neqsim/process/equipment/TwoPortEquipment.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.processequipment; +package neqsim.process.equipment; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; /** * Abstract class defining ProcessEquipment with one inlet and one outlet. diff --git a/src/main/java/neqsim/processsimulation/processequipment/TwoPortInterface.java b/src/main/java/neqsim/process/equipment/TwoPortInterface.java similarity index 91% rename from src/main/java/neqsim/processsimulation/processequipment/TwoPortInterface.java rename to src/main/java/neqsim/process/equipment/TwoPortInterface.java index e7b5dcf5d4..966cad21a1 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/TwoPortInterface.java +++ b/src/main/java/neqsim/process/equipment/TwoPortInterface.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.processequipment; +package neqsim.process.equipment; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; /** * Interface for processEquipment with a single inlet stream and a single outlet stream. @@ -19,7 +19,7 @@ public interface TwoPortInterface { /** * Get inlet Stream of twoport. * - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ @Deprecated public default StreamInterface getInStream() { diff --git a/src/main/java/neqsim/processsimulation/processequipment/absorber/AbsorberInterface.java b/src/main/java/neqsim/process/equipment/absorber/AbsorberInterface.java similarity index 69% rename from src/main/java/neqsim/processsimulation/processequipment/absorber/AbsorberInterface.java rename to src/main/java/neqsim/process/equipment/absorber/AbsorberInterface.java index e0521ffa14..369833af0f 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/absorber/AbsorberInterface.java +++ b/src/main/java/neqsim/process/equipment/absorber/AbsorberInterface.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.processequipment.absorber; +package neqsim.process.equipment.absorber; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; +import neqsim.process.equipment.ProcessEquipmentInterface; /** *

diff --git a/src/main/java/neqsim/processsimulation/processequipment/absorber/SimpleAbsorber.java b/src/main/java/neqsim/process/equipment/absorber/SimpleAbsorber.java similarity index 91% rename from src/main/java/neqsim/processsimulation/processequipment/absorber/SimpleAbsorber.java rename to src/main/java/neqsim/process/equipment/absorber/SimpleAbsorber.java index 59eb766b7f..5e2aa35770 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/absorber/SimpleAbsorber.java +++ b/src/main/java/neqsim/process/equipment/absorber/SimpleAbsorber.java @@ -1,10 +1,10 @@ -package neqsim.processsimulation.processequipment.absorber; +package neqsim.process.equipment.absorber; import java.util.UUID; -import neqsim.processsimulation.mechanicaldesign.absorber.AbsorberMechanicalDesign; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.mechanicaldesign.absorber.AbsorberMechanicalDesign; import neqsim.thermo.system.SystemInterface; /** @@ -49,7 +49,7 @@ public SimpleAbsorber(String name) { *

* * @param name name of absorber - * @param inStream1 a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inStream1 a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public SimpleAbsorber(String name, StreamInterface inStream1) { @@ -100,7 +100,7 @@ public void setdT(double dT) { * Getter for the field outStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @return a {@link neqsim.process.equipment.stream.Stream} object */ public StreamInterface getOutStream() { return outStream[0]; @@ -112,7 +112,7 @@ public StreamInterface getOutStream() { *

* * @param i a int - * @return a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @return a {@link neqsim.process.equipment.stream.Stream} object */ public StreamInterface getOutStream(int i) { return outStream[i]; @@ -123,7 +123,7 @@ public StreamInterface getOutStream(int i) { * getSolventInStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @return a {@link neqsim.process.equipment.stream.Stream} object */ public StreamInterface getSolventInStream() { return inStream[0]; @@ -135,7 +135,7 @@ public StreamInterface getSolventInStream() { *

* * @param i a int - * @return a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @return a {@link neqsim.process.equipment.stream.Stream} object */ public StreamInterface getInStream(int i) { return inStream[i]; diff --git a/src/main/java/neqsim/processsimulation/processequipment/absorber/SimpleTEGAbsorber.java b/src/main/java/neqsim/process/equipment/absorber/SimpleTEGAbsorber.java similarity index 95% rename from src/main/java/neqsim/processsimulation/processequipment/absorber/SimpleTEGAbsorber.java rename to src/main/java/neqsim/process/equipment/absorber/SimpleTEGAbsorber.java index 8150eb231a..0d90dcc1f6 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/absorber/SimpleTEGAbsorber.java +++ b/src/main/java/neqsim/process/equipment/absorber/SimpleTEGAbsorber.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.absorber; +package neqsim.process.equipment.absorber; import java.awt.Container; import java.awt.FlowLayout; @@ -12,8 +12,8 @@ import javax.swing.JTable; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -73,7 +73,7 @@ public void addStream(StreamInterface newStream) { * addGasInStream. *

* - * @param newStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param newStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public void addGasInStream(StreamInterface newStream) { @@ -88,7 +88,7 @@ public void addGasInStream(StreamInterface newStream) { * addSolventInStream. *

* - * @param newStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param newStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public void addSolventInStream(StreamInterface newStream) { @@ -104,7 +104,7 @@ public void addSolventInStream(StreamInterface newStream) { * replaceSolventInStream. *

* - * @param newStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param newStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public void replaceSolventInStream(StreamInterface newStream) { @@ -212,7 +212,7 @@ public StreamInterface getOutStream() { * getInStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @return a {@link neqsim.process.equipment.stream.Stream} object */ public StreamInterface getInStream() { return gasInStream; @@ -229,7 +229,7 @@ public StreamInterface getGasOutStream() { * Getter for the field gasInStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @return a {@link neqsim.process.equipment.stream.Stream} object */ public StreamInterface getGasInStream() { return gasInStream; @@ -530,7 +530,7 @@ public void displayResult() { * Setter for the field gasOutStream. *

* - * @param gasOutStream a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @param gasOutStream a {@link neqsim.process.equipment.stream.Stream} object */ public void setGasOutStream(StreamInterface gasOutStream) { this.gasOutStream = gasOutStream; @@ -541,7 +541,7 @@ public void setGasOutStream(StreamInterface gasOutStream) { * Getter for the field solventOutStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @return a {@link neqsim.process.equipment.stream.Stream} object */ public StreamInterface getSolventOutStream() { return solventOutStream; @@ -553,7 +553,7 @@ public StreamInterface getSolventOutStream() { *

* * @param solventOutStream a - * {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * {@link neqsim.process.equipment.stream.StreamInterface} object */ public void setSolventOutStream(StreamInterface solventOutStream) { this.solventOutStream = solventOutStream; diff --git a/src/main/java/neqsim/processsimulation/processequipment/absorber/WaterStripperColumn.java b/src/main/java/neqsim/process/equipment/absorber/WaterStripperColumn.java similarity index 95% rename from src/main/java/neqsim/processsimulation/processequipment/absorber/WaterStripperColumn.java rename to src/main/java/neqsim/process/equipment/absorber/WaterStripperColumn.java index 8011cb7496..2b43cd7c43 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/absorber/WaterStripperColumn.java +++ b/src/main/java/neqsim/process/equipment/absorber/WaterStripperColumn.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.absorber; +package neqsim.process.equipment.absorber; import java.awt.Container; import java.awt.FlowLayout; @@ -12,7 +12,7 @@ import javax.swing.JTable; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.phase.PhaseType; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -75,7 +75,7 @@ public void addStream(StreamInterface newStream) { * addGasInStream. *

* - * @param newStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param newStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public void addGasInStream(StreamInterface newStream) { @@ -89,7 +89,7 @@ public void addGasInStream(StreamInterface newStream) { * addSolventInStream. *

* - * @param newStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param newStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public void addSolventInStream(StreamInterface newStream) { @@ -104,7 +104,7 @@ public void addSolventInStream(StreamInterface newStream) { * replaceSolventInStream. *

* - * @param newStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param newStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public void replaceSolventInStream(StreamInterface newStream) { @@ -212,7 +212,7 @@ public StreamInterface getOutStream() { * getInStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @return a {@link neqsim.process.equipment.stream.Stream} object */ public StreamInterface getInStream() { return gasInStream; @@ -506,7 +506,7 @@ public void setWaterDewPointTemperature(double waterDewPointTemperature, double * Setter for the field gasOutStream. *

* - * @param gasOutStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param gasOutStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public void setGasOutStream(StreamInterface gasOutStream) { @@ -518,7 +518,7 @@ public void setGasOutStream(StreamInterface gasOutStream) { * Getter for the field solventOutStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @return a {@link neqsim.process.equipment.stream.Stream} object */ public StreamInterface getSolventOutStream() { return solventOutStream; @@ -530,7 +530,7 @@ public StreamInterface getSolventOutStream() { *

* * @param solventOutStream a - * {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * {@link neqsim.process.equipment.stream.StreamInterface} object */ public void setSolventOutStream(StreamInterface solventOutStream) { this.solventOutStream = solventOutStream; diff --git a/src/main/java/neqsim/processsimulation/processequipment/adsorber/SimpleAdsorber.java b/src/main/java/neqsim/process/equipment/adsorber/SimpleAdsorber.java similarity index 93% rename from src/main/java/neqsim/processsimulation/processequipment/adsorber/SimpleAdsorber.java rename to src/main/java/neqsim/process/equipment/adsorber/SimpleAdsorber.java index e2fb7b3a5f..1c3d557256 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/adsorber/SimpleAdsorber.java +++ b/src/main/java/neqsim/process/equipment/adsorber/SimpleAdsorber.java @@ -1,10 +1,10 @@ -package neqsim.processsimulation.processequipment.adsorber; +package neqsim.process.equipment.adsorber; import java.util.UUID; -import neqsim.processsimulation.mechanicaldesign.adsorber.AdsorberMechanicalDesign; -import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.ProcessEquipmentBaseClass; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.mechanicaldesign.adsorber.AdsorberMechanicalDesign; import neqsim.thermo.system.SystemInterface; /** @@ -48,7 +48,7 @@ public SimpleAdsorber(String name) { *

* * @param name name of the unit operation - * @param inStream1 a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inStream1 a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public SimpleAdsorber(String name, StreamInterface inStream1) { @@ -100,7 +100,7 @@ public void setdT(double dT) { *

* * @param i a int - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface getOutStream(int i) { return outStream[i]; diff --git a/src/main/java/neqsim/processsimulation/processequipment/compressor/AntiSurge.java b/src/main/java/neqsim/process/equipment/compressor/AntiSurge.java similarity index 97% rename from src/main/java/neqsim/processsimulation/processequipment/compressor/AntiSurge.java rename to src/main/java/neqsim/process/equipment/compressor/AntiSurge.java index fb3c0a7332..1fe56eb596 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/compressor/AntiSurge.java +++ b/src/main/java/neqsim/process/equipment/compressor/AntiSurge.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.compressor; +package neqsim.process.equipment.compressor; import java.util.Objects; diff --git a/src/main/java/neqsim/processsimulation/processequipment/compressor/Compressor.java b/src/main/java/neqsim/process/equipment/compressor/Compressor.java similarity index 98% rename from src/main/java/neqsim/processsimulation/processequipment/compressor/Compressor.java rename to src/main/java/neqsim/process/equipment/compressor/Compressor.java index 53fc6e815b..d97bc3cf8d 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/compressor/Compressor.java +++ b/src/main/java/neqsim/process/equipment/compressor/Compressor.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.compressor; +package neqsim.process.equipment.compressor; import java.awt.Container; import java.awt.FlowLayout; @@ -14,10 +14,10 @@ import org.apache.logging.log4j.Logger; import com.google.gson.GsonBuilder; import neqsim.physicalproperties.PhysicalPropertyType; -import neqsim.processsimulation.mechanicaldesign.compressor.CompressorMechanicalDesign; -import neqsim.processsimulation.processequipment.TwoPortEquipment; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.util.monitor.CompressorResponse; +import neqsim.process.equipment.TwoPortEquipment; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.mechanicaldesign.compressor.CompressorMechanicalDesign; +import neqsim.process.util.monitor.CompressorResponse; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -80,7 +80,7 @@ public Compressor(String name) { *

* * @param name a {@link java.lang.String} object - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public Compressor(String name, StreamInterface inletStream) { @@ -926,7 +926,7 @@ public SystemInterface getThermoSystem() { * Getter for the field compressorChart. *

* - * @return a {@link neqsim.processsimulation.processequipment.compressor.CompressorChartInterface} + * @return a {@link neqsim.process.equipment.compressor.CompressorChartInterface} * object */ public CompressorChartInterface getCompressorChart() { @@ -939,7 +939,7 @@ public CompressorChartInterface getCompressorChart() { *

* * @param compressorChart a - * {@link neqsim.processsimulation.processequipment.compressor.CompressorChart} object + * {@link neqsim.process.equipment.compressor.CompressorChart} object */ public void setCompressorChart(CompressorChart compressorChart) { this.compressorChart = compressorChart; @@ -990,7 +990,7 @@ public boolean isStoneWall(double flow, double head) { * Setter for the field antiSurge. *

* - * @param antiSurge a {@link neqsim.processsimulation.processequipment.compressor.AntiSurge} + * @param antiSurge a {@link neqsim.process.equipment.compressor.AntiSurge} * object */ public void setAntiSurge(AntiSurge antiSurge) { @@ -1253,7 +1253,7 @@ public void setUseGERG2008(boolean useGERG2008) { *

* * @return a - * {@link neqsim.processsimulation.processequipment.compressor.CompressorPropertyProfile} + * {@link neqsim.process.equipment.compressor.CompressorPropertyProfile} * object */ public CompressorPropertyProfile getPropertyProfile() { @@ -1266,7 +1266,7 @@ public CompressorPropertyProfile getPropertyProfile() { *

* * @param propertyProfile a - * {@link neqsim.processsimulation.processequipment.compressor.CompressorPropertyProfile} + * {@link neqsim.process.equipment.compressor.CompressorPropertyProfile} * object */ public void setPropertyProfile(CompressorPropertyProfile propertyProfile) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorChart.java b/src/main/java/neqsim/process/equipment/compressor/CompressorChart.java similarity index 99% rename from src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorChart.java rename to src/main/java/neqsim/process/equipment/compressor/CompressorChart.java index dfdfb8dbb8..925c0c350b 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorChart.java +++ b/src/main/java/neqsim/process/equipment/compressor/CompressorChart.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.compressor; +package neqsim.process.equipment.compressor; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorChartAlternativeMapLookup.java b/src/main/java/neqsim/process/equipment/compressor/CompressorChartAlternativeMapLookup.java similarity index 98% rename from src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorChartAlternativeMapLookup.java rename to src/main/java/neqsim/process/equipment/compressor/CompressorChartAlternativeMapLookup.java index 8fea234357..7e4895eb5b 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorChartAlternativeMapLookup.java +++ b/src/main/java/neqsim/process/equipment/compressor/CompressorChartAlternativeMapLookup.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.compressor; +package neqsim.process.equipment.compressor; import java.util.ArrayList; import java.util.Arrays; @@ -8,7 +8,7 @@ import org.apache.commons.math3.fitting.WeightedObservedPoints; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.stream.Stream; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; @@ -181,7 +181,7 @@ public void addSurgeCurve(double[] flow, double[] head) { *

* * @param refSpeed a double - * @return a {@link neqsim.processsimulation.processequipment.compressor.CompressorCurve} object + * @return a {@link neqsim.process.equipment.compressor.CompressorCurve} object */ public CompressorCurve getCurveAtRefSpeed(double refSpeed) { for (int i = 0; i < chartValues.size(); i++) { @@ -432,8 +432,8 @@ public static void main(String[] args) { * comp1.getCompressorChart().getStoneWallCurve().setCurve(chartConditions, stoneWallflow, * stoneWallHead); */ - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(comp1); operations.run(); diff --git a/src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorChartGenerator.java b/src/main/java/neqsim/process/equipment/compressor/CompressorChartGenerator.java similarity index 91% rename from src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorChartGenerator.java rename to src/main/java/neqsim/process/equipment/compressor/CompressorChartGenerator.java index fd54d346cd..55d11a90f9 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorChartGenerator.java +++ b/src/main/java/neqsim/process/equipment/compressor/CompressorChartGenerator.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.compressor; +package neqsim.process.equipment.compressor; import neqsim.physicalproperties.PhysicalPropertyType; @@ -15,7 +15,7 @@ public class CompressorChartGenerator { * Constructor for CompressorChartGenerator. *

* - * @param inpcompressor a {@link neqsim.processsimulation.processequipment.compressor.Compressor} + * @param inpcompressor a {@link neqsim.process.equipment.compressor.Compressor} * object */ public CompressorChartGenerator(Compressor inpcompressor) { @@ -28,7 +28,7 @@ public CompressorChartGenerator(Compressor inpcompressor) { *

* * @param generationOption string to specify how to generate the compressor chart - * @return a {@link neqsim.processsimulation.processequipment.compressor.CompressorChart} object + * @return a {@link neqsim.process.equipment.compressor.CompressorChart} object */ public CompressorChart generateCompressorChart(String generationOption) { // Generation compressor chart diff --git a/src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorChartInterface.java b/src/main/java/neqsim/process/equipment/compressor/CompressorChartInterface.java similarity index 89% rename from src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorChartInterface.java rename to src/main/java/neqsim/process/equipment/compressor/CompressorChartInterface.java index e85500737e..078ec18002 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorChartInterface.java +++ b/src/main/java/neqsim/process/equipment/compressor/CompressorChartInterface.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.compressor; +package neqsim.process.equipment.compressor; /** *

@@ -108,7 +108,7 @@ public void setReferenceConditions(double refMW, double refTemperature, double r * getSurgeCurve. *

* - * @return a {@link neqsim.processsimulation.processequipment.compressor.SurgeCurve} object + * @return a {@link neqsim.process.equipment.compressor.SurgeCurve} object */ public SurgeCurve getSurgeCurve(); @@ -117,7 +117,7 @@ public void setReferenceConditions(double refMW, double refTemperature, double r * setSurgeCurve. *

* - * @param surgeCurve a {@link neqsim.processsimulation.processequipment.compressor.SurgeCurve} + * @param surgeCurve a {@link neqsim.process.equipment.compressor.SurgeCurve} * object */ public void setSurgeCurve(SurgeCurve surgeCurve); @@ -127,7 +127,7 @@ public void setReferenceConditions(double refMW, double refTemperature, double r * getStoneWallCurve. *

* - * @return a {@link neqsim.processsimulation.processequipment.compressor.StoneWallCurve} object + * @return a {@link neqsim.process.equipment.compressor.StoneWallCurve} object */ public StoneWallCurve getStoneWallCurve(); @@ -137,7 +137,7 @@ public void setReferenceConditions(double refMW, double refTemperature, double r *

* * @param stoneWallCurve a - * {@link neqsim.processsimulation.processequipment.compressor.StoneWallCurve} object + * {@link neqsim.process.equipment.compressor.StoneWallCurve} object */ public void setStoneWallCurve(StoneWallCurve stoneWallCurve); diff --git a/src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorCurve.java b/src/main/java/neqsim/process/equipment/compressor/CompressorCurve.java similarity index 96% rename from src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorCurve.java rename to src/main/java/neqsim/process/equipment/compressor/CompressorCurve.java index 0bc5251ed9..9177689530 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorCurve.java +++ b/src/main/java/neqsim/process/equipment/compressor/CompressorCurve.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.compressor; +package neqsim.process.equipment.compressor; import java.util.Arrays; import java.util.Objects; diff --git a/src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorInterface.java b/src/main/java/neqsim/process/equipment/compressor/CompressorInterface.java similarity index 84% rename from src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorInterface.java rename to src/main/java/neqsim/process/equipment/compressor/CompressorInterface.java index 27d1c30223..d9bfdf543d 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorInterface.java +++ b/src/main/java/neqsim/process/equipment/compressor/CompressorInterface.java @@ -4,10 +4,10 @@ * Created on 22. august 2001, 17:20 */ -package neqsim.processsimulation.processequipment.compressor; +package neqsim.process.equipment.compressor; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.TwoPortInterface; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.TwoPortInterface; /** *

@@ -68,7 +68,7 @@ public interface CompressorInterface extends ProcessEquipmentInterface, TwoPortI * getAntiSurge. *

* - * @return a {@link neqsim.processsimulation.processequipment.compressor.AntiSurge} object + * @return a {@link neqsim.process.equipment.compressor.AntiSurge} object */ public AntiSurge getAntiSurge(); diff --git a/src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorPropertyProfile.java b/src/main/java/neqsim/process/equipment/compressor/CompressorPropertyProfile.java similarity index 96% rename from src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorPropertyProfile.java rename to src/main/java/neqsim/process/equipment/compressor/CompressorPropertyProfile.java index 19a7e4537d..1b26b2c184 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorPropertyProfile.java +++ b/src/main/java/neqsim/process/equipment/compressor/CompressorPropertyProfile.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.compressor; +package neqsim.process.equipment.compressor; import java.io.Serializable; import java.util.ArrayList; diff --git a/src/main/java/neqsim/processsimulation/processequipment/compressor/StoneWallCurve.java b/src/main/java/neqsim/process/equipment/compressor/StoneWallCurve.java similarity index 98% rename from src/main/java/neqsim/processsimulation/processequipment/compressor/StoneWallCurve.java rename to src/main/java/neqsim/process/equipment/compressor/StoneWallCurve.java index a7f21d57e9..2d9aa760d1 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/compressor/StoneWallCurve.java +++ b/src/main/java/neqsim/process/equipment/compressor/StoneWallCurve.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.compressor; +package neqsim.process.equipment.compressor; import java.util.Arrays; import java.util.Objects; diff --git a/src/main/java/neqsim/processsimulation/processequipment/compressor/SurgeCurve.java b/src/main/java/neqsim/process/equipment/compressor/SurgeCurve.java similarity index 98% rename from src/main/java/neqsim/processsimulation/processequipment/compressor/SurgeCurve.java rename to src/main/java/neqsim/process/equipment/compressor/SurgeCurve.java index d08634a79c..e4177604be 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/compressor/SurgeCurve.java +++ b/src/main/java/neqsim/process/equipment/compressor/SurgeCurve.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.compressor; +package neqsim.process.equipment.compressor; import java.util.Arrays; import java.util.Objects; diff --git a/src/main/java/neqsim/processsimulation/processequipment/distillation/Condenser.java b/src/main/java/neqsim/process/equipment/distillation/Condenser.java similarity index 92% rename from src/main/java/neqsim/processsimulation/processequipment/distillation/Condenser.java rename to src/main/java/neqsim/process/equipment/distillation/Condenser.java index 4f11891bae..322f733f49 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/distillation/Condenser.java +++ b/src/main/java/neqsim/process/equipment/distillation/Condenser.java @@ -1,9 +1,9 @@ -package neqsim.processsimulation.processequipment.distillation; +package neqsim.process.equipment.distillation; import java.util.UUID; -import neqsim.processsimulation.processequipment.splitter.Splitter; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.splitter.Splitter; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -94,7 +94,7 @@ public StreamInterface getGasOutStream() { * getProductOutStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @return a {@link neqsim.process.equipment.stream.Stream} object */ public StreamInterface getProductOutStream() { return getGasOutStream(); diff --git a/src/main/java/neqsim/processsimulation/processequipment/distillation/DistillationColumn.java b/src/main/java/neqsim/process/equipment/distillation/DistillationColumn.java similarity index 95% rename from src/main/java/neqsim/processsimulation/processequipment/distillation/DistillationColumn.java rename to src/main/java/neqsim/process/equipment/distillation/DistillationColumn.java index 358543132b..55dde14360 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/distillation/DistillationColumn.java +++ b/src/main/java/neqsim/process/equipment/distillation/DistillationColumn.java @@ -1,15 +1,15 @@ -package neqsim.processsimulation.processequipment.distillation; +package neqsim.process.equipment.distillation; import java.util.ArrayList; import java.util.Objects; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.ProcessEquipmentBaseClass; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -43,7 +43,7 @@ public class DistillationColumn extends ProcessEquipmentBaseClass implements Dis StreamInterface feedStream = null; boolean stream_3isset = false; private double internalDiameter = 1.0; - neqsim.processsimulation.processsystem.ProcessSystem distoperations; + neqsim.process.processmodel.ProcessSystem distoperations; Heater heater; Separator separator2; private double err = 1.0e10; @@ -63,7 +63,7 @@ public DistillationColumn(String name, int numberOfTraysLocal, boolean hasReboil super(name); this.hasReboiler = hasReboiler; this.hasCondenser = hasCondenser; - distoperations = new neqsim.processsimulation.processsystem.ProcessSystem(); + distoperations = new neqsim.process.processmodel.ProcessSystem(); this.numberOfTrays = numberOfTraysLocal; if (hasReboiler) { trays.add(new Reboiler("Reboiler")); @@ -86,7 +86,7 @@ public DistillationColumn(String name, int numberOfTraysLocal, boolean hasReboil * addFeedStream. *

* - * @param inputStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inputStream a {@link neqsim.process.equipment.stream.StreamInterface} * object * @param feedTrayNumber a int */ @@ -206,7 +206,7 @@ public void init() { * Getter for the field gasOutStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface getGasOutStream() { return gasOutStream; @@ -217,7 +217,7 @@ public StreamInterface getGasOutStream() { * Getter for the field liquidOutStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface getLiquidOutStream() { return liquidOutStream; @@ -229,7 +229,7 @@ public StreamInterface getLiquidOutStream() { *

* * @param trayNumber a int - * @return a {@link neqsim.processsimulation.processequipment.distillation.SimpleTray} object + * @return a {@link neqsim.process.equipment.distillation.SimpleTray} object */ public SimpleTray getTray(int trayNumber) { return trays.get(trayNumber); @@ -575,8 +575,8 @@ public static void main(String[] args) { // column.getCondenser().setHeatInput(-70000.0); // ((Condenser) column.getCondenser()).setRefluxRatio(0.2); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(column); operations.run(); @@ -591,7 +591,7 @@ public static void main(String[] args) { * getReboiler. *

* - * @return a {@link neqsim.processsimulation.processequipment.distillation.SimpleTray} object + * @return a {@link neqsim.process.equipment.distillation.SimpleTray} object */ public SimpleTray getReboiler() { return trays.get(0); @@ -602,7 +602,7 @@ public SimpleTray getReboiler() { * getCondenser. *

* - * @return a {@link neqsim.processsimulation.processequipment.distillation.SimpleTray} object + * @return a {@link neqsim.process.equipment.distillation.SimpleTray} object */ public SimpleTray getCondenser() { return trays.get(trays.size() - 1); diff --git a/src/main/java/neqsim/processsimulation/processequipment/distillation/DistillationInterface.java b/src/main/java/neqsim/process/equipment/distillation/DistillationInterface.java similarity index 68% rename from src/main/java/neqsim/processsimulation/processequipment/distillation/DistillationInterface.java rename to src/main/java/neqsim/process/equipment/distillation/DistillationInterface.java index 560ca3d1d5..2c89ecadec 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/distillation/DistillationInterface.java +++ b/src/main/java/neqsim/process/equipment/distillation/DistillationInterface.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.processequipment.distillation; +package neqsim.process.equipment.distillation; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; +import neqsim.process.equipment.ProcessEquipmentInterface; /** *

diff --git a/src/main/java/neqsim/processsimulation/processequipment/distillation/Reboiler.java b/src/main/java/neqsim/process/equipment/distillation/Reboiler.java similarity index 93% rename from src/main/java/neqsim/processsimulation/processequipment/distillation/Reboiler.java rename to src/main/java/neqsim/process/equipment/distillation/Reboiler.java index f9408373ac..3150f7f9c8 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/distillation/Reboiler.java +++ b/src/main/java/neqsim/process/equipment/distillation/Reboiler.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.distillation; +package neqsim.process.equipment.distillation; import java.util.UUID; import neqsim.thermo.system.SystemInterface; @@ -12,7 +12,7 @@ * @author ESOL * @version $Id: $Id */ -public class Reboiler extends neqsim.processsimulation.processequipment.distillation.SimpleTray { +public class Reboiler extends neqsim.process.equipment.distillation.SimpleTray { private static final long serialVersionUID = 1000; private double refluxRatio = 0.1; diff --git a/src/main/java/neqsim/processsimulation/processequipment/distillation/SimpleTray.java b/src/main/java/neqsim/process/equipment/distillation/SimpleTray.java similarity index 92% rename from src/main/java/neqsim/processsimulation/processequipment/distillation/SimpleTray.java rename to src/main/java/neqsim/process/equipment/distillation/SimpleTray.java index 19fbe66b50..caa53592cb 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/distillation/SimpleTray.java +++ b/src/main/java/neqsim/process/equipment/distillation/SimpleTray.java @@ -1,10 +1,10 @@ -package neqsim.processsimulation.processequipment.distillation; +package neqsim.process.equipment.distillation; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -16,7 +16,7 @@ * @author ESOL * @version $Id: $Id */ -public class SimpleTray extends neqsim.processsimulation.processequipment.mixer.Mixer +public class SimpleTray extends neqsim.process.equipment.mixer.Mixer implements TrayInterface { private static final long serialVersionUID = 1000; static Logger logger = LogManager.getLogger(SimpleTray.class); @@ -180,7 +180,7 @@ public void run(UUID id) { * getGasOutStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @return a {@link neqsim.process.equipment.stream.Stream} object */ public StreamInterface getGasOutStream() { return new Stream("", mixedStream.getThermoSystem().phaseToSystem(0)); @@ -191,7 +191,7 @@ public StreamInterface getGasOutStream() { * getLiquidOutStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @return a {@link neqsim.process.equipment.stream.Stream} object */ public StreamInterface getLiquidOutStream() { return new Stream("", mixedStream.getThermoSystem().phaseToSystem(1)); diff --git a/src/main/java/neqsim/processsimulation/processequipment/distillation/TrayInterface.java b/src/main/java/neqsim/process/equipment/distillation/TrayInterface.java similarity index 57% rename from src/main/java/neqsim/processsimulation/processequipment/distillation/TrayInterface.java rename to src/main/java/neqsim/process/equipment/distillation/TrayInterface.java index 9e1d574d33..13f3109c8a 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/distillation/TrayInterface.java +++ b/src/main/java/neqsim/process/equipment/distillation/TrayInterface.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.processequipment.distillation; +package neqsim.process.equipment.distillation; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.stream.StreamInterface; /** *

@@ -17,7 +17,7 @@ public interface TrayInterface extends ProcessEquipmentInterface { * addStream. *

* - * @param newStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param newStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public void addStream(StreamInterface newStream); diff --git a/src/main/java/neqsim/processsimulation/processequipment/distillation/VLSolidTray.java b/src/main/java/neqsim/process/equipment/distillation/VLSolidTray.java similarity index 94% rename from src/main/java/neqsim/processsimulation/processequipment/distillation/VLSolidTray.java rename to src/main/java/neqsim/process/equipment/distillation/VLSolidTray.java index 540d7d87ff..33e88f69a6 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/distillation/VLSolidTray.java +++ b/src/main/java/neqsim/process/equipment/distillation/VLSolidTray.java @@ -1,8 +1,8 @@ -package neqsim.processsimulation.processequipment.distillation; +package neqsim.process.equipment.distillation; import java.util.UUID; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; diff --git a/src/main/java/neqsim/processsimulation/processequipment/expander/Expander.java b/src/main/java/neqsim/process/equipment/expander/Expander.java similarity index 92% rename from src/main/java/neqsim/processsimulation/processequipment/expander/Expander.java rename to src/main/java/neqsim/process/equipment/expander/Expander.java index c4a13cd965..606c8079ea 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/expander/Expander.java +++ b/src/main/java/neqsim/process/equipment/expander/Expander.java @@ -1,8 +1,8 @@ -package neqsim.processsimulation.processequipment.expander; +package neqsim.process.equipment.expander; import java.util.UUID; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; /** @@ -31,7 +31,7 @@ public Expander(String name) { *

* * @param name a {@link java.lang.String} object - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public Expander(String name, StreamInterface inletStream) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/expander/ExpanderInterface.java b/src/main/java/neqsim/process/equipment/expander/ExpanderInterface.java similarity index 58% rename from src/main/java/neqsim/processsimulation/processequipment/expander/ExpanderInterface.java rename to src/main/java/neqsim/process/equipment/expander/ExpanderInterface.java index 614b4fc86b..4709a4bf4b 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/expander/ExpanderInterface.java +++ b/src/main/java/neqsim/process/equipment/expander/ExpanderInterface.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.processequipment.expander; +package neqsim.process.equipment.expander; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.TwoPortInterface; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.TwoPortInterface; /** *

diff --git a/src/main/java/neqsim/processsimulation/processequipment/expander/ExpanderOld.java b/src/main/java/neqsim/process/equipment/expander/ExpanderOld.java similarity index 95% rename from src/main/java/neqsim/processsimulation/processequipment/expander/ExpanderOld.java rename to src/main/java/neqsim/process/equipment/expander/ExpanderOld.java index 2407cf4fc8..5bfb7ee9f1 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/expander/ExpanderOld.java +++ b/src/main/java/neqsim/process/equipment/expander/ExpanderOld.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.expander; +package neqsim.process.equipment.expander; import java.awt.Container; import java.awt.FlowLayout; @@ -9,8 +9,8 @@ import javax.swing.JFrame; import javax.swing.JScrollPane; import javax.swing.JTable; -import neqsim.processsimulation.processequipment.TwoPortEquipment; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.TwoPortEquipment; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -47,7 +47,7 @@ public ExpanderOld(String name) { *

* * @param name name of expander - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public ExpanderOld(String name, StreamInterface inletStream) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/filter/CharCoalFilter.java b/src/main/java/neqsim/process/equipment/filter/CharCoalFilter.java similarity index 75% rename from src/main/java/neqsim/processsimulation/processequipment/filter/CharCoalFilter.java rename to src/main/java/neqsim/process/equipment/filter/CharCoalFilter.java index 68b8ad6f2e..f46c64aa3e 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/filter/CharCoalFilter.java +++ b/src/main/java/neqsim/process/equipment/filter/CharCoalFilter.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.processequipment.filter; +package neqsim.process.equipment.filter; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; /** *

diff --git a/src/main/java/neqsim/processsimulation/processequipment/filter/Filter.java b/src/main/java/neqsim/process/equipment/filter/Filter.java similarity index 86% rename from src/main/java/neqsim/processsimulation/processequipment/filter/Filter.java rename to src/main/java/neqsim/process/equipment/filter/Filter.java index e3b82ef696..de54dc2089 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/filter/Filter.java +++ b/src/main/java/neqsim/process/equipment/filter/Filter.java @@ -1,9 +1,9 @@ -package neqsim.processsimulation.processequipment.filter; +package neqsim.process.equipment.filter; import java.util.UUID; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.TwoPortEquipment; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.TwoPortEquipment; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -27,7 +27,7 @@ public class Filter extends TwoPortEquipment { *

* * @param name name of filter - * @param inStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public Filter(String name, StreamInterface inStream) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/heatexchanger/Cooler.java b/src/main/java/neqsim/process/equipment/heatexchanger/Cooler.java similarity index 81% rename from src/main/java/neqsim/processsimulation/processequipment/heatexchanger/Cooler.java rename to src/main/java/neqsim/process/equipment/heatexchanger/Cooler.java index 384ff2682c..926e30da14 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/heatexchanger/Cooler.java +++ b/src/main/java/neqsim/process/equipment/heatexchanger/Cooler.java @@ -1,9 +1,9 @@ -package neqsim.processsimulation.processequipment.heatexchanger; +package neqsim.process.equipment.heatexchanger; import java.util.UUID; import com.google.gson.GsonBuilder; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.util.monitor.HeaterResponse; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.util.monitor.HeaterResponse; /** *

@@ -31,7 +31,7 @@ public Cooler(String name) { *

* * @param name a {@link java.lang.String} object - * @param inStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public Cooler(String name, StreamInterface inStream) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/heatexchanger/HeatExchanger.java b/src/main/java/neqsim/process/equipment/heatexchanger/HeatExchanger.java similarity index 96% rename from src/main/java/neqsim/processsimulation/processequipment/heatexchanger/HeatExchanger.java rename to src/main/java/neqsim/process/equipment/heatexchanger/HeatExchanger.java index 337fb4ec75..bc66576dec 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/heatexchanger/HeatExchanger.java +++ b/src/main/java/neqsim/process/equipment/heatexchanger/HeatExchanger.java @@ -4,15 +4,15 @@ * Created on 15. mars 2001, 14:17 */ -package neqsim.processsimulation.processequipment.heatexchanger; +package neqsim.process.equipment.heatexchanger; import java.util.UUID; import com.google.gson.GsonBuilder; -import neqsim.processsimulation.conditionmonitor.ConditionMonitorSpecifications; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.util.monitor.HXResponse; +import neqsim.process.conditionmonitor.ConditionMonitorSpecifications; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.util.monitor.HXResponse; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -89,7 +89,7 @@ public HeatExchanger(String name, StreamInterface inStream1, StreamInterface inS * Add inlet stream. *

* - * @param inStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public void addInStream(StreamInterface inStream) { @@ -104,7 +104,7 @@ public void addInStream(StreamInterface inStream) { *

* * @param number a int - * @param inStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public void setFeedStream(int number, StreamInterface inStream) { @@ -139,7 +139,7 @@ public StreamInterface getOutStream(int i) { *

* * @param i a int - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface getInStream(int i) { return inStream[i]; diff --git a/src/main/java/neqsim/process/equipment/heatexchanger/HeatExchangerInterface.java b/src/main/java/neqsim/process/equipment/heatexchanger/HeatExchangerInterface.java new file mode 100644 index 0000000000..d1c4a09990 --- /dev/null +++ b/src/main/java/neqsim/process/equipment/heatexchanger/HeatExchangerInterface.java @@ -0,0 +1,21 @@ +package neqsim.process.equipment.heatexchanger; + +/** + *

+ * HeatExchangerInterface interface. + *

+ * + * @author esol + * @version $Id: $Id + */ +public interface HeatExchangerInterface extends HeaterInterface { + /** + *

+ * getOutStream. + *

+ * + * @param i a int + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object + */ + public neqsim.process.equipment.stream.StreamInterface getOutStream(int i); +} diff --git a/src/main/java/neqsim/processsimulation/processequipment/heatexchanger/Heater.java b/src/main/java/neqsim/process/equipment/heatexchanger/Heater.java similarity index 95% rename from src/main/java/neqsim/processsimulation/processequipment/heatexchanger/Heater.java rename to src/main/java/neqsim/process/equipment/heatexchanger/Heater.java index 0ae88be9dd..f9f117fac6 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/heatexchanger/Heater.java +++ b/src/main/java/neqsim/process/equipment/heatexchanger/Heater.java @@ -4,14 +4,14 @@ * Created on 15. mars 2001, 14:17 */ -package neqsim.processsimulation.processequipment.heatexchanger; +package neqsim.process.equipment.heatexchanger; import java.util.UUID; import com.google.gson.GsonBuilder; -import neqsim.processsimulation.processequipment.TwoPortEquipment; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.util.monitor.HeaterResponse; +import neqsim.process.equipment.TwoPortEquipment; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.util.monitor.HeaterResponse; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -60,7 +60,7 @@ public Heater(String name) { *

* * @param name a {@link java.lang.String} object - * @param inStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public Heater(String name, StreamInterface inStream) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/heatexchanger/HeaterInterface.java b/src/main/java/neqsim/process/equipment/heatexchanger/HeaterInterface.java similarity index 87% rename from src/main/java/neqsim/processsimulation/processequipment/heatexchanger/HeaterInterface.java rename to src/main/java/neqsim/process/equipment/heatexchanger/HeaterInterface.java index c899c54310..cd01819b2a 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/heatexchanger/HeaterInterface.java +++ b/src/main/java/neqsim/process/equipment/heatexchanger/HeaterInterface.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.processequipment.heatexchanger; +package neqsim.process.equipment.heatexchanger; -import neqsim.processsimulation.SimulationInterface; +import neqsim.process.SimulationInterface; /** *

diff --git a/src/main/java/neqsim/processsimulation/processequipment/heatexchanger/NeqHeater.java b/src/main/java/neqsim/process/equipment/heatexchanger/NeqHeater.java similarity index 91% rename from src/main/java/neqsim/processsimulation/processequipment/heatexchanger/NeqHeater.java rename to src/main/java/neqsim/process/equipment/heatexchanger/NeqHeater.java index 7cc5fee02f..feb9b5390c 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/heatexchanger/NeqHeater.java +++ b/src/main/java/neqsim/process/equipment/heatexchanger/NeqHeater.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.processequipment.heatexchanger; +package neqsim.process.equipment.heatexchanger; import java.util.UUID; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; /** diff --git a/src/main/java/neqsim/processsimulation/processequipment/heatexchanger/ReBoiler.java b/src/main/java/neqsim/process/equipment/heatexchanger/ReBoiler.java similarity index 87% rename from src/main/java/neqsim/processsimulation/processequipment/heatexchanger/ReBoiler.java rename to src/main/java/neqsim/process/equipment/heatexchanger/ReBoiler.java index 491a6edb61..9064e727e9 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/heatexchanger/ReBoiler.java +++ b/src/main/java/neqsim/process/equipment/heatexchanger/ReBoiler.java @@ -1,8 +1,8 @@ -package neqsim.processsimulation.processequipment.heatexchanger; +package neqsim.process.equipment.heatexchanger; import java.util.UUID; -import neqsim.processsimulation.processequipment.TwoPortEquipment; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.TwoPortEquipment; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -27,7 +27,7 @@ public class ReBoiler extends TwoPortEquipment { *

* * @param name name of reboiler - * @param inStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public ReBoiler(String name, StreamInterface inStream) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/manifold/Manifold.java b/src/main/java/neqsim/process/equipment/manifold/Manifold.java similarity index 77% rename from src/main/java/neqsim/processsimulation/processequipment/manifold/Manifold.java rename to src/main/java/neqsim/process/equipment/manifold/Manifold.java index 2d1ad5de05..708d8df05a 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/manifold/Manifold.java +++ b/src/main/java/neqsim/process/equipment/manifold/Manifold.java @@ -1,12 +1,12 @@ -package neqsim.processsimulation.processequipment.manifold; +package neqsim.process.equipment.manifold; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.splitter.Splitter; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.ProcessEquipmentBaseClass; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.splitter.Splitter; +import neqsim.process.equipment.stream.StreamInterface; /** *

@@ -44,7 +44,7 @@ public Manifold(String name) { * addStream. *

* - * @param newStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param newStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public void addStream(StreamInterface newStream) { @@ -70,7 +70,7 @@ public void setSplitFactors(double[] splitFact) { *

* * @param i a int - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface getSplitStream(int i) { return localsplitter.getSplitStream(i); @@ -81,7 +81,7 @@ public StreamInterface getSplitStream(int i) { * getMixedStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @return a {@link neqsim.process.equipment.stream.StreamInterface} */ public StreamInterface getMixedStream() { return localmixer.getOutletStream(); diff --git a/src/main/java/neqsim/processsimulation/processequipment/mixer/Mixer.java b/src/main/java/neqsim/process/equipment/mixer/Mixer.java similarity index 98% rename from src/main/java/neqsim/processsimulation/processequipment/mixer/Mixer.java rename to src/main/java/neqsim/process/equipment/mixer/Mixer.java index a9fdaf31d5..860d73867c 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/mixer/Mixer.java +++ b/src/main/java/neqsim/process/equipment/mixer/Mixer.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.mixer; +package neqsim.process.equipment.mixer; import java.awt.Container; import java.awt.FlowLayout; @@ -14,8 +14,8 @@ import javax.swing.JTable; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.ProcessEquipmentBaseClass; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -92,7 +92,7 @@ public void addStream(StreamInterface newStream) { *

* * @param i a int - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface getStream(int i) { return streams.get(i); diff --git a/src/main/java/neqsim/processsimulation/processequipment/mixer/MixerInterface.java b/src/main/java/neqsim/process/equipment/mixer/MixerInterface.java similarity index 66% rename from src/main/java/neqsim/processsimulation/processequipment/mixer/MixerInterface.java rename to src/main/java/neqsim/process/equipment/mixer/MixerInterface.java index 662243ed6d..cc8d7dcc59 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/mixer/MixerInterface.java +++ b/src/main/java/neqsim/process/equipment/mixer/MixerInterface.java @@ -4,10 +4,10 @@ * Created on 21. august 2001, 22:28 */ -package neqsim.processsimulation.processequipment.mixer; +package neqsim.process.equipment.mixer; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; /** @@ -24,7 +24,7 @@ public interface MixerInterface extends ProcessEquipmentInterface { * addStream. *

* - * @param newStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param newStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public void addStream(StreamInterface newStream); @@ -34,7 +34,7 @@ public interface MixerInterface extends ProcessEquipmentInterface { * Getter for outlet stream object. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface getOutletStream(); @@ -43,7 +43,7 @@ public interface MixerInterface extends ProcessEquipmentInterface { * Getter for outlet stream object. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object * @deprecated use {@link #getOutletStream} instead */ @Deprecated @@ -57,7 +57,7 @@ public default StreamInterface getOutStream() { *

* * @param i a int - * @param newStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param newStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public void replaceStream(int i, StreamInterface newStream); diff --git a/src/main/java/neqsim/processsimulation/processequipment/mixer/StaticMixer.java b/src/main/java/neqsim/process/equipment/mixer/StaticMixer.java similarity index 98% rename from src/main/java/neqsim/processsimulation/processequipment/mixer/StaticMixer.java rename to src/main/java/neqsim/process/equipment/mixer/StaticMixer.java index 54becee622..cb908579ae 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/mixer/StaticMixer.java +++ b/src/main/java/neqsim/process/equipment/mixer/StaticMixer.java @@ -4,7 +4,7 @@ * Created on 11. mars 2001, 01:49 */ -package neqsim.processsimulation.processequipment.mixer; +package neqsim.process.equipment.mixer; import java.util.UUID; import neqsim.thermodynamicoperations.ThermodynamicOperations; diff --git a/src/main/java/neqsim/processsimulation/processequipment/mixer/StaticNeqMixer.java b/src/main/java/neqsim/process/equipment/mixer/StaticNeqMixer.java similarity index 98% rename from src/main/java/neqsim/processsimulation/processequipment/mixer/StaticNeqMixer.java rename to src/main/java/neqsim/process/equipment/mixer/StaticNeqMixer.java index 2876a89d17..b89db56d1c 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/mixer/StaticNeqMixer.java +++ b/src/main/java/neqsim/process/equipment/mixer/StaticNeqMixer.java @@ -4,7 +4,7 @@ * Created on 11. mars 2001, 01:49 */ -package neqsim.processsimulation.processequipment.mixer; +package neqsim.process.equipment.mixer; import java.util.UUID; import neqsim.thermo.system.SystemInterface; diff --git a/src/main/java/neqsim/processsimulation/processequipment/mixer/StaticPhaseMixer.java b/src/main/java/neqsim/process/equipment/mixer/StaticPhaseMixer.java similarity index 98% rename from src/main/java/neqsim/processsimulation/processequipment/mixer/StaticPhaseMixer.java rename to src/main/java/neqsim/process/equipment/mixer/StaticPhaseMixer.java index 3826735f18..7325f6cee5 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/mixer/StaticPhaseMixer.java +++ b/src/main/java/neqsim/process/equipment/mixer/StaticPhaseMixer.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.mixer; +package neqsim.process.equipment.mixer; import java.util.UUID; import neqsim.thermo.phase.PhaseType; diff --git a/src/main/java/neqsim/processsimulation/processequipment/pipeline/AdiabaticPipe.java b/src/main/java/neqsim/process/equipment/pipeline/AdiabaticPipe.java similarity index 96% rename from src/main/java/neqsim/processsimulation/processequipment/pipeline/AdiabaticPipe.java rename to src/main/java/neqsim/process/equipment/pipeline/AdiabaticPipe.java index d663489a66..4f1dba80a7 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/pipeline/AdiabaticPipe.java +++ b/src/main/java/neqsim/process/equipment/pipeline/AdiabaticPipe.java @@ -1,9 +1,9 @@ -package neqsim.processsimulation.processequipment.pipeline; +package neqsim.process.equipment.pipeline; import java.util.UUID; import neqsim.fluidmechanics.flowsystem.FlowSystemInterface; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; /** @@ -366,8 +366,8 @@ public static void main(String[] name) { pipe.setPipeWallRoughness(5e-6); pipe.setOutPressure(112.0); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(pipe); operations.run(); diff --git a/src/main/java/neqsim/processsimulation/processequipment/pipeline/AdiabaticTwoPhasePipe.java b/src/main/java/neqsim/process/equipment/pipeline/AdiabaticTwoPhasePipe.java similarity index 98% rename from src/main/java/neqsim/processsimulation/processequipment/pipeline/AdiabaticTwoPhasePipe.java rename to src/main/java/neqsim/process/equipment/pipeline/AdiabaticTwoPhasePipe.java index 72a5c9bb6e..bf0664a818 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/pipeline/AdiabaticTwoPhasePipe.java +++ b/src/main/java/neqsim/process/equipment/pipeline/AdiabaticTwoPhasePipe.java @@ -1,8 +1,8 @@ -package neqsim.processsimulation.processequipment.pipeline; +package neqsim.process.equipment.pipeline; import java.util.UUID; import neqsim.fluidmechanics.flowsystem.FlowSystemInterface; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; diff --git a/src/main/java/neqsim/processsimulation/processequipment/pipeline/Fittings.java b/src/main/java/neqsim/process/equipment/pipeline/Fittings.java similarity index 97% rename from src/main/java/neqsim/processsimulation/processequipment/pipeline/Fittings.java rename to src/main/java/neqsim/process/equipment/pipeline/Fittings.java index 871773b788..6259727add 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/pipeline/Fittings.java +++ b/src/main/java/neqsim/process/equipment/pipeline/Fittings.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.pipeline; +package neqsim.process.equipment.pipeline; import java.io.Serializable; import java.util.ArrayList; diff --git a/src/main/java/neqsim/processsimulation/processequipment/pipeline/IncompressiblePipeFlow.java b/src/main/java/neqsim/process/equipment/pipeline/IncompressiblePipeFlow.java similarity index 93% rename from src/main/java/neqsim/processsimulation/processequipment/pipeline/IncompressiblePipeFlow.java rename to src/main/java/neqsim/process/equipment/pipeline/IncompressiblePipeFlow.java index eecbaa019a..f3bb588f69 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/pipeline/IncompressiblePipeFlow.java +++ b/src/main/java/neqsim/process/equipment/pipeline/IncompressiblePipeFlow.java @@ -1,8 +1,8 @@ -package neqsim.processsimulation.processequipment.pipeline; +package neqsim.process.equipment.pipeline; import java.util.UUID; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; /** @@ -149,8 +149,8 @@ public static void main(String[] name) { pipe2.setInletElevation(10); pipe2.setOutletElevation(0); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(pipe); operations.add(pipe2); diff --git a/src/main/java/neqsim/processsimulation/processequipment/pipeline/OnePhasePipeLine.java b/src/main/java/neqsim/process/equipment/pipeline/OnePhasePipeLine.java similarity index 86% rename from src/main/java/neqsim/processsimulation/processequipment/pipeline/OnePhasePipeLine.java rename to src/main/java/neqsim/process/equipment/pipeline/OnePhasePipeLine.java index 3883b5c967..332670da2a 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/pipeline/OnePhasePipeLine.java +++ b/src/main/java/neqsim/process/equipment/pipeline/OnePhasePipeLine.java @@ -4,11 +4,11 @@ * Created on 21. august 2001, 20:44 */ -package neqsim.processsimulation.processequipment.pipeline; +package neqsim.process.equipment.pipeline; import java.util.UUID; import neqsim.fluidmechanics.flowsystem.onephaseflowsystem.pipeflowsystem.PipeFlowSystem; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; /** *

@@ -26,7 +26,7 @@ public class OnePhasePipeLine extends Pipeline { * Constructor for OnePhasePipeLine. *

* - * @param inStream a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @param inStream a {@link neqsim.process.equipment.stream.Stream} object */ public OnePhasePipeLine(StreamInterface inStream) { this("OnePhasePipeLine", inStream); diff --git a/src/main/java/neqsim/processsimulation/processequipment/pipeline/PipeBeggsAndBrills.java b/src/main/java/neqsim/process/equipment/pipeline/PipeBeggsAndBrills.java similarity index 99% rename from src/main/java/neqsim/processsimulation/processequipment/pipeline/PipeBeggsAndBrills.java rename to src/main/java/neqsim/process/equipment/pipeline/PipeBeggsAndBrills.java index 34e8d56e2d..d2a8517860 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/pipeline/PipeBeggsAndBrills.java +++ b/src/main/java/neqsim/process/equipment/pipeline/PipeBeggsAndBrills.java @@ -1,10 +1,10 @@ -package neqsim.processsimulation.processequipment.pipeline; +package neqsim.process.equipment.pipeline; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; import java.util.UUID; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; diff --git a/src/main/java/neqsim/processsimulation/processequipment/pipeline/PipeLineInterface.java b/src/main/java/neqsim/process/equipment/pipeline/PipeLineInterface.java similarity index 91% rename from src/main/java/neqsim/processsimulation/processequipment/pipeline/PipeLineInterface.java rename to src/main/java/neqsim/process/equipment/pipeline/PipeLineInterface.java index 9a65b348d9..2fa05d65f7 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/pipeline/PipeLineInterface.java +++ b/src/main/java/neqsim/process/equipment/pipeline/PipeLineInterface.java @@ -4,11 +4,11 @@ * Created on 21. august 2001, 20:44 */ -package neqsim.processsimulation.processequipment.pipeline; +package neqsim.process.equipment.pipeline; import neqsim.fluidmechanics.flowsystem.FlowSystemInterface; -import neqsim.processsimulation.SimulationInterface; -import neqsim.processsimulation.processequipment.TwoPortInterface; +import neqsim.process.SimulationInterface; +import neqsim.process.equipment.TwoPortInterface; /** *

diff --git a/src/main/java/neqsim/processsimulation/processequipment/pipeline/Pipeline.java b/src/main/java/neqsim/process/equipment/pipeline/Pipeline.java similarity index 96% rename from src/main/java/neqsim/processsimulation/processequipment/pipeline/Pipeline.java rename to src/main/java/neqsim/process/equipment/pipeline/Pipeline.java index fe6963c760..669106af50 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/pipeline/Pipeline.java +++ b/src/main/java/neqsim/process/equipment/pipeline/Pipeline.java @@ -4,7 +4,7 @@ * Created on 14. mars 2001, 22:30 */ -package neqsim.processsimulation.processequipment.pipeline; +package neqsim.process.equipment.pipeline; import java.util.UUID; import org.apache.logging.log4j.LogManager; @@ -12,9 +12,9 @@ import neqsim.fluidmechanics.flowsystem.FlowSystemInterface; import neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface; import neqsim.fluidmechanics.geometrydefinitions.pipe.PipeData; -import neqsim.processsimulation.mechanicaldesign.pipeline.PipelineMechanicalDesign; -import neqsim.processsimulation.processequipment.TwoPortEquipment; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.TwoPortEquipment; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.mechanicaldesign.pipeline.PipelineMechanicalDesign; import neqsim.thermo.system.SystemInterface; /** @@ -65,7 +65,7 @@ public Pipeline(String name) { *

* * @param name a {@link java.lang.String} object - * @param inStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public Pipeline(String name, StreamInterface inStream) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/pipeline/SimpleTPoutPipeline.java b/src/main/java/neqsim/process/equipment/pipeline/SimpleTPoutPipeline.java similarity index 94% rename from src/main/java/neqsim/processsimulation/processequipment/pipeline/SimpleTPoutPipeline.java rename to src/main/java/neqsim/process/equipment/pipeline/SimpleTPoutPipeline.java index 6c88881674..2ce3cb7762 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/pipeline/SimpleTPoutPipeline.java +++ b/src/main/java/neqsim/process/equipment/pipeline/SimpleTPoutPipeline.java @@ -1,8 +1,8 @@ -package neqsim.processsimulation.processequipment.pipeline; +package neqsim.process.equipment.pipeline; import java.util.UUID; import neqsim.fluidmechanics.flowsystem.FlowSystemInterface; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; /** diff --git a/src/main/java/neqsim/processsimulation/processequipment/pipeline/TwoPhasePipeLine.java b/src/main/java/neqsim/process/equipment/pipeline/TwoPhasePipeLine.java similarity index 83% rename from src/main/java/neqsim/processsimulation/processequipment/pipeline/TwoPhasePipeLine.java rename to src/main/java/neqsim/process/equipment/pipeline/TwoPhasePipeLine.java index daa60c6f93..468b8cd180 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/pipeline/TwoPhasePipeLine.java +++ b/src/main/java/neqsim/process/equipment/pipeline/TwoPhasePipeLine.java @@ -4,11 +4,11 @@ * Created on 21. august 2001, 20:45 */ -package neqsim.processsimulation.processequipment.pipeline; +package neqsim.process.equipment.pipeline; import java.util.UUID; import neqsim.fluidmechanics.flowsystem.twophaseflowsystem.twophasepipeflowsystem.TwoPhasePipeFlowSystem; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; /** *

@@ -36,7 +36,7 @@ public TwoPhasePipeLine(String name) { *

* * @param name a {@link java.lang.String} object - * @param inStream a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @param inStream a {@link neqsim.process.equipment.stream.Stream} object */ public TwoPhasePipeLine(String name, StreamInterface inStream) { super(name, inStream); diff --git a/src/main/java/neqsim/processsimulation/processequipment/powergeneration/GasTurbine.java b/src/main/java/neqsim/process/equipment/powergeneration/GasTurbine.java similarity index 89% rename from src/main/java/neqsim/processsimulation/processequipment/powergeneration/GasTurbine.java rename to src/main/java/neqsim/process/equipment/powergeneration/GasTurbine.java index d4e4e1a3ea..5087229ad6 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/powergeneration/GasTurbine.java +++ b/src/main/java/neqsim/process/equipment/powergeneration/GasTurbine.java @@ -1,16 +1,16 @@ -package neqsim.processsimulation.processequipment.powergeneration; +package neqsim.process.equipment.powergeneration; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.mechanicaldesign.compressor.CompressorMechanicalDesign; -import neqsim.processsimulation.processequipment.TwoPortEquipment; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.expander.Expander; -import neqsim.processsimulation.processequipment.heatexchanger.Cooler; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.TwoPortEquipment; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.expander.Expander; +import neqsim.process.equipment.heatexchanger.Cooler; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.mechanicaldesign.compressor.CompressorMechanicalDesign; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; @@ -71,7 +71,7 @@ public GasTurbine(String name) { *

* * @param name a {@link java.lang.String} object - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public GasTurbine(String name, StreamInterface inletStream) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/pump/Pump.java b/src/main/java/neqsim/process/equipment/pump/Pump.java similarity index 96% rename from src/main/java/neqsim/processsimulation/processequipment/pump/Pump.java rename to src/main/java/neqsim/process/equipment/pump/Pump.java index f28f158020..d011d00677 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/pump/Pump.java +++ b/src/main/java/neqsim/process/equipment/pump/Pump.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.pump; +package neqsim.process.equipment.pump; import java.awt.Container; import java.awt.FlowLayout; @@ -10,9 +10,9 @@ import javax.swing.JScrollPane; import javax.swing.JTable; import com.google.gson.GsonBuilder; -import neqsim.processsimulation.processequipment.TwoPortEquipment; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.util.monitor.PumpResponse; +import neqsim.process.equipment.TwoPortEquipment; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.util.monitor.PumpResponse; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -57,7 +57,7 @@ public Pump(String name) { *

* * @param name name of pump - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public Pump(String name, StreamInterface inletStream) { @@ -435,7 +435,7 @@ public double getSpeed() { * Getter for the field pumpChart. *

* - * @return a {@link neqsim.processsimulation.processequipment.pump.PumpChart} object + * @return a {@link neqsim.process.equipment.pump.PumpChart} object */ public PumpChart getPumpChart() { return pumpChart; diff --git a/src/main/java/neqsim/processsimulation/processequipment/pump/PumpChart.java b/src/main/java/neqsim/process/equipment/pump/PumpChart.java similarity index 98% rename from src/main/java/neqsim/processsimulation/processequipment/pump/PumpChart.java rename to src/main/java/neqsim/process/equipment/pump/PumpChart.java index 32d6ca146e..2f1ab98e16 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/pump/PumpChart.java +++ b/src/main/java/neqsim/process/equipment/pump/PumpChart.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.pump; +package neqsim.process.equipment.pump; import java.util.ArrayList; import java.util.Arrays; @@ -7,7 +7,7 @@ import org.apache.commons.math3.fitting.WeightedObservedPoints; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.stream.Stream; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; @@ -288,8 +288,8 @@ public static void main(String[] args) { pump1.getPumpChart().setCurves(chartConditions, speed, flow, head, efficiency); pump1.getPumpChart().setHeadUnit("kJ/kg"); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(pump1); operations.run(); diff --git a/src/main/java/neqsim/processsimulation/processequipment/pump/PumpChartInterface.java b/src/main/java/neqsim/process/equipment/pump/PumpChartInterface.java similarity index 98% rename from src/main/java/neqsim/processsimulation/processequipment/pump/PumpChartInterface.java rename to src/main/java/neqsim/process/equipment/pump/PumpChartInterface.java index 723daaec3e..288608a15f 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/pump/PumpChartInterface.java +++ b/src/main/java/neqsim/process/equipment/pump/PumpChartInterface.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.pump; +package neqsim.process.equipment.pump; /** *

diff --git a/src/main/java/neqsim/processsimulation/processequipment/pump/PumpCurve.java b/src/main/java/neqsim/process/equipment/pump/PumpCurve.java similarity index 94% rename from src/main/java/neqsim/processsimulation/processequipment/pump/PumpCurve.java rename to src/main/java/neqsim/process/equipment/pump/PumpCurve.java index c7de10dc19..8a5c875793 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/pump/PumpCurve.java +++ b/src/main/java/neqsim/process/equipment/pump/PumpCurve.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.pump; +package neqsim.process.equipment.pump; /** *

diff --git a/src/main/java/neqsim/processsimulation/processequipment/pump/PumpInterface.java b/src/main/java/neqsim/process/equipment/pump/PumpInterface.java similarity index 65% rename from src/main/java/neqsim/processsimulation/processequipment/pump/PumpInterface.java rename to src/main/java/neqsim/process/equipment/pump/PumpInterface.java index 44d7e49e6e..2c14205575 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/pump/PumpInterface.java +++ b/src/main/java/neqsim/process/equipment/pump/PumpInterface.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.processequipment.pump; +package neqsim.process.equipment.pump; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.TwoPortInterface; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.TwoPortInterface; /** *

diff --git a/src/main/java/neqsim/processsimulation/processequipment/reservoir/ReservoirCVDsim.java b/src/main/java/neqsim/process/equipment/reservoir/ReservoirCVDsim.java similarity index 83% rename from src/main/java/neqsim/processsimulation/processequipment/reservoir/ReservoirCVDsim.java rename to src/main/java/neqsim/process/equipment/reservoir/ReservoirCVDsim.java index aa508f3278..6d21c84278 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/reservoir/ReservoirCVDsim.java +++ b/src/main/java/neqsim/process/equipment/reservoir/ReservoirCVDsim.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.processequipment.reservoir; +package neqsim.process.equipment.reservoir; import java.util.UUID; -import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; +import neqsim.process.equipment.ProcessEquipmentBaseClass; import neqsim.thermo.system.SystemInterface; /** diff --git a/src/main/java/neqsim/processsimulation/processequipment/reservoir/ReservoirDiffLibsim.java b/src/main/java/neqsim/process/equipment/reservoir/ReservoirDiffLibsim.java similarity index 84% rename from src/main/java/neqsim/processsimulation/processequipment/reservoir/ReservoirDiffLibsim.java rename to src/main/java/neqsim/process/equipment/reservoir/ReservoirDiffLibsim.java index 184773bad8..c209156b11 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/reservoir/ReservoirDiffLibsim.java +++ b/src/main/java/neqsim/process/equipment/reservoir/ReservoirDiffLibsim.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.processequipment.reservoir; +package neqsim.process.equipment.reservoir; import java.util.UUID; -import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; +import neqsim.process.equipment.ProcessEquipmentBaseClass; import neqsim.thermo.system.SystemInterface; /** diff --git a/src/main/java/neqsim/processsimulation/processequipment/reservoir/ReservoirTPsim.java b/src/main/java/neqsim/process/equipment/reservoir/ReservoirTPsim.java similarity index 90% rename from src/main/java/neqsim/processsimulation/processequipment/reservoir/ReservoirTPsim.java rename to src/main/java/neqsim/process/equipment/reservoir/ReservoirTPsim.java index dea4286759..7bda53cdb0 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/reservoir/ReservoirTPsim.java +++ b/src/main/java/neqsim/process/equipment/reservoir/ReservoirTPsim.java @@ -1,9 +1,9 @@ -package neqsim.processsimulation.processequipment.reservoir; +package neqsim.process.equipment.reservoir; import java.util.UUID; -import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.ProcessEquipmentBaseClass; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -80,7 +80,7 @@ public void run(UUID id) { * Getter for the field outStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface getOutStream() { return outStream; diff --git a/src/main/java/neqsim/processsimulation/processequipment/reservoir/SimpleReservoir.java b/src/main/java/neqsim/process/equipment/reservoir/SimpleReservoir.java similarity index 94% rename from src/main/java/neqsim/processsimulation/processequipment/reservoir/SimpleReservoir.java rename to src/main/java/neqsim/process/equipment/reservoir/SimpleReservoir.java index 46344e6f25..f1133bbb76 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/reservoir/SimpleReservoir.java +++ b/src/main/java/neqsim/process/equipment/reservoir/SimpleReservoir.java @@ -4,14 +4,14 @@ * Created on 12. mars 2001, 19:48 */ -package neqsim.processsimulation.processequipment.reservoir; +package neqsim.process.equipment.reservoir; import java.util.ArrayList; import java.util.UUID; -import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; -import neqsim.processsimulation.processequipment.pipeline.AdiabaticTwoPhasePipe; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.ProcessEquipmentBaseClass; +import neqsim.process.equipment.pipeline.AdiabaticTwoPhasePipe; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -84,7 +84,7 @@ public SystemInterface getReservoirFluid() { *

* * @param name a {@link java.lang.String} object - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface addGasProducer(String name) { Well newWell = new Well(name); @@ -102,7 +102,7 @@ public StreamInterface addGasProducer(String name) { *

* * @param name a {@link java.lang.String} object - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface addOilProducer(String name) { Well newWell = new Well(name); @@ -120,7 +120,7 @@ public StreamInterface addOilProducer(String name) { *

* * @param name a {@link java.lang.String} object - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface addWaterInjector(String name) { Well newWell = new Well(name); @@ -139,7 +139,7 @@ public StreamInterface addWaterInjector(String name) { *

* * @param name a {@link java.lang.String} object - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface addWaterProducer(String name) { Well newWell = new Well(name); @@ -157,7 +157,7 @@ public StreamInterface addWaterProducer(String name) { *

* * @param name a {@link java.lang.String} object - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface addGasInjector(String name) { Well newWell = new Well(name); @@ -225,7 +225,7 @@ public double getOilInPlace(String unit) { *

* * @param i a int - * @return a {@link neqsim.processsimulation.processequipment.reservoir.Well} object + * @return a {@link neqsim.process.equipment.reservoir.Well} object */ public Well getGasProducer(int i) { return gasProducer.get(i); @@ -237,7 +237,7 @@ public Well getGasProducer(int i) { *

* * @param i a int - * @return a {@link neqsim.processsimulation.processequipment.reservoir.Well} object + * @return a {@link neqsim.process.equipment.reservoir.Well} object */ public Well getOilProducer(int i) { return oilProducer.get(i); @@ -249,7 +249,7 @@ public Well getOilProducer(int i) { *

* * @param name a {@link java.lang.String} object - * @return a {@link neqsim.processsimulation.processequipment.reservoir.Well} object + * @return a {@link neqsim.process.equipment.reservoir.Well} object */ public Well getOilProducer(String name) { for (int i = 0; i < oilProducer.size(); i++) { @@ -266,7 +266,7 @@ public Well getOilProducer(String name) { *

* * @param i a int - * @return a {@link neqsim.processsimulation.processequipment.reservoir.Well} object + * @return a {@link neqsim.process.equipment.reservoir.Well} object */ public Well getWaterProducer(int i) { return waterProducer.get(i); @@ -278,7 +278,7 @@ public Well getWaterProducer(int i) { *

* * @param i a int - * @return a {@link neqsim.processsimulation.processequipment.reservoir.Well} object + * @return a {@link neqsim.process.equipment.reservoir.Well} object */ public Well getWaterInjector(int i) { return waterInjector.get(i); @@ -290,7 +290,7 @@ public Well getWaterInjector(int i) { *

* * @param i a int - * @return a {@link neqsim.processsimulation.processequipment.reservoir.Well} object + * @return a {@link neqsim.process.equipment.reservoir.Well} object */ public Well getGasInjector(int i) { return gasInjector.get(i); @@ -631,8 +631,8 @@ public static void main(String[] args) { StreamInterface producedGasStream = reservoirOps.addGasProducer("SLP_A32562G"); StreamInterface waterInjectorStream = reservoirOps.addWaterInjector("SLP_WI32562O"); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(reservoirOps); // operations.save("c:/temp/resmode1.neqsim"); diff --git a/src/main/java/neqsim/processsimulation/processequipment/reservoir/Well.java b/src/main/java/neqsim/process/equipment/reservoir/Well.java similarity index 90% rename from src/main/java/neqsim/processsimulation/processequipment/reservoir/Well.java rename to src/main/java/neqsim/process/equipment/reservoir/Well.java index ef6a521f94..fefe1140a7 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/reservoir/Well.java +++ b/src/main/java/neqsim/process/equipment/reservoir/Well.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.processequipment.reservoir; +package neqsim.process.equipment.reservoir; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -38,7 +38,7 @@ public Well(String name) { * Getter for the field stream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface getStream() { return stream; @@ -49,7 +49,7 @@ public StreamInterface getStream() { * Setter for the field stream. *

* - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public void setStream(StreamInterface stream) { this.stream = stream; diff --git a/src/main/java/neqsim/processsimulation/processequipment/reservoir/WellFlow.java b/src/main/java/neqsim/process/equipment/reservoir/WellFlow.java similarity index 94% rename from src/main/java/neqsim/processsimulation/processequipment/reservoir/WellFlow.java rename to src/main/java/neqsim/process/equipment/reservoir/WellFlow.java index 9eaea584fc..c632f4434b 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/reservoir/WellFlow.java +++ b/src/main/java/neqsim/process/equipment/reservoir/WellFlow.java @@ -1,10 +1,10 @@ -package neqsim.processsimulation.processequipment.reservoir; +package neqsim.process.equipment.reservoir; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.TwoPortEquipment; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.TwoPortEquipment; +import neqsim.process.equipment.valve.ThrottlingValve; import neqsim.thermo.system.SystemInterface; /** diff --git a/src/main/java/neqsim/processsimulation/processequipment/separator/GasScrubber.java b/src/main/java/neqsim/process/equipment/separator/GasScrubber.java similarity index 72% rename from src/main/java/neqsim/processsimulation/processequipment/separator/GasScrubber.java rename to src/main/java/neqsim/process/equipment/separator/GasScrubber.java index 0cd964b55a..cec0d9bafe 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/separator/GasScrubber.java +++ b/src/main/java/neqsim/process/equipment/separator/GasScrubber.java @@ -4,10 +4,10 @@ * Created on 12. mars 2001, 19:48 */ -package neqsim.processsimulation.processequipment.separator; +package neqsim.process.equipment.separator; -import neqsim.processsimulation.mechanicaldesign.separator.GasScrubberMechanicalDesign; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.mechanicaldesign.separator.GasScrubberMechanicalDesign; /** *

@@ -36,7 +36,7 @@ public GasScrubber(String name) { *

* * @param name a {@link java.lang.String} object - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @param inletStream a {@link neqsim.process.equipment.stream.Stream} object */ public GasScrubber(String name, StreamInterface inletStream) { super(name, inletStream); diff --git a/src/main/java/neqsim/processsimulation/processequipment/separator/GasScrubberSimple.java b/src/main/java/neqsim/process/equipment/separator/GasScrubberSimple.java similarity index 90% rename from src/main/java/neqsim/processsimulation/processequipment/separator/GasScrubberSimple.java rename to src/main/java/neqsim/process/equipment/separator/GasScrubberSimple.java index 1d9f899147..1a35854475 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/separator/GasScrubberSimple.java +++ b/src/main/java/neqsim/process/equipment/separator/GasScrubberSimple.java @@ -4,12 +4,12 @@ * Created on 12. mars 2001, 19:48 */ -package neqsim.processsimulation.processequipment.separator; +package neqsim.process.equipment.separator; import java.util.UUID; -import neqsim.processsimulation.mechanicaldesign.separator.GasScrubberMechanicalDesign; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.mechanicaldesign.separator.GasScrubberMechanicalDesign; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -49,7 +49,7 @@ public GasScrubberSimple(String name) { *

* * @param name a {@link java.lang.String} object - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @param inletStream a {@link neqsim.process.equipment.stream.Stream} object */ public GasScrubberSimple(String name, StreamInterface inletStream) { super(name, inletStream); diff --git a/src/main/java/neqsim/processsimulation/processequipment/separator/Hydrocyclone.java b/src/main/java/neqsim/process/equipment/separator/Hydrocyclone.java similarity index 87% rename from src/main/java/neqsim/processsimulation/processequipment/separator/Hydrocyclone.java rename to src/main/java/neqsim/process/equipment/separator/Hydrocyclone.java index adfd09d204..474955b40b 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/separator/Hydrocyclone.java +++ b/src/main/java/neqsim/process/equipment/separator/Hydrocyclone.java @@ -1,8 +1,8 @@ -package neqsim.processsimulation.processequipment.separator; +package neqsim.process.equipment.separator; import java.util.UUID; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; /** @@ -39,7 +39,7 @@ public Hydrocyclone(String name) { *

* * @param name a {@link java.lang.String} object - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public Hydrocyclone(String name, StreamInterface inletStream) { @@ -61,7 +61,7 @@ public void setInletStream(StreamInterface inletStream) { * Getter for the field waterOutStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface getWaterOutStream() { return waterOutStream; @@ -72,7 +72,7 @@ public StreamInterface getWaterOutStream() { * getOilOutStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface getOilOutStream() { return liquidOutStream; diff --git a/src/main/java/neqsim/processsimulation/processequipment/separator/NeqGasScrubber.java b/src/main/java/neqsim/process/equipment/separator/NeqGasScrubber.java similarity index 86% rename from src/main/java/neqsim/processsimulation/processequipment/separator/NeqGasScrubber.java rename to src/main/java/neqsim/process/equipment/separator/NeqGasScrubber.java index 377cfcf092..0931e1b1df 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/separator/NeqGasScrubber.java +++ b/src/main/java/neqsim/process/equipment/separator/NeqGasScrubber.java @@ -1,11 +1,11 @@ -package neqsim.processsimulation.processequipment.separator; +package neqsim.process.equipment.separator; import java.util.ArrayList; import java.util.UUID; -import neqsim.processsimulation.mechanicaldesign.separator.GasScrubberMechanicalDesign; -import neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.separator.sectiontype.SeparatorSection; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.mechanicaldesign.separator.GasScrubberMechanicalDesign; import neqsim.thermo.system.SystemInterface; /** @@ -48,7 +48,7 @@ public NeqGasScrubber(String name) { *

* * @param name a {@link java.lang.String} object - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public NeqGasScrubber(String name, StreamInterface inletStream) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/separator/Separator.java b/src/main/java/neqsim/process/equipment/separator/Separator.java similarity index 93% rename from src/main/java/neqsim/processsimulation/processequipment/separator/Separator.java rename to src/main/java/neqsim/process/equipment/separator/Separator.java index 51bfa9489d..6b67b8d0af 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/separator/Separator.java +++ b/src/main/java/neqsim/process/equipment/separator/Separator.java @@ -4,7 +4,7 @@ * Created on 12. mars 2001, 19:48 */ -package neqsim.processsimulation.processequipment.separator; +package neqsim.process.equipment.separator; import java.util.ArrayList; import java.util.Objects; @@ -13,17 +13,17 @@ import org.apache.logging.log4j.Logger; import com.google.gson.GsonBuilder; import neqsim.physicalproperties.PhysicalPropertyType; -import neqsim.processsimulation.mechanicaldesign.separator.SeparatorMechanicalDesign; -import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.separator.sectiontype.ManwaySection; -import neqsim.processsimulation.processequipment.separator.sectiontype.MeshSection; -import neqsim.processsimulation.processequipment.separator.sectiontype.NozzleSection; -import neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection; -import neqsim.processsimulation.processequipment.separator.sectiontype.ValveSection; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.util.monitor.SeparatorResponse; +import neqsim.process.equipment.ProcessEquipmentBaseClass; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.separator.sectiontype.ManwaySection; +import neqsim.process.equipment.separator.sectiontype.MeshSection; +import neqsim.process.equipment.separator.sectiontype.NozzleSection; +import neqsim.process.equipment.separator.sectiontype.SeparatorSection; +import neqsim.process.equipment.separator.sectiontype.ValveSection; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.mechanicaldesign.separator.SeparatorMechanicalDesign; +import neqsim.process.util.monitor.SeparatorResponse; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -88,7 +88,7 @@ public Separator(String name) { * Constructor for Separator. * * @param name a {@link java.lang.String} object - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public Separator(String name, StreamInterface inletStream) { @@ -114,7 +114,7 @@ public void initMechanicalDesign() { * setInletStream. *

* - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public void setInletStream(StreamInterface inletStream) { @@ -133,7 +133,7 @@ public void setInletStream(StreamInterface inletStream) { * addStream. *

* - * @param newStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param newStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public void addStream(StreamInterface newStream) { @@ -150,7 +150,7 @@ public void addStream(StreamInterface newStream) { * Getter for the field liquidOutStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface getLiquidOutStream() { return liquidOutStream; @@ -161,7 +161,7 @@ public StreamInterface getLiquidOutStream() { * Getter for the field gasOutStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface getGasOutStream() { return gasOutStream; @@ -172,7 +172,7 @@ public StreamInterface getGasOutStream() { * getGas. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface getGas() { return getGasOutStream(); @@ -183,7 +183,7 @@ public StreamInterface getGas() { * getLiquid. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface getLiquid() { return getLiquidOutStream(); @@ -652,7 +652,7 @@ public void setSeparatorLength(double separatorLength) { * * @param i a int * @return a - * {@link neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection} + * {@link neqsim.process.equipment.separator.sectiontype.SeparatorSection} * object */ public SeparatorSection getSeparatorSection(int i) { @@ -666,7 +666,7 @@ public SeparatorSection getSeparatorSection(int i) { * * @param name a {@link java.lang.String} object * @return a - * {@link neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection} + * {@link neqsim.process.equipment.separator.sectiontype.SeparatorSection} * object */ public SeparatorSection getSeparatorSection(String name) { @@ -852,7 +852,7 @@ public boolean equals(Object obj) { * getFeedStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface getFeedStream() { return inletStreamMixer.getOutletStream(); diff --git a/src/main/java/neqsim/processsimulation/processequipment/separator/SeparatorInterface.java b/src/main/java/neqsim/process/equipment/separator/SeparatorInterface.java similarity index 86% rename from src/main/java/neqsim/processsimulation/processequipment/separator/SeparatorInterface.java rename to src/main/java/neqsim/process/equipment/separator/SeparatorInterface.java index c9d463fad2..7b84a3d770 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/separator/SeparatorInterface.java +++ b/src/main/java/neqsim/process/equipment/separator/SeparatorInterface.java @@ -4,9 +4,9 @@ * Created on 22. august 2001, 17:22 */ -package neqsim.processsimulation.processequipment.separator; +package neqsim.process.equipment.separator; -import neqsim.processsimulation.SimulationInterface; +import neqsim.process.SimulationInterface; import neqsim.thermo.system.SystemInterface; /** diff --git a/src/main/java/neqsim/processsimulation/processequipment/separator/ThreePhaseSeparator.java b/src/main/java/neqsim/process/equipment/separator/ThreePhaseSeparator.java similarity index 93% rename from src/main/java/neqsim/processsimulation/processequipment/separator/ThreePhaseSeparator.java rename to src/main/java/neqsim/process/equipment/separator/ThreePhaseSeparator.java index 69d4100ada..dd2f4b7741 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/separator/ThreePhaseSeparator.java +++ b/src/main/java/neqsim/process/equipment/separator/ThreePhaseSeparator.java @@ -1,10 +1,10 @@ -package neqsim.processsimulation.processequipment.separator; +package neqsim.process.equipment.separator; import java.util.UUID; import com.google.gson.GsonBuilder; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.util.monitor.SeparatorResponse; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.util.monitor.SeparatorResponse; import neqsim.thermodynamicoperations.ThermodynamicOperations; /** @@ -56,7 +56,7 @@ public ThreePhaseSeparator(String name) { *

* * @param name a {@link java.lang.String} object - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public ThreePhaseSeparator(String name, StreamInterface inletStream) { @@ -118,7 +118,7 @@ public void setInletStream(StreamInterface inletStream) { * Getter for the field waterOutStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface getWaterOutStream() { return waterOutStream; @@ -129,7 +129,7 @@ public StreamInterface getWaterOutStream() { * getOilOutStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface getOilOutStream() { return liquidOutStream; diff --git a/src/main/java/neqsim/processsimulation/processequipment/separator/TwoPhaseSeparator.java b/src/main/java/neqsim/process/equipment/separator/TwoPhaseSeparator.java similarity index 89% rename from src/main/java/neqsim/processsimulation/processequipment/separator/TwoPhaseSeparator.java rename to src/main/java/neqsim/process/equipment/separator/TwoPhaseSeparator.java index 338a0292a3..1e19439ae9 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/separator/TwoPhaseSeparator.java +++ b/src/main/java/neqsim/process/equipment/separator/TwoPhaseSeparator.java @@ -1,8 +1,8 @@ -package neqsim.processsimulation.processequipment.separator; +package neqsim.process.equipment.separator; import java.util.UUID; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; /** @@ -42,7 +42,7 @@ public TwoPhaseSeparator(String name) { *

* * @param name a {@link java.lang.String} object - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public TwoPhaseSeparator(String name, StreamInterface inletStream) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/ManwaySection.java b/src/main/java/neqsim/process/equipment/separator/sectiontype/ManwaySection.java similarity index 69% rename from src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/ManwaySection.java rename to src/main/java/neqsim/process/equipment/separator/sectiontype/ManwaySection.java index f5bca7c085..e774b780d3 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/ManwaySection.java +++ b/src/main/java/neqsim/process/equipment/separator/sectiontype/ManwaySection.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.processequipment.separator.sectiontype; +package neqsim.process.equipment.separator.sectiontype; -import neqsim.processsimulation.mechanicaldesign.separator.sectiontype.MechManwaySection; -import neqsim.processsimulation.processequipment.separator.Separator; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.mechanicaldesign.separator.sectiontype.MechManwaySection; /** *

@@ -22,7 +22,7 @@ public class ManwaySection extends SeparatorSection { * @param name a {@link java.lang.String} object * @param type a {@link java.lang.String} object * @param sep a - * {@link neqsim.processsimulation.processequipment.separator.Separator} + * {@link neqsim.process.equipment.separator.Separator} * object */ public ManwaySection(String name, String type, Separator sep) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/MeshSection.java b/src/main/java/neqsim/process/equipment/separator/sectiontype/MeshSection.java similarity index 72% rename from src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/MeshSection.java rename to src/main/java/neqsim/process/equipment/separator/sectiontype/MeshSection.java index a81a0b8dc8..ec12d0dca7 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/MeshSection.java +++ b/src/main/java/neqsim/process/equipment/separator/sectiontype/MeshSection.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.processequipment.separator.sectiontype; +package neqsim.process.equipment.separator.sectiontype; -import neqsim.processsimulation.mechanicaldesign.separator.sectiontype.MecMeshSection; -import neqsim.processsimulation.processequipment.separator.Separator; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.mechanicaldesign.separator.sectiontype.MecMeshSection; /** *

@@ -22,7 +22,7 @@ public class MeshSection extends SeparatorSection { * @param name a {@link java.lang.String} object * @param type a {@link java.lang.String} object * @param sep a - * {@link neqsim.processsimulation.processequipment.separator.Separator} + * {@link neqsim.process.equipment.separator.Separator} * object */ public MeshSection(String name, String type, Separator sep) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/NozzleSection.java b/src/main/java/neqsim/process/equipment/separator/sectiontype/NozzleSection.java similarity index 69% rename from src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/NozzleSection.java rename to src/main/java/neqsim/process/equipment/separator/sectiontype/NozzleSection.java index cf8f8b7285..fce3828271 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/NozzleSection.java +++ b/src/main/java/neqsim/process/equipment/separator/sectiontype/NozzleSection.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.processequipment.separator.sectiontype; +package neqsim.process.equipment.separator.sectiontype; -import neqsim.processsimulation.mechanicaldesign.separator.sectiontype.MechNozzleSection; -import neqsim.processsimulation.processequipment.separator.Separator; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.mechanicaldesign.separator.sectiontype.MechNozzleSection; /** *

@@ -22,7 +22,7 @@ public class NozzleSection extends SeparatorSection { * @param name a {@link java.lang.String} object * @param type a {@link java.lang.String} object * @param sep a - * {@link neqsim.processsimulation.processequipment.separator.Separator} + * {@link neqsim.process.equipment.separator.Separator} * object */ public NozzleSection(String name, String type, Separator sep) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/PackedSection.java b/src/main/java/neqsim/process/equipment/separator/sectiontype/PackedSection.java similarity index 76% rename from src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/PackedSection.java rename to src/main/java/neqsim/process/equipment/separator/sectiontype/PackedSection.java index 1dda81d090..4ae30d94d6 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/PackedSection.java +++ b/src/main/java/neqsim/process/equipment/separator/sectiontype/PackedSection.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.processequipment.separator.sectiontype; +package neqsim.process.equipment.separator.sectiontype; -import neqsim.processsimulation.processequipment.separator.Separator; +import neqsim.process.equipment.separator.Separator; /** *

@@ -21,7 +21,7 @@ public class PackedSection extends SeparatorSection { * @param name a {@link java.lang.String} object * @param type a {@link java.lang.String} object * @param sep a - * {@link neqsim.processsimulation.processequipment.separator.Separator} + * {@link neqsim.process.equipment.separator.Separator} * object */ public PackedSection(String name, String type, Separator sep) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/SeparatorSection.java b/src/main/java/neqsim/process/equipment/separator/sectiontype/SeparatorSection.java similarity index 91% rename from src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/SeparatorSection.java rename to src/main/java/neqsim/process/equipment/separator/sectiontype/SeparatorSection.java index 5fae06cca9..95b05746d8 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/SeparatorSection.java +++ b/src/main/java/neqsim/process/equipment/separator/sectiontype/SeparatorSection.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.processequipment.separator.sectiontype; +package neqsim.process.equipment.separator.sectiontype; -import neqsim.processsimulation.mechanicaldesign.separator.sectiontype.SepDesignSection; -import neqsim.processsimulation.processequipment.separator.Separator; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.mechanicaldesign.separator.sectiontype.SepDesignSection; import neqsim.util.NamedBaseClass; /** @@ -30,7 +30,7 @@ public class SeparatorSection extends NamedBaseClass { * @param name a {@link java.lang.String} object * @param type a {@link java.lang.String} object * @param sep a - * {@link neqsim.processsimulation.processequipment.separator.Separator} + * {@link neqsim.process.equipment.separator.Separator} * object */ public SeparatorSection(String name, String type, Separator sep) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/ValveSection.java b/src/main/java/neqsim/process/equipment/separator/sectiontype/ValveSection.java similarity index 71% rename from src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/ValveSection.java rename to src/main/java/neqsim/process/equipment/separator/sectiontype/ValveSection.java index 3dd8296fa4..14f6840010 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/ValveSection.java +++ b/src/main/java/neqsim/process/equipment/separator/sectiontype/ValveSection.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.processequipment.separator.sectiontype; +package neqsim.process.equipment.separator.sectiontype; -import neqsim.processsimulation.mechanicaldesign.separator.sectiontype.DistillationTraySection; -import neqsim.processsimulation.processequipment.separator.Separator; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.mechanicaldesign.separator.sectiontype.DistillationTraySection; /** *

@@ -21,7 +21,7 @@ public class ValveSection extends SeparatorSection { * * @param name a {@link java.lang.String} object * @param type a {@link java.lang.String} object - * @param sep a {@link neqsim.processsimulation.processequipment.separator.Separator} object + * @param sep a {@link neqsim.process.equipment.separator.Separator} object */ public ValveSection(String name, String type, Separator sep) { super(name, type, sep); diff --git a/src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/VaneSection.java b/src/main/java/neqsim/process/equipment/separator/sectiontype/VaneSection.java similarity index 72% rename from src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/VaneSection.java rename to src/main/java/neqsim/process/equipment/separator/sectiontype/VaneSection.java index 5f9e92ac65..f7816204e1 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/VaneSection.java +++ b/src/main/java/neqsim/process/equipment/separator/sectiontype/VaneSection.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.processequipment.separator.sectiontype; +package neqsim.process.equipment.separator.sectiontype; -import neqsim.processsimulation.mechanicaldesign.separator.sectiontype.MechVaneSection; -import neqsim.processsimulation.processequipment.separator.Separator; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.mechanicaldesign.separator.sectiontype.MechVaneSection; /** *

@@ -22,7 +22,7 @@ public class VaneSection extends SeparatorSection { * @param name a {@link java.lang.String} object * @param type a {@link java.lang.String} object * @param sep a - * {@link neqsim.processsimulation.processequipment.separator.Separator} + * {@link neqsim.process.equipment.separator.Separator} * object */ public VaneSection(String name, String type, Separator sep) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/splitter/ComponentSplitter.java b/src/main/java/neqsim/process/equipment/splitter/ComponentSplitter.java similarity index 84% rename from src/main/java/neqsim/processsimulation/processequipment/splitter/ComponentSplitter.java rename to src/main/java/neqsim/process/equipment/splitter/ComponentSplitter.java index ffe6f50f8c..255867df61 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/splitter/ComponentSplitter.java +++ b/src/main/java/neqsim/process/equipment/splitter/ComponentSplitter.java @@ -1,11 +1,11 @@ -package neqsim.processsimulation.processequipment.splitter; +package neqsim.process.equipment.splitter; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.ProcessEquipmentBaseClass; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -42,7 +42,7 @@ public ComponentSplitter(String name) { *

* * @param name a {@link java.lang.String} object - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public ComponentSplitter(String name, StreamInterface inletStream) { @@ -66,7 +66,7 @@ public void setSplitFactors(double[] factors) { * Setter for the field inletStream. *

* - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public void setInletStream(StreamInterface inletStream) { @@ -88,7 +88,7 @@ public void setInletStream(StreamInterface inletStream) { *

* * @param i a int - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface getSplitStream(int i) { return splitStream[i]; diff --git a/src/main/java/neqsim/processsimulation/processequipment/splitter/Splitter.java b/src/main/java/neqsim/process/equipment/splitter/Splitter.java similarity index 93% rename from src/main/java/neqsim/processsimulation/processequipment/splitter/Splitter.java rename to src/main/java/neqsim/process/equipment/splitter/Splitter.java index dd0b127850..1edc3494c9 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/splitter/Splitter.java +++ b/src/main/java/neqsim/process/equipment/splitter/Splitter.java @@ -1,12 +1,12 @@ -package neqsim.processsimulation.processequipment.splitter; +package neqsim.process.equipment.splitter; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.ProcessEquipmentBaseClass; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -60,7 +60,7 @@ public Splitter(String name, StreamInterface inStream) { *

* * @param name a {@link java.lang.String} object - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} * object * @param i a int */ diff --git a/src/main/java/neqsim/processsimulation/processequipment/splitter/SplitterInterface.java b/src/main/java/neqsim/process/equipment/splitter/SplitterInterface.java similarity index 58% rename from src/main/java/neqsim/processsimulation/processequipment/splitter/SplitterInterface.java rename to src/main/java/neqsim/process/equipment/splitter/SplitterInterface.java index e3f3663b22..e6ecaecfb1 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/splitter/SplitterInterface.java +++ b/src/main/java/neqsim/process/equipment/splitter/SplitterInterface.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.processequipment.splitter; +package neqsim.process.equipment.splitter; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.stream.StreamInterface; /** *

@@ -26,7 +26,7 @@ public interface SplitterInterface extends ProcessEquipmentInterface { * setInletStream. *

* - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public void setInletStream(StreamInterface inletStream); @@ -37,7 +37,7 @@ public interface SplitterInterface extends ProcessEquipmentInterface { *

* * @param i a int - * @return a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @return a {@link neqsim.process.equipment.stream.Stream} object */ public StreamInterface getSplitStream(int i); } diff --git a/src/main/java/neqsim/processsimulation/processequipment/stream/EnergyStream.java b/src/main/java/neqsim/process/equipment/stream/EnergyStream.java similarity index 96% rename from src/main/java/neqsim/processsimulation/processequipment/stream/EnergyStream.java rename to src/main/java/neqsim/process/equipment/stream/EnergyStream.java index 4b4bfac8fe..30d2c0e551 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/stream/EnergyStream.java +++ b/src/main/java/neqsim/process/equipment/stream/EnergyStream.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.stream; +package neqsim.process.equipment.stream; import java.util.Objects; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/neqsim/processsimulation/processequipment/stream/EquilibriumStream.java b/src/main/java/neqsim/process/equipment/stream/EquilibriumStream.java similarity index 97% rename from src/main/java/neqsim/processsimulation/processequipment/stream/EquilibriumStream.java rename to src/main/java/neqsim/process/equipment/stream/EquilibriumStream.java index f6904b8c26..dcc70fe70f 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/stream/EquilibriumStream.java +++ b/src/main/java/neqsim/process/equipment/stream/EquilibriumStream.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.stream; +package neqsim.process.equipment.stream; import java.util.UUID; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/neqsim/processsimulation/processequipment/stream/IronIonSaturationStream.java b/src/main/java/neqsim/process/equipment/stream/IronIonSaturationStream.java similarity index 98% rename from src/main/java/neqsim/processsimulation/processequipment/stream/IronIonSaturationStream.java rename to src/main/java/neqsim/process/equipment/stream/IronIonSaturationStream.java index 956f39c672..4e34ff2025 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/stream/IronIonSaturationStream.java +++ b/src/main/java/neqsim/process/equipment/stream/IronIonSaturationStream.java @@ -4,7 +4,7 @@ * Created on 12. mars 2001, 13:11 */ -package neqsim.processsimulation.processequipment.stream; +package neqsim.process.equipment.stream; import java.util.UUID; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/neqsim/processsimulation/processequipment/stream/NeqStream.java b/src/main/java/neqsim/process/equipment/stream/NeqStream.java similarity index 97% rename from src/main/java/neqsim/processsimulation/processequipment/stream/NeqStream.java rename to src/main/java/neqsim/process/equipment/stream/NeqStream.java index fb3c315199..7c5680d6c3 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/stream/NeqStream.java +++ b/src/main/java/neqsim/process/equipment/stream/NeqStream.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.stream; +package neqsim.process.equipment.stream; import java.util.UUID; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/neqsim/processsimulation/processequipment/stream/ScalePotentialCheckStream.java b/src/main/java/neqsim/process/equipment/stream/ScalePotentialCheckStream.java similarity index 97% rename from src/main/java/neqsim/processsimulation/processequipment/stream/ScalePotentialCheckStream.java rename to src/main/java/neqsim/process/equipment/stream/ScalePotentialCheckStream.java index 7d6804ff11..26daebb337 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/stream/ScalePotentialCheckStream.java +++ b/src/main/java/neqsim/process/equipment/stream/ScalePotentialCheckStream.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.stream; +package neqsim.process.equipment.stream; import java.util.UUID; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/neqsim/processsimulation/processequipment/stream/Stream.java b/src/main/java/neqsim/process/equipment/stream/Stream.java similarity index 98% rename from src/main/java/neqsim/processsimulation/processequipment/stream/Stream.java rename to src/main/java/neqsim/process/equipment/stream/Stream.java index c8d48f285b..278a4db387 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/stream/Stream.java +++ b/src/main/java/neqsim/process/equipment/stream/Stream.java @@ -4,7 +4,7 @@ * Created on 12. mars 2001, 13:11 */ -package neqsim.processsimulation.processequipment.stream; +package neqsim.process.equipment.stream; import java.util.ArrayList; import java.util.HashMap; @@ -12,8 +12,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import com.google.gson.GsonBuilder; -import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; -import neqsim.processsimulation.util.monitor.StreamResponse; +import neqsim.process.equipment.ProcessEquipmentBaseClass; +import neqsim.process.util.monitor.StreamResponse; import neqsim.standards.gasquality.Standard_ISO6976; import neqsim.standards.oilquality.Standard_ASTM_D6377; import neqsim.thermo.system.SystemInterface; @@ -629,7 +629,7 @@ public double LCV() { * Setter for the field stream. *

* - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public void setStream(StreamInterface stream) { this.stream = stream; diff --git a/src/main/java/neqsim/processsimulation/processequipment/stream/StreamInterface.java b/src/main/java/neqsim/process/equipment/stream/StreamInterface.java similarity index 94% rename from src/main/java/neqsim/processsimulation/processequipment/stream/StreamInterface.java rename to src/main/java/neqsim/process/equipment/stream/StreamInterface.java index dbd4c6790f..a647b4edf4 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/stream/StreamInterface.java +++ b/src/main/java/neqsim/process/equipment/stream/StreamInterface.java @@ -4,9 +4,9 @@ * Created on 21. august 2001, 22:49 */ -package neqsim.processsimulation.processequipment.stream; +package neqsim.process.equipment.stream; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; +import neqsim.process.equipment.ProcessEquipmentInterface; import neqsim.standards.gasquality.Standard_ISO6976; import neqsim.thermo.system.SystemInterface; @@ -177,7 +177,7 @@ public default double getFlowRate(String unit) { * Clone object. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface clone(); @@ -187,7 +187,7 @@ public default double getFlowRate(String unit) { *

* * @param name Name of cloned object - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface clone(String name); diff --git a/src/main/java/neqsim/processsimulation/processequipment/stream/VirtualStream.java b/src/main/java/neqsim/process/equipment/stream/VirtualStream.java similarity index 88% rename from src/main/java/neqsim/processsimulation/processequipment/stream/VirtualStream.java rename to src/main/java/neqsim/process/equipment/stream/VirtualStream.java index f342b1a3ce..8b3f515342 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/stream/VirtualStream.java +++ b/src/main/java/neqsim/process/equipment/stream/VirtualStream.java @@ -1,9 +1,9 @@ -package neqsim.processsimulation.processequipment.stream; +package neqsim.process.equipment.stream; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; +import neqsim.process.equipment.ProcessEquipmentBaseClass; /** *

@@ -38,7 +38,7 @@ public class VirtualStream extends ProcessEquipmentBaseClass { *

* * @param name a {@link java.lang.String} object - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public VirtualStream(String name, StreamInterface stream) { super(name); @@ -61,7 +61,7 @@ public VirtualStream(String name) { * setReferenceStream. *

* - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public void setReferenceStream(StreamInterface stream) { refStream = stream; @@ -148,7 +148,7 @@ public void run(UUID id) { * Getter for the field outStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface getOutStream() { return outStream; diff --git a/src/main/java/neqsim/processsimulation/processequipment/subsea/SimpleFlowLine.java b/src/main/java/neqsim/process/equipment/subsea/SimpleFlowLine.java similarity index 82% rename from src/main/java/neqsim/processsimulation/processequipment/subsea/SimpleFlowLine.java rename to src/main/java/neqsim/process/equipment/subsea/SimpleFlowLine.java index 5f3d28dbab..a86e9c58da 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/subsea/SimpleFlowLine.java +++ b/src/main/java/neqsim/process/equipment/subsea/SimpleFlowLine.java @@ -1,9 +1,9 @@ -package neqsim.processsimulation.processequipment.subsea; +package neqsim.process.equipment.subsea; import java.util.UUID; -import neqsim.processsimulation.processequipment.TwoPortEquipment; -import neqsim.processsimulation.processequipment.pipeline.AdiabaticTwoPhasePipe; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.TwoPortEquipment; +import neqsim.process.equipment.pipeline.AdiabaticTwoPhasePipe; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; /** @@ -26,7 +26,7 @@ public class SimpleFlowLine extends TwoPortEquipment { * Constructor for SimpleFlowLine. * * @param name Name of SimpleFlowLine object - * @param inStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public SimpleFlowLine(String name, StreamInterface inStream) { @@ -40,7 +40,7 @@ public SimpleFlowLine(String name, StreamInterface inStream) { * Getter for the field pipeline. *

* - * @return a {@link neqsim.processsimulation.processequipment.pipeline.AdiabaticTwoPhasePipe} + * @return a {@link neqsim.process.equipment.pipeline.AdiabaticTwoPhasePipe} * object */ public AdiabaticTwoPhasePipe getPipeline() { diff --git a/src/main/java/neqsim/processsimulation/processequipment/subsea/SubseaWell.java b/src/main/java/neqsim/process/equipment/subsea/SubseaWell.java similarity index 88% rename from src/main/java/neqsim/processsimulation/processequipment/subsea/SubseaWell.java rename to src/main/java/neqsim/process/equipment/subsea/SubseaWell.java index 9f2b0ff05c..05e37d730a 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/subsea/SubseaWell.java +++ b/src/main/java/neqsim/process/equipment/subsea/SubseaWell.java @@ -1,14 +1,14 @@ -package neqsim.processsimulation.processequipment.subsea; +package neqsim.process.equipment.subsea; import java.util.ArrayList; import java.util.UUID; -import neqsim.processsimulation.processequipment.TwoPortEquipment; -import neqsim.processsimulation.processequipment.pipeline.AdiabaticTwoPhasePipe; -import neqsim.processsimulation.processequipment.reservoir.SimpleReservoir; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processequipment.util.Adjuster; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; -import neqsim.processsimulation.processsystem.ProcessSystem; +import neqsim.process.equipment.TwoPortEquipment; +import neqsim.process.equipment.pipeline.AdiabaticTwoPhasePipe; +import neqsim.process.equipment.reservoir.SimpleReservoir; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.equipment.util.Adjuster; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.processmodel.ProcessSystem; /** *

@@ -31,7 +31,7 @@ public class SubseaWell extends TwoPortEquipment { *

* * @param name Name of well - * @param instream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param instream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public SubseaWell(String name, StreamInterface instream) { @@ -45,7 +45,7 @@ public SubseaWell(String name, StreamInterface instream) { * Getter for the field pipeline. *

* - * @return a {@link neqsim.processsimulation.processequipment.pipeline.AdiabaticTwoPhasePipe} + * @return a {@link neqsim.process.equipment.pipeline.AdiabaticTwoPhasePipe} * object */ public AdiabaticTwoPhasePipe getPipeline() { diff --git a/src/main/java/neqsim/processsimulation/processequipment/tank/Tank.java b/src/main/java/neqsim/process/equipment/tank/Tank.java similarity index 92% rename from src/main/java/neqsim/processsimulation/processequipment/tank/Tank.java rename to src/main/java/neqsim/process/equipment/tank/Tank.java index e6774e8fdd..ab8df1d2cd 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/tank/Tank.java +++ b/src/main/java/neqsim/process/equipment/tank/Tank.java @@ -1,10 +1,10 @@ -package neqsim.processsimulation.processequipment.tank; +package neqsim.process.equipment.tank; import java.util.UUID; -import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.ProcessEquipmentBaseClass; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -61,7 +61,7 @@ public Tank(String name) { *

* * @param name a {@link java.lang.String} object - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public Tank(String name, StreamInterface inletStream) { @@ -74,7 +74,7 @@ public Tank(String name, StreamInterface inletStream) { * setInletStream. *

* - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public void setInletStream(StreamInterface inletStream) { @@ -93,7 +93,7 @@ public void setInletStream(StreamInterface inletStream) { * addStream. *

* - * @param newStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param newStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public void addStream(StreamInterface newStream) { @@ -110,7 +110,7 @@ public void addStream(StreamInterface newStream) { * Getter for the field liquidOutStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @return a {@link neqsim.process.equipment.stream.Stream} object */ public StreamInterface getLiquidOutStream() { return liquidOutStream; @@ -121,7 +121,7 @@ public StreamInterface getLiquidOutStream() { * Getter for the field gasOutStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @return a {@link neqsim.process.equipment.stream.Stream} object */ public StreamInterface getGasOutStream() { return gasOutStream; @@ -132,7 +132,7 @@ public StreamInterface getGasOutStream() { * getGas. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @return a {@link neqsim.process.equipment.stream.Stream} object */ public StreamInterface getGas() { return getGasOutStream(); @@ -143,7 +143,7 @@ public StreamInterface getGas() { * getLiquid. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @return a {@link neqsim.process.equipment.stream.Stream} object */ public StreamInterface getLiquid() { return getLiquidOutStream(); diff --git a/src/main/java/neqsim/processsimulation/processequipment/util/Adjuster.java b/src/main/java/neqsim/process/equipment/util/Adjuster.java similarity index 92% rename from src/main/java/neqsim/processsimulation/processequipment/util/Adjuster.java rename to src/main/java/neqsim/process/equipment/util/Adjuster.java index 90f537ed74..5cf0e15e06 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/util/Adjuster.java +++ b/src/main/java/neqsim/process/equipment/util/Adjuster.java @@ -1,11 +1,11 @@ -package neqsim.processsimulation.processequipment.util; +package neqsim.process.equipment.util; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.ProcessEquipmentBaseClass; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.stream.Stream; /** *

@@ -58,7 +58,7 @@ public Adjuster(String name) { *

* * @param adjustedEquipment a - * {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} object + * {@link neqsim.process.equipment.ProcessEquipmentInterface} object * @param adjstedVariable a {@link java.lang.String} object * @param unit a string */ @@ -75,7 +75,7 @@ public void setAdjustedVariable(ProcessEquipmentInterface adjustedEquipment, *

* * @param adjustedEquipment a - * {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} object + * {@link neqsim.process.equipment.ProcessEquipmentInterface} object * @param adjstedVariable a {@link java.lang.String} object */ public void setAdjustedVariable(ProcessEquipmentInterface adjustedEquipment, @@ -90,7 +90,7 @@ public void setAdjustedVariable(ProcessEquipmentInterface adjustedEquipment, *

* * @param targetEquipment a - * {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} object + * {@link neqsim.process.equipment.ProcessEquipmentInterface} object * @param targetVariable a {@link java.lang.String} object * @param targetValue a double * @param targetUnit a {@link java.lang.String} object @@ -109,7 +109,7 @@ public void setTargetVariable(ProcessEquipmentInterface targetEquipment, String *

* * @param targetEquipment a - * {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} object + * {@link neqsim.process.equipment.ProcessEquipmentInterface} object * @param targetVariable a {@link java.lang.String} object * @param targetValue a double * @param targetUnit a {@link java.lang.String} object @@ -130,7 +130,7 @@ public void setTargetVariable(ProcessEquipmentInterface targetEquipment, String *

* * @param targetEquipment a - * {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} object + * {@link neqsim.process.equipment.ProcessEquipmentInterface} object * @param targetVariable a {@link java.lang.String} object * @param targetValue a double * @param targetUnit a {@link java.lang.String} object @@ -320,8 +320,8 @@ public static void main(String[] args) { adjuster1.setAdjustedVariable(stream_1, "molarFlow"); adjuster1.setTargetVariable(stream_1, "gasVolumeFlow", 10.0, "MSm3/day", ""); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(adjuster1); diff --git a/src/main/java/neqsim/processsimulation/processequipment/util/Calculator.java b/src/main/java/neqsim/process/equipment/util/Calculator.java similarity index 83% rename from src/main/java/neqsim/processsimulation/processequipment/util/Calculator.java rename to src/main/java/neqsim/process/equipment/util/Calculator.java index 1fdaa14061..130cc6020e 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/util/Calculator.java +++ b/src/main/java/neqsim/process/equipment/util/Calculator.java @@ -1,14 +1,14 @@ -package neqsim.processsimulation.processequipment.util; +package neqsim.process.equipment.util; import java.util.ArrayList; import java.util.Iterator; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.splitter.Splitter; +import neqsim.process.equipment.ProcessEquipmentBaseClass; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.splitter.Splitter; /** *

@@ -42,7 +42,7 @@ public Calculator(String name) { * addInputVariable. *

* - * @param unit a {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} + * @param unit a {@link neqsim.process.equipment.ProcessEquipmentInterface} * object */ public void addInputVariable(ProcessEquipmentInterface unit) { @@ -54,7 +54,7 @@ public void addInputVariable(ProcessEquipmentInterface unit) { * Getter for the field outputVariable. *

* - * @return a {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} object + * @return a {@link neqsim.process.equipment.ProcessEquipmentInterface} object */ public ProcessEquipmentInterface getOutputVariable() { return outputVariable; @@ -125,7 +125,7 @@ public void run(UUID id) { if (sum < 0.0) { sum = 0.0; } - ((neqsim.processsimulation.processequipment.stream.Stream) outputVariable).setFlowRate(sum, + ((neqsim.process.equipment.stream.Stream) outputVariable).setFlowRate(sum, "kg/hr"); outputVariable.run(); outputVariable.setCalculationIdentifier(id); @@ -142,7 +142,7 @@ public void run(UUID id) { *

* * @param outputVariable a - * {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} object + * {@link neqsim.process.equipment.ProcessEquipmentInterface} object */ public void setOutputVariable(ProcessEquipmentInterface outputVariable) { this.outputVariable = outputVariable; diff --git a/src/main/java/neqsim/processsimulation/processequipment/util/FlowRateAdjuster.java b/src/main/java/neqsim/process/equipment/util/FlowRateAdjuster.java similarity index 90% rename from src/main/java/neqsim/processsimulation/processequipment/util/FlowRateAdjuster.java rename to src/main/java/neqsim/process/equipment/util/FlowRateAdjuster.java index 88676e9142..74d5268a6a 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/util/FlowRateAdjuster.java +++ b/src/main/java/neqsim/process/equipment/util/FlowRateAdjuster.java @@ -1,14 +1,14 @@ -package neqsim.processsimulation.processequipment.util; +package neqsim.process.equipment.util; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.TwoPortEquipment; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.mixer.StaticMixer; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.TwoPortEquipment; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.mixer.StaticMixer; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -72,7 +72,7 @@ public FlowRateAdjuster(String name) { *

* * @param name a {@link java.lang.String} object - * @param inStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public FlowRateAdjuster(String name, StreamInterface inStream) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/util/FlowSetter.java b/src/main/java/neqsim/process/equipment/util/FlowSetter.java similarity index 93% rename from src/main/java/neqsim/processsimulation/processequipment/util/FlowSetter.java rename to src/main/java/neqsim/process/equipment/util/FlowSetter.java index 5fb13320fa..4e4c393ab4 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/util/FlowSetter.java +++ b/src/main/java/neqsim/process/equipment/util/FlowSetter.java @@ -1,16 +1,16 @@ -package neqsim.processsimulation.processequipment.util; +package neqsim.process.equipment.util; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import neqsim.physicalproperties.PhysicalPropertyType; -import neqsim.processsimulation.processequipment.TwoPortEquipment; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processsystem.ProcessSystem; +import neqsim.process.equipment.TwoPortEquipment; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.separator.ThreePhaseSeparator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; import neqsim.util.exception.InvalidInputException; @@ -46,7 +46,7 @@ public class FlowSetter extends TwoPortEquipment { *

* * @param name a {@link java.lang.String} object - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public FlowSetter(String name, StreamInterface stream) { super(name, stream); @@ -303,9 +303,9 @@ public void run(UUID id) { * createReferenceProcess. *

* - * @param feedStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param feedStream a {@link neqsim.process.equipment.stream.StreamInterface} * object - * @return a {@link neqsim.processsimulation.processsystem.ProcessSystem} object + * @return a {@link neqsim.process.processmodel.ProcessSystem} object */ public ProcessSystem createReferenceProcess(StreamInterface feedStream) { ProcessSystem referenceProcess = new ProcessSystem(); @@ -378,7 +378,7 @@ public ProcessSystem createReferenceProcess(StreamInterface feedStream) { * Getter for the field referenceProcess. *

* - * @return a {@link neqsim.processsimulation.processsystem.ProcessSystem} object + * @return a {@link neqsim.process.processmodel.ProcessSystem} object */ public ProcessSystem getReferenceProcess() { return referenceProcess; diff --git a/src/main/java/neqsim/processsimulation/processequipment/util/GORfitter.java b/src/main/java/neqsim/process/equipment/util/GORfitter.java similarity index 95% rename from src/main/java/neqsim/processsimulation/processequipment/util/GORfitter.java rename to src/main/java/neqsim/process/equipment/util/GORfitter.java index cf10998281..2c59b542b0 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/util/GORfitter.java +++ b/src/main/java/neqsim/process/equipment/util/GORfitter.java @@ -1,11 +1,11 @@ -package neqsim.processsimulation.processequipment.util; +package neqsim.process.equipment.util; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import neqsim.physicalproperties.PhysicalPropertyType; -import neqsim.processsimulation.processequipment.TwoPortEquipment; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.TwoPortEquipment; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -38,7 +38,7 @@ public class GORfitter extends TwoPortEquipment { *

* * @param name a {@link java.lang.String} object - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public GORfitter(String name, StreamInterface stream) { super(name, stream); diff --git a/src/main/java/neqsim/processsimulation/processequipment/util/MPFMfitter.java b/src/main/java/neqsim/process/equipment/util/MPFMfitter.java similarity index 95% rename from src/main/java/neqsim/processsimulation/processequipment/util/MPFMfitter.java rename to src/main/java/neqsim/process/equipment/util/MPFMfitter.java index b4db94768f..0d57764ba2 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/util/MPFMfitter.java +++ b/src/main/java/neqsim/process/equipment/util/MPFMfitter.java @@ -1,11 +1,11 @@ -package neqsim.processsimulation.processequipment.util; +package neqsim.process.equipment.util; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import neqsim.physicalproperties.PhysicalPropertyType; -import neqsim.processsimulation.processequipment.TwoPortEquipment; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.TwoPortEquipment; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -49,7 +49,7 @@ public MPFMfitter() { * Constructor for MPFMfitter. *

* - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ @Deprecated public MPFMfitter(StreamInterface stream) { @@ -62,7 +62,7 @@ public MPFMfitter(StreamInterface stream) { *

* * @param name a {@link java.lang.String} object - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public MPFMfitter(String name, StreamInterface stream) { super(name, stream); diff --git a/src/main/java/neqsim/processsimulation/processequipment/util/MoleFractionControllerUtil.java b/src/main/java/neqsim/process/equipment/util/MoleFractionControllerUtil.java similarity index 91% rename from src/main/java/neqsim/processsimulation/processequipment/util/MoleFractionControllerUtil.java rename to src/main/java/neqsim/process/equipment/util/MoleFractionControllerUtil.java index 6c21252e90..6f09db9825 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/util/MoleFractionControllerUtil.java +++ b/src/main/java/neqsim/process/equipment/util/MoleFractionControllerUtil.java @@ -1,9 +1,9 @@ -package neqsim.processsimulation.processequipment.util; +package neqsim.process.equipment.util; import java.util.UUID; -import neqsim.processsimulation.processequipment.TwoPortEquipment; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.TwoPortEquipment; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -31,7 +31,7 @@ public class MoleFractionControllerUtil extends TwoPortEquipment { * Constructor for MoleFractionControllerUtil. *

* - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public MoleFractionControllerUtil(StreamInterface inletStream) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/util/NeqSimUnit.java b/src/main/java/neqsim/process/equipment/util/NeqSimUnit.java similarity index 96% rename from src/main/java/neqsim/processsimulation/processequipment/util/NeqSimUnit.java rename to src/main/java/neqsim/process/equipment/util/NeqSimUnit.java index e39b4bbe25..e6476464d6 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/util/NeqSimUnit.java +++ b/src/main/java/neqsim/process/equipment/util/NeqSimUnit.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.util; +package neqsim.process.equipment.util; import java.util.UUID; import neqsim.fluidmechanics.flownode.FlowNodeInterface; @@ -6,9 +6,9 @@ import neqsim.fluidmechanics.flownode.twophasenode.twophasepipeflownode.DropletFlowNode; import neqsim.fluidmechanics.flownode.twophasenode.twophasepipeflownode.StratifiedFlowNode; import neqsim.fluidmechanics.geometrydefinitions.pipe.PipeData; -import neqsim.processsimulation.processequipment.TwoPortEquipment; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.TwoPortEquipment; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; /** @@ -36,7 +36,7 @@ public class NeqSimUnit extends TwoPortEquipment { * Constructor for NeqSimUnit. *

* - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @param inletStream a {@link neqsim.process.equipment.stream.Stream} object * @param equipment a {@link java.lang.String} object * @param flowPattern a {@link java.lang.String} object */ diff --git a/src/main/java/neqsim/processsimulation/processequipment/util/PressureDrop.java b/src/main/java/neqsim/process/equipment/util/PressureDrop.java similarity index 87% rename from src/main/java/neqsim/processsimulation/processequipment/util/PressureDrop.java rename to src/main/java/neqsim/process/equipment/util/PressureDrop.java index 9178841b56..fb5534c594 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/util/PressureDrop.java +++ b/src/main/java/neqsim/process/equipment/util/PressureDrop.java @@ -1,10 +1,10 @@ -package neqsim.processsimulation.processequipment.util; +package neqsim.process.equipment.util; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.equipment.valve.ThrottlingValve; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -58,7 +58,7 @@ public void setPressureDrop(double pressureDrop, String unit) { *

* * @param name a {@link java.lang.String} object - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public PressureDrop(String name, StreamInterface inletStream) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/util/Recycle.java b/src/main/java/neqsim/process/equipment/util/Recycle.java similarity index 92% rename from src/main/java/neqsim/processsimulation/processequipment/util/Recycle.java rename to src/main/java/neqsim/process/equipment/util/Recycle.java index d5a3537c85..47abbdd2a5 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/util/Recycle.java +++ b/src/main/java/neqsim/process/equipment/util/Recycle.java @@ -1,12 +1,12 @@ -package neqsim.processsimulation.processequipment.util; +package neqsim.process.equipment.util; import java.util.ArrayList; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; -import neqsim.processsimulation.processequipment.mixer.MixerInterface; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.ProcessEquipmentBaseClass; +import neqsim.process.equipment.mixer.MixerInterface; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -183,9 +183,7 @@ public void addStream(StreamInterface newStream) { *

* * @param i a int - * @return a - * {@link neqsim.processsimulation.processequipment.stream.StreamInterface} - * object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface getStream(int i) { return streams.get(i); @@ -204,11 +202,13 @@ public void mixStream() { for (int i = 0; i < streams.get(k).getThermoSystem().getPhase(0) .getNumberOfComponents(); i++) { boolean gotComponent = false; - String componentName = streams.get(k).getThermoSystem().getPhase(0).getComponent(i).getName(); + String componentName = + streams.get(k).getThermoSystem().getPhase(0).getComponent(i).getName(); // logger.info("adding: " + componentName); // int numberOfPhases = streams.get(k).getThermoSystem().getNumberOfPhases(); - double moles = streams.get(k).getThermoSystem().getPhase(0).getComponent(i).getNumberOfmoles(); + double moles = + streams.get(k).getThermoSystem().getPhase(0).getComponent(i).getNumberOfmoles(); // logger.info("moles: " + moles + " " + // mixedStream.getThermoSystem().getPhase(0).getNumberOfComponents()); for (int p = 0; p < mixedStream.getThermoSystem().getPhase(0) @@ -216,7 +216,8 @@ public void mixStream() { if (mixedStream.getThermoSystem().getPhase(0).getComponent(p).getName() .equals(componentName)) { gotComponent = true; - index = streams.get(0).getThermoSystem().getPhase(0).getComponent(p).getComponentNumber(); + index = + streams.get(0).getThermoSystem().getPhase(0).getComponent(p).getComponentNumber(); // compName = streams.get(0).getThermoSystem().getPhase(0).getComponent(p) // .getComponentName(); } @@ -286,9 +287,7 @@ public StreamInterface getOutStream() { * initiateDownstreamProperties. *

* - * @param outstream a - * {@link neqsim.processsimulation.processequipment.stream.StreamInterface} - * object + * @param outstream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public void initiateDownstreamProperties(StreamInterface outstream) { lastIterationStream = outstream.clone(); @@ -377,10 +376,12 @@ public void run(UUID id) { public double flowBalanceCheck() { double abs_sum_errorFlow = 0.0; if (mixedStream.getFlowRate("kg/sec") < 1.0) { - abs_sum_errorFlow += Math.abs(mixedStream.getFlowRate("kg/sec") - lastIterationStream.getFlowRate("kg/sec")); + abs_sum_errorFlow += + Math.abs(mixedStream.getFlowRate("kg/sec") - lastIterationStream.getFlowRate("kg/sec")); } else { - abs_sum_errorFlow += Math.abs(mixedStream.getFlowRate("kg/sec") - lastIterationStream.getFlowRate("kg/sec")) - / mixedStream.getFlowRate("kg/sec") * 100.0; + abs_sum_errorFlow += + Math.abs(mixedStream.getFlowRate("kg/sec") - lastIterationStream.getFlowRate("kg/sec")) + / mixedStream.getFlowRate("kg/sec") * 100.0; } return abs_sum_errorFlow; } @@ -443,8 +444,7 @@ public double pressureBalanceCheck() { /** {@inheritDoc} */ @Override - public void displayResult() { - } + public void displayResult() {} /** {@inheritDoc} */ @Override @@ -628,9 +628,7 @@ public StreamInterface getOutletStream() { * Setter for the field outletStream. *

* - * @param outletStream a - * {@link neqsim.processsimulation.processequipment.stream.StreamInterface} - * object + * @param outletStream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public void setOutletStream(StreamInterface outletStream) { this.outletStream = outletStream; diff --git a/src/main/java/neqsim/processsimulation/processequipment/util/RecycleController.java b/src/main/java/neqsim/process/equipment/util/RecycleController.java similarity index 93% rename from src/main/java/neqsim/processsimulation/processequipment/util/RecycleController.java rename to src/main/java/neqsim/process/equipment/util/RecycleController.java index 29eaf3bdee..65878adfb9 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/util/RecycleController.java +++ b/src/main/java/neqsim/process/equipment/util/RecycleController.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.util; +package neqsim.process.equipment.util; import java.util.ArrayList; import java.util.Objects; @@ -60,7 +60,7 @@ public void resetPriorityLevel() { * addRecycle. *

* - * @param recycle a {@link neqsim.processsimulation.processequipment.util.Recycle} object + * @param recycle a {@link neqsim.process.equipment.util.Recycle} object */ public void addRecycle(Recycle recycle) { recycleArray.add(recycle); @@ -72,7 +72,7 @@ public void addRecycle(Recycle recycle) { * doSolveRecycle. *

* - * @param recycle a {@link neqsim.processsimulation.processequipment.util.Recycle} object + * @param recycle a {@link neqsim.process.equipment.util.Recycle} object * @return a boolean */ public boolean doSolveRecycle(Recycle recycle) { @@ -88,7 +88,7 @@ public boolean doSolveRecycle(Recycle recycle) { * isHighestPriority. *

* - * @param recycle a {@link neqsim.processsimulation.processequipment.util.Recycle} object + * @param recycle a {@link neqsim.process.equipment.util.Recycle} object * @return a boolean */ public boolean isHighestPriority(Recycle recycle) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/util/SetPoint.java b/src/main/java/neqsim/process/equipment/util/SetPoint.java similarity index 83% rename from src/main/java/neqsim/processsimulation/processequipment/util/SetPoint.java rename to src/main/java/neqsim/process/equipment/util/SetPoint.java index d23878c8c0..adab9e5f38 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/util/SetPoint.java +++ b/src/main/java/neqsim/process/equipment/util/SetPoint.java @@ -1,11 +1,11 @@ -package neqsim.processsimulation.processequipment.util; +package neqsim.process.equipment.util; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.ProcessEquipmentBaseClass; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.stream.Stream; /** *

@@ -60,10 +60,10 @@ public SetPoint(String name) { * * @param name a {@link java.lang.String} object * @param targetEquipment a - * {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} object + * {@link neqsim.process.equipment.ProcessEquipmentInterface} object * @param targetVariable a {@link java.lang.String} object * @param sourceEquipment a - * {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} object + * {@link neqsim.process.equipment.ProcessEquipmentInterface} object */ public SetPoint(String name, ProcessEquipmentInterface targetEquipment, String targetVariable, ProcessEquipmentInterface sourceEquipment) { @@ -80,7 +80,7 @@ public SetPoint(String name, ProcessEquipmentInterface targetEquipment, String t *

* * @param adjustedEquipment a - * {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} object + * {@link neqsim.process.equipment.ProcessEquipmentInterface} object * @param adjstedVariable a {@link java.lang.String} object */ public void setSourceVariable(ProcessEquipmentInterface adjustedEquipment, @@ -95,7 +95,7 @@ public void setSourceVariable(ProcessEquipmentInterface adjustedEquipment, *

* * @param adjustedEquipment a - * {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} object + * {@link neqsim.process.equipment.ProcessEquipmentInterface} object */ public void setSourceVariable(ProcessEquipmentInterface adjustedEquipment) { this.sourceEquipment = adjustedEquipment; @@ -107,7 +107,7 @@ public void setSourceVariable(ProcessEquipmentInterface adjustedEquipment) { *

* * @param targetEquipment a - * {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} object + * {@link neqsim.process.equipment.ProcessEquipmentInterface} object * @param targetVariable a {@link java.lang.String} object * @param targetValue a double * @param targetUnit a {@link java.lang.String} object @@ -126,7 +126,7 @@ public void setTargetVariable(ProcessEquipmentInterface targetEquipment, String *

* * @param targetEquipment a - * {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} object + * {@link neqsim.process.equipment.ProcessEquipmentInterface} object * @param targetVariable a {@link java.lang.String} object */ public void setTargetVariable(ProcessEquipmentInterface targetEquipment, String targetVariable) { @@ -140,7 +140,7 @@ public void setTargetVariable(ProcessEquipmentInterface targetEquipment, String *

* * @param targetEquipment a - * {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} object + * {@link neqsim.process.equipment.ProcessEquipmentInterface} object * @param targetVariable a {@link java.lang.String} object * @param targetValue a double * @param targetUnit a {@link java.lang.String} object @@ -161,7 +161,7 @@ public void setTargetVariable(ProcessEquipmentInterface targetEquipment, String *

* * @param targetEquipment a - * {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} object + * {@link neqsim.process.equipment.ProcessEquipmentInterface} object * @param targetVariable a {@link java.lang.String} object * @param targetValue a double * @param targetUnit a {@link java.lang.String} object @@ -222,8 +222,8 @@ public static void main(String[] args) { adjuster1.setSourceVariable(stream_1, "molarFlow"); adjuster1.setTargetVariable(stream_1, "gasVolumeFlow", 10.0, "", "MSm3/day"); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(adjuster1); diff --git a/src/main/java/neqsim/processsimulation/processequipment/util/StreamSaturatorUtil.java b/src/main/java/neqsim/process/equipment/util/StreamSaturatorUtil.java similarity index 92% rename from src/main/java/neqsim/processsimulation/processequipment/util/StreamSaturatorUtil.java rename to src/main/java/neqsim/process/equipment/util/StreamSaturatorUtil.java index f20342a3ca..2296148bf1 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/util/StreamSaturatorUtil.java +++ b/src/main/java/neqsim/process/equipment/util/StreamSaturatorUtil.java @@ -1,9 +1,9 @@ -package neqsim.processsimulation.processequipment.util; +package neqsim.process.equipment.util; import java.util.UUID; -import neqsim.processsimulation.processequipment.TwoPortEquipment; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.TwoPortEquipment; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; diff --git a/src/main/java/neqsim/processsimulation/processequipment/util/StreamTransition.java b/src/main/java/neqsim/process/equipment/util/StreamTransition.java similarity index 85% rename from src/main/java/neqsim/processsimulation/processequipment/util/StreamTransition.java rename to src/main/java/neqsim/process/equipment/util/StreamTransition.java index 091ab31780..22f9e99b3c 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/util/StreamTransition.java +++ b/src/main/java/neqsim/process/equipment/util/StreamTransition.java @@ -1,9 +1,9 @@ -package neqsim.processsimulation.processequipment.util; +package neqsim.process.equipment.util; import java.util.UUID; -import neqsim.processsimulation.processequipment.TwoPortEquipment; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processsystem.ProcessSystem; +import neqsim.process.equipment.TwoPortEquipment; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.system.SystemInterface; /** @@ -23,9 +23,9 @@ public class StreamTransition extends TwoPortEquipment { *

* * @param name name of unit operation - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} * object - * @param outletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param outletStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public StreamTransition(String name, StreamInterface inletStream, StreamInterface outletStream) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/valve/SafetyValve.java b/src/main/java/neqsim/process/equipment/valve/SafetyValve.java similarity index 86% rename from src/main/java/neqsim/processsimulation/processequipment/valve/SafetyValve.java rename to src/main/java/neqsim/process/equipment/valve/SafetyValve.java index a417f5f437..1d8fce0b6e 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/valve/SafetyValve.java +++ b/src/main/java/neqsim/process/equipment/valve/SafetyValve.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.processequipment.valve; +package neqsim.process.equipment.valve; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; /** *

@@ -31,7 +31,7 @@ public SafetyValve(String name) { *

* * @param name a {@link java.lang.String} object - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @param inletStream a {@link neqsim.process.equipment.stream.Stream} object */ public SafetyValve(String name, StreamInterface inletStream) { super(name, inletStream); diff --git a/src/main/java/neqsim/processsimulation/processequipment/valve/ThrottlingValve.java b/src/main/java/neqsim/process/equipment/valve/ThrottlingValve.java similarity index 98% rename from src/main/java/neqsim/processsimulation/processequipment/valve/ThrottlingValve.java rename to src/main/java/neqsim/process/equipment/valve/ThrottlingValve.java index d9382fdb91..c0ee5710bf 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/valve/ThrottlingValve.java +++ b/src/main/java/neqsim/process/equipment/valve/ThrottlingValve.java @@ -1,14 +1,14 @@ -package neqsim.processsimulation.processequipment.valve; +package neqsim.process.equipment.valve; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import com.google.gson.GsonBuilder; import neqsim.physicalproperties.PhysicalPropertyType; -import neqsim.processsimulation.mechanicaldesign.valve.ValveMechanicalDesign; -import neqsim.processsimulation.processequipment.TwoPortEquipment; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.util.monitor.ValveResponse; +import neqsim.process.equipment.TwoPortEquipment; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.mechanicaldesign.valve.ValveMechanicalDesign; +import neqsim.process.util.monitor.ValveResponse; import neqsim.thermo.phase.PhaseType; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -61,7 +61,7 @@ public ThrottlingValve(String name) { *

* * @param name a {@link java.lang.String} object - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public ThrottlingValve(String name, StreamInterface inletStream) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/valve/ValveInterface.java b/src/main/java/neqsim/process/equipment/valve/ValveInterface.java similarity index 88% rename from src/main/java/neqsim/processsimulation/processequipment/valve/ValveInterface.java rename to src/main/java/neqsim/process/equipment/valve/ValveInterface.java index 50c6d4f4a1..9f4c18482f 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/valve/ValveInterface.java +++ b/src/main/java/neqsim/process/equipment/valve/ValveInterface.java @@ -4,10 +4,10 @@ * Created on 22. august 2001, 17:20 */ -package neqsim.processsimulation.processequipment.valve; +package neqsim.process.equipment.valve; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.TwoPortInterface; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.TwoPortInterface; import neqsim.thermo.system.SystemInterface; /** diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/CombustionEmissionsCalculator.java b/src/main/java/neqsim/process/measurementdevice/CombustionEmissionsCalculator.java similarity index 90% rename from src/main/java/neqsim/processsimulation/measurementdevice/CombustionEmissionsCalculator.java rename to src/main/java/neqsim/process/measurementdevice/CombustionEmissionsCalculator.java index 7bfea8f8e6..6ed55f82ef 100644 --- a/src/main/java/neqsim/processsimulation/measurementdevice/CombustionEmissionsCalculator.java +++ b/src/main/java/neqsim/process/measurementdevice/CombustionEmissionsCalculator.java @@ -1,8 +1,8 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; import java.util.HashMap; import java.util.Map; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; /** *

@@ -26,7 +26,7 @@ public class CombustionEmissionsCalculator extends StreamMeasurementDeviceBaseCl * Constructor for CombustionEmissionsCalculator. *

* - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public CombustionEmissionsCalculator(StreamInterface stream) { this("EmissionCalculator", stream); @@ -38,7 +38,7 @@ public CombustionEmissionsCalculator(StreamInterface stream) { *

* * @param name Name of WaterDewPointAnalyser - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public CombustionEmissionsCalculator(String name, StreamInterface stream) { super(name, "kg/hr", stream); diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/CompressorMonitor.java b/src/main/java/neqsim/process/measurementdevice/CompressorMonitor.java similarity index 77% rename from src/main/java/neqsim/processsimulation/measurementdevice/CompressorMonitor.java rename to src/main/java/neqsim/process/measurementdevice/CompressorMonitor.java index fd340d4c12..ac4d14876b 100644 --- a/src/main/java/neqsim/processsimulation/measurementdevice/CompressorMonitor.java +++ b/src/main/java/neqsim/process/measurementdevice/CompressorMonitor.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; -import neqsim.processsimulation.processequipment.compressor.Compressor; +import neqsim.process.equipment.compressor.Compressor; /** *

@@ -19,7 +19,7 @@ public class CompressorMonitor extends MeasurementDeviceBaseClass { * Constructor for CompressorMonitor. *

* - * @param compressor a {@link neqsim.processsimulation.processequipment.compressor.Compressor} + * @param compressor a {@link neqsim.process.equipment.compressor.Compressor} * object */ public CompressorMonitor(Compressor compressor) { @@ -32,7 +32,7 @@ public CompressorMonitor(Compressor compressor) { *

* * @param name Name of Compressor - * @param compressor a {@link neqsim.processsimulation.processequipment.compressor.Compressor} + * @param compressor a {@link neqsim.process.equipment.compressor.Compressor} */ public CompressorMonitor(String name, Compressor compressor) { super(name, "rpm"); diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/CricondenbarAnalyser.java b/src/main/java/neqsim/process/measurementdevice/CricondenbarAnalyser.java similarity index 89% rename from src/main/java/neqsim/processsimulation/measurementdevice/CricondenbarAnalyser.java rename to src/main/java/neqsim/process/measurementdevice/CricondenbarAnalyser.java index 4df9fafd75..ecbaee9d15 100644 --- a/src/main/java/neqsim/processsimulation/measurementdevice/CricondenbarAnalyser.java +++ b/src/main/java/neqsim/process/measurementdevice/CricondenbarAnalyser.java @@ -1,8 +1,8 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -23,7 +23,7 @@ public class CricondenbarAnalyser extends StreamMeasurementDeviceBaseClass { * Constructor for CricondenbarAnalyser. *

* - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public CricondenbarAnalyser(StreamInterface stream) { this("CricondenbarAnalyser", stream); @@ -35,7 +35,7 @@ public CricondenbarAnalyser(StreamInterface stream) { *

* * @param name Name of CricondenbarAnalyser - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public CricondenbarAnalyser(String name, StreamInterface stream) { super(name, "K", stream); diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/FlowInducedVibrationAnalyser.java b/src/main/java/neqsim/process/measurementdevice/FlowInducedVibrationAnalyser.java similarity index 93% rename from src/main/java/neqsim/processsimulation/measurementdevice/FlowInducedVibrationAnalyser.java rename to src/main/java/neqsim/process/measurementdevice/FlowInducedVibrationAnalyser.java index d403c3e724..55ba4540c4 100644 --- a/src/main/java/neqsim/processsimulation/measurementdevice/FlowInducedVibrationAnalyser.java +++ b/src/main/java/neqsim/process/measurementdevice/FlowInducedVibrationAnalyser.java @@ -1,8 +1,8 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.pipeline.PipeBeggsAndBrills; +import neqsim.process.equipment.pipeline.PipeBeggsAndBrills; /** *

@@ -35,7 +35,7 @@ public class FlowInducedVibrationAnalyser extends MeasurementDeviceBaseClass { * Constructor for WaterDewPointAnalyser. *

* - * @param pipe a {@link neqsim.processsimulation.processequipment.pipeline.PipeBeggsAndBrills} + * @param pipe a {@link neqsim.process.equipment.pipeline.PipeBeggsAndBrills} * object */ public FlowInducedVibrationAnalyser(PipeBeggsAndBrills pipe) { @@ -48,7 +48,7 @@ public FlowInducedVibrationAnalyser(PipeBeggsAndBrills pipe) { *

* * @param name Name of FlowInducedVibrationAnalyser - * @param pipe a {@link neqsim.processsimulation.processequipment.pipeline.PipeBeggsAndBrills} + * @param pipe a {@link neqsim.process.equipment.pipeline.PipeBeggsAndBrills} * object */ public FlowInducedVibrationAnalyser(String name, PipeBeggsAndBrills pipe) { diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/HydrateEquilibriumTemperatureAnalyser.java b/src/main/java/neqsim/process/measurementdevice/HydrateEquilibriumTemperatureAnalyser.java similarity index 91% rename from src/main/java/neqsim/processsimulation/measurementdevice/HydrateEquilibriumTemperatureAnalyser.java rename to src/main/java/neqsim/process/measurementdevice/HydrateEquilibriumTemperatureAnalyser.java index a280292a02..f60600230b 100644 --- a/src/main/java/neqsim/processsimulation/measurementdevice/HydrateEquilibriumTemperatureAnalyser.java +++ b/src/main/java/neqsim/process/measurementdevice/HydrateEquilibriumTemperatureAnalyser.java @@ -1,8 +1,8 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -26,7 +26,7 @@ public class HydrateEquilibriumTemperatureAnalyser extends StreamMeasurementDevi *

* * @param name Name of HydrateEquilibriumTemperatureAnalyser - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public HydrateEquilibriumTemperatureAnalyser(String name, StreamInterface stream) { super(name, "K", stream); diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/LevelTransmitter.java b/src/main/java/neqsim/process/measurementdevice/LevelTransmitter.java similarity index 78% rename from src/main/java/neqsim/processsimulation/measurementdevice/LevelTransmitter.java rename to src/main/java/neqsim/process/measurementdevice/LevelTransmitter.java index fa9a4072fb..8aa7a5b7ad 100644 --- a/src/main/java/neqsim/processsimulation/measurementdevice/LevelTransmitter.java +++ b/src/main/java/neqsim/process/measurementdevice/LevelTransmitter.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; -import neqsim.processsimulation.processequipment.separator.Separator; +import neqsim.process.equipment.separator.Separator; /** *

@@ -20,7 +20,7 @@ public class LevelTransmitter extends MeasurementDeviceBaseClass { * Constructor for LevelTransmitter. *

* - * @param separator a {@link neqsim.processsimulation.processequipment.separator.Separator} object + * @param separator a {@link neqsim.process.equipment.separator.Separator} object */ public LevelTransmitter(Separator separator) { this("LevelTransmitter", separator); @@ -32,7 +32,7 @@ public LevelTransmitter(Separator separator) { *

* * @param name Name of LevelTransmitter - * @param separator a {@link neqsim.processsimulation.processequipment.separator.Separator} object + * @param separator a {@link neqsim.process.equipment.separator.Separator} object */ public LevelTransmitter(String name, Separator separator) { super(name, ""); diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/MeasurementDeviceBaseClass.java b/src/main/java/neqsim/process/measurementdevice/MeasurementDeviceBaseClass.java similarity index 97% rename from src/main/java/neqsim/processsimulation/measurementdevice/MeasurementDeviceBaseClass.java rename to src/main/java/neqsim/process/measurementdevice/MeasurementDeviceBaseClass.java index cdd629e97e..23edc2c112 100644 --- a/src/main/java/neqsim/processsimulation/measurementdevice/MeasurementDeviceBaseClass.java +++ b/src/main/java/neqsim/process/measurementdevice/MeasurementDeviceBaseClass.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; -import neqsim.processsimulation.measurementdevice.online.OnlineSignal; +import neqsim.process.measurementdevice.online.OnlineSignal; import neqsim.util.NamedBaseClass; /** diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/MeasurementDeviceInterface.java b/src/main/java/neqsim/process/measurementdevice/MeasurementDeviceInterface.java similarity index 91% rename from src/main/java/neqsim/processsimulation/measurementdevice/MeasurementDeviceInterface.java rename to src/main/java/neqsim/process/measurementdevice/MeasurementDeviceInterface.java index d96fff2c80..875cf1f270 100644 --- a/src/main/java/neqsim/processsimulation/measurementdevice/MeasurementDeviceInterface.java +++ b/src/main/java/neqsim/process/measurementdevice/MeasurementDeviceInterface.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; -import neqsim.processsimulation.measurementdevice.online.OnlineSignal; +import neqsim.process.measurementdevice.online.OnlineSignal; import neqsim.util.NamedInterface; /** @@ -45,7 +45,7 @@ public default double getMeasuredValue() { * getOnlineSignal. *

* - * @return a {@link neqsim.processsimulation.measurementdevice.online.OnlineSignal} object + * @return a {@link neqsim.process.measurementdevice.online.OnlineSignal} object */ public OnlineSignal getOnlineSignal(); diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/MolarMassAnalyser.java b/src/main/java/neqsim/process/measurementdevice/MolarMassAnalyser.java similarity index 77% rename from src/main/java/neqsim/processsimulation/measurementdevice/MolarMassAnalyser.java rename to src/main/java/neqsim/process/measurementdevice/MolarMassAnalyser.java index 3f2e276dc5..c63670e454 100644 --- a/src/main/java/neqsim/processsimulation/measurementdevice/MolarMassAnalyser.java +++ b/src/main/java/neqsim/process/measurementdevice/MolarMassAnalyser.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; /** *

@@ -18,7 +18,7 @@ public class MolarMassAnalyser extends StreamMeasurementDeviceBaseClass { * Constructor for MolarMassAnalyser. *

* - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public MolarMassAnalyser(StreamInterface stream) { this("molar mass analyser", stream); @@ -30,7 +30,7 @@ public MolarMassAnalyser(StreamInterface stream) { *

* * @param name Name of MolarMassAnalyser - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public MolarMassAnalyser(String name, StreamInterface stream) { super(name, "gr/mol", stream); diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/MultiPhaseMeter.java b/src/main/java/neqsim/process/measurementdevice/MultiPhaseMeter.java similarity index 96% rename from src/main/java/neqsim/processsimulation/measurementdevice/MultiPhaseMeter.java rename to src/main/java/neqsim/process/measurementdevice/MultiPhaseMeter.java index d20af235f4..7a2b3d4947 100644 --- a/src/main/java/neqsim/processsimulation/measurementdevice/MultiPhaseMeter.java +++ b/src/main/java/neqsim/process/measurementdevice/MultiPhaseMeter.java @@ -1,9 +1,9 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import neqsim.physicalproperties.PhysicalPropertyType; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -30,7 +30,7 @@ public class MultiPhaseMeter extends StreamMeasurementDeviceBaseClass { * Constructor for MultiPhaseMeter. *

* - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public MultiPhaseMeter(StreamInterface stream) { this("Multi Phase Meter", stream); @@ -42,7 +42,7 @@ public MultiPhaseMeter(StreamInterface stream) { *

* * @param name a {@link java.lang.String} object - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public MultiPhaseMeter(String name, StreamInterface stream) { super(name, "kg/hr", stream); diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/NMVOCAnalyser.java b/src/main/java/neqsim/process/measurementdevice/NMVOCAnalyser.java similarity index 83% rename from src/main/java/neqsim/processsimulation/measurementdevice/NMVOCAnalyser.java rename to src/main/java/neqsim/process/measurementdevice/NMVOCAnalyser.java index a0c49f0388..6bcfbfd8f2 100644 --- a/src/main/java/neqsim/processsimulation/measurementdevice/NMVOCAnalyser.java +++ b/src/main/java/neqsim/process/measurementdevice/NMVOCAnalyser.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; /** *

@@ -18,7 +18,7 @@ public class NMVOCAnalyser extends StreamMeasurementDeviceBaseClass { * Constructor for NMVOCAnalyser. *

* - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public NMVOCAnalyser(StreamInterface stream) { this("NM VOC Analyser", stream); @@ -30,7 +30,7 @@ public NMVOCAnalyser(StreamInterface stream) { *

* * @param name Name of NMVOCAnalyser - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public NMVOCAnalyser(String name, StreamInterface stream) { super(name, "kg/hr", stream); diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/PressureTransmitter.java b/src/main/java/neqsim/process/measurementdevice/PressureTransmitter.java similarity index 73% rename from src/main/java/neqsim/processsimulation/measurementdevice/PressureTransmitter.java rename to src/main/java/neqsim/process/measurementdevice/PressureTransmitter.java index 648f16855b..41db6467d7 100644 --- a/src/main/java/neqsim/processsimulation/measurementdevice/PressureTransmitter.java +++ b/src/main/java/neqsim/process/measurementdevice/PressureTransmitter.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; /** *

@@ -18,7 +18,7 @@ public class PressureTransmitter extends StreamMeasurementDeviceBaseClass { * Constructor for PressureTransmitter. *

* - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public PressureTransmitter(StreamInterface stream) { this("Pressure Transmitter", stream); @@ -30,7 +30,7 @@ public PressureTransmitter(StreamInterface stream) { *

* * @param name Name of PressureTransmitter - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public PressureTransmitter(String name, StreamInterface stream) { super(name, "bar", stream); diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/StreamMeasurementDeviceBaseClass.java b/src/main/java/neqsim/process/measurementdevice/StreamMeasurementDeviceBaseClass.java similarity index 88% rename from src/main/java/neqsim/processsimulation/measurementdevice/StreamMeasurementDeviceBaseClass.java rename to src/main/java/neqsim/process/measurementdevice/StreamMeasurementDeviceBaseClass.java index 2993eb300a..9502268ed5 100644 --- a/src/main/java/neqsim/processsimulation/measurementdevice/StreamMeasurementDeviceBaseClass.java +++ b/src/main/java/neqsim/process/measurementdevice/StreamMeasurementDeviceBaseClass.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; /** *

diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/TemperatureTransmitter.java b/src/main/java/neqsim/process/measurementdevice/TemperatureTransmitter.java similarity index 75% rename from src/main/java/neqsim/processsimulation/measurementdevice/TemperatureTransmitter.java rename to src/main/java/neqsim/process/measurementdevice/TemperatureTransmitter.java index ffa9aab88a..80d0603c06 100644 --- a/src/main/java/neqsim/processsimulation/measurementdevice/TemperatureTransmitter.java +++ b/src/main/java/neqsim/process/measurementdevice/TemperatureTransmitter.java @@ -4,9 +4,9 @@ * Created on 6. juni 2006, 15:24 */ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; /** *

@@ -24,7 +24,7 @@ public class TemperatureTransmitter extends StreamMeasurementDeviceBaseClass { * Constructor for TemperatureTransmitter. *

* - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public TemperatureTransmitter(StreamInterface stream) { this("Temperature Transmitter", stream); @@ -36,7 +36,7 @@ public TemperatureTransmitter(StreamInterface stream) { *

* * @param name Name of TemperatureTransmitter - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public TemperatureTransmitter(String name, StreamInterface stream) { super(name, "K", stream); diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/VolumeFlowTransmitter.java b/src/main/java/neqsim/process/measurementdevice/VolumeFlowTransmitter.java similarity index 89% rename from src/main/java/neqsim/processsimulation/measurementdevice/VolumeFlowTransmitter.java rename to src/main/java/neqsim/process/measurementdevice/VolumeFlowTransmitter.java index 5553ce4341..44e139ce50 100644 --- a/src/main/java/neqsim/processsimulation/measurementdevice/VolumeFlowTransmitter.java +++ b/src/main/java/neqsim/process/measurementdevice/VolumeFlowTransmitter.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.ThermodynamicConstantsInterface; /** @@ -21,7 +21,7 @@ public class VolumeFlowTransmitter extends StreamMeasurementDeviceBaseClass { * Constructor for VolumeFlowTransmitter. *

* - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public VolumeFlowTransmitter(StreamInterface stream) { this("volume flow rate", stream); @@ -33,7 +33,7 @@ public VolumeFlowTransmitter(StreamInterface stream) { *

* * @param name Name of VolumeFlowTransmitter - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public VolumeFlowTransmitter(String name, StreamInterface stream) { super(name, "m^3/hr", stream); diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/WaterContentAnalyser.java b/src/main/java/neqsim/process/measurementdevice/WaterContentAnalyser.java similarity index 81% rename from src/main/java/neqsim/processsimulation/measurementdevice/WaterContentAnalyser.java rename to src/main/java/neqsim/process/measurementdevice/WaterContentAnalyser.java index 0762e9bdfb..a8f7cc5bf0 100644 --- a/src/main/java/neqsim/processsimulation/measurementdevice/WaterContentAnalyser.java +++ b/src/main/java/neqsim/process/measurementdevice/WaterContentAnalyser.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; /** *

@@ -18,7 +18,7 @@ public class WaterContentAnalyser extends StreamMeasurementDeviceBaseClass { * Constructor for WaterContentAnalyser. *

* - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public WaterContentAnalyser(StreamInterface stream) { this("water analyser", stream); @@ -30,7 +30,7 @@ public WaterContentAnalyser(StreamInterface stream) { *

* * @param name Name of WaterContentAnalyser - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public WaterContentAnalyser(String name, StreamInterface stream) { super(name, "kg/day", stream); diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/WaterDewPointAnalyser.java b/src/main/java/neqsim/process/measurementdevice/WaterDewPointAnalyser.java similarity index 92% rename from src/main/java/neqsim/processsimulation/measurementdevice/WaterDewPointAnalyser.java rename to src/main/java/neqsim/process/measurementdevice/WaterDewPointAnalyser.java index 2893b9a68b..24cbc5216a 100644 --- a/src/main/java/neqsim/processsimulation/measurementdevice/WaterDewPointAnalyser.java +++ b/src/main/java/neqsim/process/measurementdevice/WaterDewPointAnalyser.java @@ -1,8 +1,8 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.util.empiric.BukacekWaterInGas; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -27,7 +27,7 @@ public class WaterDewPointAnalyser extends StreamMeasurementDeviceBaseClass { * Constructor for WaterDewPointAnalyser. *

* - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public WaterDewPointAnalyser(StreamInterface stream) { this("WaterDewPointAnalyser", stream); @@ -39,7 +39,7 @@ public WaterDewPointAnalyser(StreamInterface stream) { *

* * @param name Name of WaterDewPointAnalyser - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public WaterDewPointAnalyser(String name, StreamInterface stream) { super(name, "K", stream); diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/WellAllocator.java b/src/main/java/neqsim/process/measurementdevice/WellAllocator.java similarity index 82% rename from src/main/java/neqsim/processsimulation/measurementdevice/WellAllocator.java rename to src/main/java/neqsim/process/measurementdevice/WellAllocator.java index e45ab3969f..1563d59c36 100644 --- a/src/main/java/neqsim/processsimulation/measurementdevice/WellAllocator.java +++ b/src/main/java/neqsim/process/measurementdevice/WellAllocator.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; /** *

@@ -20,7 +20,7 @@ public class WellAllocator extends StreamMeasurementDeviceBaseClass { * Constructor for WellAllocator. *

* - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public WellAllocator(StreamInterface stream) { this("Well Allocator", stream); @@ -32,7 +32,7 @@ public WellAllocator(StreamInterface stream) { *

* * @param name a {@link java.lang.String} object - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public WellAllocator(String name, StreamInterface stream) { super(name, "kg/hr", stream); @@ -43,7 +43,7 @@ public WellAllocator(String name, StreamInterface stream) { * Setter for the field exportGasStream. *

* - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public void setExportGasStream(StreamInterface stream) { this.exportGasStream = stream; @@ -54,7 +54,7 @@ public void setExportGasStream(StreamInterface stream) { * Setter for the field exportOilStream. *

* - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public void setExportOilStream(StreamInterface stream) { this.exportOilStream = stream; diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/online/OnlineSignal.java b/src/main/java/neqsim/process/measurementdevice/online/OnlineSignal.java similarity index 97% rename from src/main/java/neqsim/processsimulation/measurementdevice/online/OnlineSignal.java rename to src/main/java/neqsim/process/measurementdevice/online/OnlineSignal.java index 447aad3f47..a5b52294e5 100644 --- a/src/main/java/neqsim/processsimulation/measurementdevice/online/OnlineSignal.java +++ b/src/main/java/neqsim/process/measurementdevice/online/OnlineSignal.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.measurementdevice.online; +package neqsim.process.measurementdevice.online; import java.util.Date; diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/pHProbe.java b/src/main/java/neqsim/process/measurementdevice/pHProbe.java similarity index 91% rename from src/main/java/neqsim/processsimulation/measurementdevice/pHProbe.java rename to src/main/java/neqsim/process/measurementdevice/pHProbe.java index 7603bb592f..bde487fcb0 100644 --- a/src/main/java/neqsim/processsimulation/measurementdevice/pHProbe.java +++ b/src/main/java/neqsim/process/measurementdevice/pHProbe.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -25,7 +25,7 @@ public class pHProbe extends StreamMeasurementDeviceBaseClass { * Constructor for pHProbe. *

* - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public pHProbe(StreamInterface stream) { this("phProbe", stream); @@ -37,7 +37,7 @@ public pHProbe(StreamInterface stream) { *

* * @param name Name of pHProbe - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public pHProbe(String name, StreamInterface stream) { super(name, "", stream); diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/simpleflowregime/FluidSevereSlug.java b/src/main/java/neqsim/process/measurementdevice/simpleflowregime/FluidSevereSlug.java similarity index 97% rename from src/main/java/neqsim/processsimulation/measurementdevice/simpleflowregime/FluidSevereSlug.java rename to src/main/java/neqsim/process/measurementdevice/simpleflowregime/FluidSevereSlug.java index 7d54c7df40..dc25c07ae2 100644 --- a/src/main/java/neqsim/processsimulation/measurementdevice/simpleflowregime/FluidSevereSlug.java +++ b/src/main/java/neqsim/process/measurementdevice/simpleflowregime/FluidSevereSlug.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.measurementdevice.simpleflowregime; +package neqsim.process.measurementdevice.simpleflowregime; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/simpleflowregime/Pipe.java b/src/main/java/neqsim/process/measurementdevice/simpleflowregime/Pipe.java similarity index 97% rename from src/main/java/neqsim/processsimulation/measurementdevice/simpleflowregime/Pipe.java rename to src/main/java/neqsim/process/measurementdevice/simpleflowregime/Pipe.java index 98a26febea..02d82bdbc5 100644 --- a/src/main/java/neqsim/processsimulation/measurementdevice/simpleflowregime/Pipe.java +++ b/src/main/java/neqsim/process/measurementdevice/simpleflowregime/Pipe.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.measurementdevice.simpleflowregime; +package neqsim.process.measurementdevice.simpleflowregime; /** *

diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/simpleflowregime/SevereSlugAnalyser.java b/src/main/java/neqsim/process/measurementdevice/simpleflowregime/SevereSlugAnalyser.java similarity index 92% rename from src/main/java/neqsim/processsimulation/measurementdevice/simpleflowregime/SevereSlugAnalyser.java rename to src/main/java/neqsim/process/measurementdevice/simpleflowregime/SevereSlugAnalyser.java index f55053cf10..b0d18128e2 100644 --- a/src/main/java/neqsim/processsimulation/measurementdevice/simpleflowregime/SevereSlugAnalyser.java +++ b/src/main/java/neqsim/process/measurementdevice/simpleflowregime/SevereSlugAnalyser.java @@ -1,11 +1,11 @@ -package neqsim.processsimulation.measurementdevice.simpleflowregime; +package neqsim.process.measurementdevice.simpleflowregime; import java.util.Arrays; import java.util.Collections; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.measurementdevice.MeasurementDeviceBaseClass; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.measurementdevice.MeasurementDeviceBaseClass; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -419,7 +419,7 @@ public double getSimulationTime() { *

* * @param fluid a - * {@link neqsim.processsimulation.measurementdevice.simpleflowregime.FluidSevereSlug} + * {@link neqsim.process.measurementdevice.simpleflowregime.FluidSevereSlug} * object * @return a double */ @@ -435,9 +435,9 @@ public double gasConst(FluidSevereSlug fluid) { * slugHoldUp. *

* - * @param pipe a {@link neqsim.processsimulation.measurementdevice.simpleflowregime.Pipe} object + * @param pipe a {@link neqsim.process.measurementdevice.simpleflowregime.Pipe} object * @param severeSlug a - * {@link neqsim.processsimulation.measurementdevice.simpleflowregime.SevereSlugAnalyser} + * {@link neqsim.process.measurementdevice.simpleflowregime.SevereSlugAnalyser} * object * @return a double */ @@ -458,11 +458,11 @@ public double slugHoldUp(Pipe pipe, SevereSlugAnalyser severeSlug) { *

* * @param fluid a - * {@link neqsim.processsimulation.measurementdevice.simpleflowregime.FluidSevereSlug} + * {@link neqsim.process.measurementdevice.simpleflowregime.FluidSevereSlug} * object - * @param pipe a {@link neqsim.processsimulation.measurementdevice.simpleflowregime.Pipe} object + * @param pipe a {@link neqsim.process.measurementdevice.simpleflowregime.Pipe} object * @param severeSlug a - * {@link neqsim.processsimulation.measurementdevice.simpleflowregime.SevereSlugAnalyser} + * {@link neqsim.process.measurementdevice.simpleflowregime.SevereSlugAnalyser} * object * @return a double */ @@ -524,11 +524,11 @@ public double stratifiedHoldUp(FluidSevereSlug fluid, Pipe pipe, SevereSlugAnaly *

* * @param fluid a - * {@link neqsim.processsimulation.measurementdevice.simpleflowregime.FluidSevereSlug} + * {@link neqsim.process.measurementdevice.simpleflowregime.FluidSevereSlug} * object - * @param pipe a {@link neqsim.processsimulation.measurementdevice.simpleflowregime.Pipe} object + * @param pipe a {@link neqsim.process.measurementdevice.simpleflowregime.Pipe} object * @param severeSlug a - * {@link neqsim.processsimulation.measurementdevice.simpleflowregime.SevereSlugAnalyser} + * {@link neqsim.process.measurementdevice.simpleflowregime.SevereSlugAnalyser} * object */ public void runSevereSlug(FluidSevereSlug fluid, Pipe pipe, SevereSlugAnalyser severeSlug) { @@ -634,11 +634,11 @@ public void runSevereSlug(FluidSevereSlug fluid, Pipe pipe, SevereSlugAnalyser s *

* * @param fluid a - * {@link neqsim.processsimulation.measurementdevice.simpleflowregime.FluidSevereSlug} + * {@link neqsim.process.measurementdevice.simpleflowregime.FluidSevereSlug} * object - * @param pipe a {@link neqsim.processsimulation.measurementdevice.simpleflowregime.Pipe} object + * @param pipe a {@link neqsim.process.measurementdevice.simpleflowregime.Pipe} object * @param severeSlug a - * {@link neqsim.processsimulation.measurementdevice.simpleflowregime.SevereSlugAnalyser} + * {@link neqsim.process.measurementdevice.simpleflowregime.SevereSlugAnalyser} * object * @return a {@link java.lang.String} object */ @@ -714,11 +714,11 @@ public double getMeasuredValue(String unit) { *

* * @param fluid a - * {@link neqsim.processsimulation.measurementdevice.simpleflowregime.FluidSevereSlug} + * {@link neqsim.process.measurementdevice.simpleflowregime.FluidSevereSlug} * object - * @param pipe a {@link neqsim.processsimulation.measurementdevice.simpleflowregime.Pipe} object + * @param pipe a {@link neqsim.process.measurementdevice.simpleflowregime.Pipe} object * @param severeSlug a - * {@link neqsim.processsimulation.measurementdevice.simpleflowregime.SevereSlugAnalyser} + * {@link neqsim.process.measurementdevice.simpleflowregime.SevereSlugAnalyser} * object * @return a double */ @@ -765,11 +765,11 @@ public String getPredictedFlowRegime() { *

* * @param fluid a - * {@link neqsim.processsimulation.measurementdevice.simpleflowregime.FluidSevereSlug} + * {@link neqsim.process.measurementdevice.simpleflowregime.FluidSevereSlug} * object - * @param pipe a {@link neqsim.processsimulation.measurementdevice.simpleflowregime.Pipe} object + * @param pipe a {@link neqsim.process.measurementdevice.simpleflowregime.Pipe} object * @param severeSlug a - * {@link neqsim.processsimulation.measurementdevice.simpleflowregime.SevereSlugAnalyser} + * {@link neqsim.process.measurementdevice.simpleflowregime.SevereSlugAnalyser} * object * @return a {@link java.lang.String} object */ diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/MechanicalDesign.java b/src/main/java/neqsim/process/mechanicaldesign/MechanicalDesign.java similarity index 96% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/MechanicalDesign.java rename to src/main/java/neqsim/process/mechanicaldesign/MechanicalDesign.java index 598d884134..0bda8d3f4d 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/MechanicalDesign.java +++ b/src/main/java/neqsim/process/mechanicaldesign/MechanicalDesign.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.mechanicaldesign; +package neqsim.process.mechanicaldesign; import java.awt.BorderLayout; import java.awt.Container; @@ -7,18 +7,18 @@ import javax.swing.JFrame; import javax.swing.JScrollPane; import javax.swing.JTable; -import neqsim.processsimulation.costestimation.UnitCostEstimateBaseClass; -import neqsim.processsimulation.mechanicaldesign.designstandards.AdsorptionDehydrationDesignStandard; -import neqsim.processsimulation.mechanicaldesign.designstandards.CompressorDesignStandard; -import neqsim.processsimulation.mechanicaldesign.designstandards.DesignStandard; -import neqsim.processsimulation.mechanicaldesign.designstandards.GasScrubberDesignStandard; -import neqsim.processsimulation.mechanicaldesign.designstandards.JointEfficiencyPlateStandard; -import neqsim.processsimulation.mechanicaldesign.designstandards.MaterialPipeDesignStandard; -import neqsim.processsimulation.mechanicaldesign.designstandards.MaterialPlateDesignStandard; -import neqsim.processsimulation.mechanicaldesign.designstandards.PipelineDesignStandard; -import neqsim.processsimulation.mechanicaldesign.designstandards.PressureVesselDesignStandard; -import neqsim.processsimulation.mechanicaldesign.designstandards.SeparatorDesignStandard; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; +import neqsim.process.costestimation.UnitCostEstimateBaseClass; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.mechanicaldesign.designstandards.AdsorptionDehydrationDesignStandard; +import neqsim.process.mechanicaldesign.designstandards.CompressorDesignStandard; +import neqsim.process.mechanicaldesign.designstandards.DesignStandard; +import neqsim.process.mechanicaldesign.designstandards.GasScrubberDesignStandard; +import neqsim.process.mechanicaldesign.designstandards.JointEfficiencyPlateStandard; +import neqsim.process.mechanicaldesign.designstandards.MaterialPipeDesignStandard; +import neqsim.process.mechanicaldesign.designstandards.MaterialPlateDesignStandard; +import neqsim.process.mechanicaldesign.designstandards.PipelineDesignStandard; +import neqsim.process.mechanicaldesign.designstandards.PressureVesselDesignStandard; +import neqsim.process.mechanicaldesign.designstandards.SeparatorDesignStandard; /** *

@@ -128,7 +128,7 @@ public void setMaterialDesignStandard(MaterialPlateDesignStandard materialDesign *

* * @param processEquipment a - * {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} object + * {@link neqsim.process.equipment.ProcessEquipmentInterface} object */ public MechanicalDesign(ProcessEquipmentInterface processEquipment) { this.processEquipment = processEquipment; diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/SystemMechanicalDesign.java b/src/main/java/neqsim/process/mechanicaldesign/SystemMechanicalDesign.java similarity index 93% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/SystemMechanicalDesign.java rename to src/main/java/neqsim/process/mechanicaldesign/SystemMechanicalDesign.java index 3737443941..f787bdfd2f 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/SystemMechanicalDesign.java +++ b/src/main/java/neqsim/process/mechanicaldesign/SystemMechanicalDesign.java @@ -1,11 +1,11 @@ -package neqsim.processsimulation.mechanicaldesign; +package neqsim.process.mechanicaldesign; import java.util.ArrayList; import java.util.Objects; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processsystem.ProcessSystem; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.processmodel.ProcessSystem; /** *

@@ -30,7 +30,7 @@ public class SystemMechanicalDesign implements java.io.Serializable { * Constructor for SystemMechanicalDesign. *

* - * @param processSystem a {@link neqsim.processsimulation.processsystem.ProcessSystem} object + * @param processSystem a {@link neqsim.process.processmodel.ProcessSystem} object */ public SystemMechanicalDesign(ProcessSystem processSystem) { this.processSystem = processSystem; @@ -41,7 +41,7 @@ public SystemMechanicalDesign(ProcessSystem processSystem) { * getProcess. *

* - * @return a {@link neqsim.processsimulation.processsystem.ProcessSystem} object + * @return a {@link neqsim.process.processmodel.ProcessSystem} object */ public ProcessSystem getProcess() { return processSystem; diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/absorber/AbsorberMechanicalDesign.java b/src/main/java/neqsim/process/mechanicaldesign/absorber/AbsorberMechanicalDesign.java similarity index 88% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/absorber/AbsorberMechanicalDesign.java rename to src/main/java/neqsim/process/mechanicaldesign/absorber/AbsorberMechanicalDesign.java index b2ec387684..b86ecb7981 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/absorber/AbsorberMechanicalDesign.java +++ b/src/main/java/neqsim/process/mechanicaldesign/absorber/AbsorberMechanicalDesign.java @@ -1,13 +1,13 @@ -package neqsim.processsimulation.mechanicaldesign.absorber; +package neqsim.process.mechanicaldesign.absorber; -import neqsim.processsimulation.mechanicaldesign.designstandards.PressureVesselDesignStandard; -import neqsim.processsimulation.mechanicaldesign.designstandards.SeparatorDesignStandard; -import neqsim.processsimulation.mechanicaldesign.separator.SeparatorMechanicalDesign; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.absorber.SimpleTEGAbsorber; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.separator.SeparatorInterface; -import neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.absorber.SimpleTEGAbsorber; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.separator.SeparatorInterface; +import neqsim.process.equipment.separator.sectiontype.SeparatorSection; +import neqsim.process.mechanicaldesign.designstandards.PressureVesselDesignStandard; +import neqsim.process.mechanicaldesign.designstandards.SeparatorDesignStandard; +import neqsim.process.mechanicaldesign.separator.SeparatorMechanicalDesign; /** *

@@ -30,7 +30,7 @@ public class AbsorberMechanicalDesign extends SeparatorMechanicalDesign { * Constructor for AbsorberMechanicalDesign. *

* - * @param equipment a {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} + * @param equipment a {@link neqsim.process.equipment.ProcessEquipmentInterface} * object */ public AbsorberMechanicalDesign(ProcessEquipmentInterface equipment) { diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/adsorber/AdsorberMechanicalDesign.java b/src/main/java/neqsim/process/mechanicaldesign/adsorber/AdsorberMechanicalDesign.java similarity index 89% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/adsorber/AdsorberMechanicalDesign.java rename to src/main/java/neqsim/process/mechanicaldesign/adsorber/AdsorberMechanicalDesign.java index 62d2a2ba04..b0b7c3f9a6 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/adsorber/AdsorberMechanicalDesign.java +++ b/src/main/java/neqsim/process/mechanicaldesign/adsorber/AdsorberMechanicalDesign.java @@ -1,11 +1,11 @@ -package neqsim.processsimulation.mechanicaldesign.adsorber; +package neqsim.process.mechanicaldesign.adsorber; -import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; -import neqsim.processsimulation.mechanicaldesign.designstandards.PressureVesselDesignStandard; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.adsorber.SimpleAdsorber; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.separator.SeparatorInterface; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.adsorber.SimpleAdsorber; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.separator.SeparatorInterface; +import neqsim.process.mechanicaldesign.MechanicalDesign; +import neqsim.process.mechanicaldesign.designstandards.PressureVesselDesignStandard; /** *

@@ -27,7 +27,7 @@ public class AdsorberMechanicalDesign extends MechanicalDesign { * Constructor for AdsorberMechanicalDesign. *

* - * @param equipment a {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} + * @param equipment a {@link neqsim.process.equipment.ProcessEquipmentInterface} * object */ public AdsorberMechanicalDesign(ProcessEquipmentInterface equipment) { diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/compressor/CompressorMechanicalDesign.java b/src/main/java/neqsim/process/mechanicaldesign/compressor/CompressorMechanicalDesign.java similarity index 91% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/compressor/CompressorMechanicalDesign.java rename to src/main/java/neqsim/process/mechanicaldesign/compressor/CompressorMechanicalDesign.java index 0bbd57b9c2..cd5c9a5d91 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/compressor/CompressorMechanicalDesign.java +++ b/src/main/java/neqsim/process/mechanicaldesign/compressor/CompressorMechanicalDesign.java @@ -1,17 +1,17 @@ -package neqsim.processsimulation.mechanicaldesign.compressor; +package neqsim.process.mechanicaldesign.compressor; import java.awt.BorderLayout; import java.awt.Container; import javax.swing.JFrame; import javax.swing.JScrollPane; import javax.swing.JTable; -import neqsim.processsimulation.costestimation.compressor.CompressorCostEstimate; -import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; -import neqsim.processsimulation.mechanicaldesign.designstandards.CompressorDesignStandard; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.separator.SeparatorInterface; +import neqsim.process.costestimation.compressor.CompressorCostEstimate; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.separator.SeparatorInterface; +import neqsim.process.mechanicaldesign.MechanicalDesign; +import neqsim.process.mechanicaldesign.designstandards.CompressorDesignStandard; /** *

@@ -31,7 +31,7 @@ public class CompressorMechanicalDesign extends MechanicalDesign { * Constructor for CompressorMechanicalDesign. *

* - * @param equipment a {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} + * @param equipment a {@link neqsim.process.equipment.ProcessEquipmentInterface} * object */ public CompressorMechanicalDesign(ProcessEquipmentInterface equipment) { diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/AbsorptionColumnDesignStandard.java b/src/main/java/neqsim/process/mechanicaldesign/designstandards/AbsorptionColumnDesignStandard.java similarity index 89% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/AbsorptionColumnDesignStandard.java rename to src/main/java/neqsim/process/mechanicaldesign/designstandards/AbsorptionColumnDesignStandard.java index d4d6338250..c6f8a26037 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/AbsorptionColumnDesignStandard.java +++ b/src/main/java/neqsim/process/mechanicaldesign/designstandards/AbsorptionColumnDesignStandard.java @@ -1,8 +1,8 @@ -package neqsim.processsimulation.mechanicaldesign.designstandards; +package neqsim.process.mechanicaldesign.designstandards; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; +import neqsim.process.mechanicaldesign.MechanicalDesign; /** *

@@ -24,7 +24,7 @@ public class AbsorptionColumnDesignStandard extends DesignStandard { *

* * @param name a {@link java.lang.String} object - * @param equipmentInn a {@link neqsim.processsimulation.mechanicaldesign.MechanicalDesign} object + * @param equipmentInn a {@link neqsim.process.mechanicaldesign.MechanicalDesign} object */ public AbsorptionColumnDesignStandard(String name, MechanicalDesign equipmentInn) { super(name, equipmentInn); diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/AdsorptionDehydrationDesignStandard.java b/src/main/java/neqsim/process/mechanicaldesign/designstandards/AdsorptionDehydrationDesignStandard.java similarity index 91% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/AdsorptionDehydrationDesignStandard.java rename to src/main/java/neqsim/process/mechanicaldesign/designstandards/AdsorptionDehydrationDesignStandard.java index 88fd8a1ad3..ccc6e02b4f 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/AdsorptionDehydrationDesignStandard.java +++ b/src/main/java/neqsim/process/mechanicaldesign/designstandards/AdsorptionDehydrationDesignStandard.java @@ -1,8 +1,8 @@ -package neqsim.processsimulation.mechanicaldesign.designstandards; +package neqsim.process.mechanicaldesign.designstandards; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; +import neqsim.process.mechanicaldesign.MechanicalDesign; /** *

@@ -24,7 +24,7 @@ public class AdsorptionDehydrationDesignStandard extends DesignStandard { *

* * @param name a {@link java.lang.String} object - * @param equipmentInn a {@link neqsim.processsimulation.mechanicaldesign.MechanicalDesign} object + * @param equipmentInn a {@link neqsim.process.mechanicaldesign.MechanicalDesign} object */ public AdsorptionDehydrationDesignStandard(String name, MechanicalDesign equipmentInn) { super(name, equipmentInn); diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/CompressorDesignStandard.java b/src/main/java/neqsim/process/mechanicaldesign/designstandards/CompressorDesignStandard.java similarity index 89% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/CompressorDesignStandard.java rename to src/main/java/neqsim/process/mechanicaldesign/designstandards/CompressorDesignStandard.java index 085e1e1064..0aa3205192 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/CompressorDesignStandard.java +++ b/src/main/java/neqsim/process/mechanicaldesign/designstandards/CompressorDesignStandard.java @@ -1,8 +1,8 @@ -package neqsim.processsimulation.mechanicaldesign.designstandards; +package neqsim.process.mechanicaldesign.designstandards; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; +import neqsim.process.mechanicaldesign.MechanicalDesign; /** *

@@ -24,7 +24,7 @@ public class CompressorDesignStandard extends DesignStandard { *

* * @param name a {@link java.lang.String} object - * @param equipmentInn a {@link neqsim.processsimulation.mechanicaldesign.MechanicalDesign} object + * @param equipmentInn a {@link neqsim.process.mechanicaldesign.MechanicalDesign} object */ public CompressorDesignStandard(String name, MechanicalDesign equipmentInn) { super(name, equipmentInn); diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/DesignStandard.java b/src/main/java/neqsim/process/mechanicaldesign/designstandards/DesignStandard.java similarity index 90% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/DesignStandard.java rename to src/main/java/neqsim/process/mechanicaldesign/designstandards/DesignStandard.java index 5d384fbb44..f16321577d 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/DesignStandard.java +++ b/src/main/java/neqsim/process/mechanicaldesign/designstandards/DesignStandard.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.mechanicaldesign.designstandards; +package neqsim.process.mechanicaldesign.designstandards; import java.util.Objects; -import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; +import neqsim.process.mechanicaldesign.MechanicalDesign; /** *

@@ -30,7 +30,7 @@ public DesignStandard() {} *

* * @param name a {@link java.lang.String} object - * @param equipmentInn a {@link neqsim.processsimulation.mechanicaldesign.MechanicalDesign} object + * @param equipmentInn a {@link neqsim.process.mechanicaldesign.MechanicalDesign} object */ public DesignStandard(String name, MechanicalDesign equipmentInn) { equipment = equipmentInn; diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/GasScrubberDesignStandard.java b/src/main/java/neqsim/process/mechanicaldesign/designstandards/GasScrubberDesignStandard.java similarity index 92% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/GasScrubberDesignStandard.java rename to src/main/java/neqsim/process/mechanicaldesign/designstandards/GasScrubberDesignStandard.java index 31d66c6ce4..facdfb6b1c 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/GasScrubberDesignStandard.java +++ b/src/main/java/neqsim/process/mechanicaldesign/designstandards/GasScrubberDesignStandard.java @@ -1,8 +1,8 @@ -package neqsim.processsimulation.mechanicaldesign.designstandards; +package neqsim.process.mechanicaldesign.designstandards; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; +import neqsim.process.mechanicaldesign.MechanicalDesign; /** *

@@ -28,7 +28,7 @@ public class GasScrubberDesignStandard extends DesignStandard { *

* * @param name a {@link java.lang.String} object - * @param equipmentInn a {@link neqsim.processsimulation.mechanicaldesign.MechanicalDesign} object + * @param equipmentInn a {@link neqsim.process.mechanicaldesign.MechanicalDesign} object */ public GasScrubberDesignStandard(String name, MechanicalDesign equipmentInn) { super(name, equipmentInn); diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/JointEfficiencyPipelineStandard.java b/src/main/java/neqsim/process/mechanicaldesign/designstandards/JointEfficiencyPipelineStandard.java similarity index 84% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/JointEfficiencyPipelineStandard.java rename to src/main/java/neqsim/process/mechanicaldesign/designstandards/JointEfficiencyPipelineStandard.java index 2e686f2d2f..920c2a9ef1 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/JointEfficiencyPipelineStandard.java +++ b/src/main/java/neqsim/process/mechanicaldesign/designstandards/JointEfficiencyPipelineStandard.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.mechanicaldesign.designstandards; +package neqsim.process.mechanicaldesign.designstandards; -import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; +import neqsim.process.mechanicaldesign.MechanicalDesign; /** *

@@ -19,7 +19,7 @@ public class JointEfficiencyPipelineStandard extends DesignStandard { *

* * @param name a {@link java.lang.String} object - * @param equipmentInn a {@link neqsim.processsimulation.mechanicaldesign.MechanicalDesign} object + * @param equipmentInn a {@link neqsim.process.mechanicaldesign.MechanicalDesign} object */ public JointEfficiencyPipelineStandard(String name, MechanicalDesign equipmentInn) { super(name, equipmentInn); diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/JointEfficiencyPlateStandard.java b/src/main/java/neqsim/process/mechanicaldesign/designstandards/JointEfficiencyPlateStandard.java similarity index 84% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/JointEfficiencyPlateStandard.java rename to src/main/java/neqsim/process/mechanicaldesign/designstandards/JointEfficiencyPlateStandard.java index b124f8abed..a8bfc53cc6 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/JointEfficiencyPlateStandard.java +++ b/src/main/java/neqsim/process/mechanicaldesign/designstandards/JointEfficiencyPlateStandard.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.mechanicaldesign.designstandards; +package neqsim.process.mechanicaldesign.designstandards; -import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; +import neqsim.process.mechanicaldesign.MechanicalDesign; /** *

@@ -19,7 +19,7 @@ public class JointEfficiencyPlateStandard extends DesignStandard { *

* * @param name a {@link java.lang.String} object - * @param equipmentInn a {@link neqsim.processsimulation.mechanicaldesign.MechanicalDesign} object + * @param equipmentInn a {@link neqsim.process.mechanicaldesign.MechanicalDesign} object */ public JointEfficiencyPlateStandard(String name, MechanicalDesign equipmentInn) { super(name, equipmentInn); diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/MaterialPipeDesignStandard.java b/src/main/java/neqsim/process/mechanicaldesign/designstandards/MaterialPipeDesignStandard.java similarity index 94% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/MaterialPipeDesignStandard.java rename to src/main/java/neqsim/process/mechanicaldesign/designstandards/MaterialPipeDesignStandard.java index a29c88a37c..3e5e06ae99 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/MaterialPipeDesignStandard.java +++ b/src/main/java/neqsim/process/mechanicaldesign/designstandards/MaterialPipeDesignStandard.java @@ -1,8 +1,8 @@ -package neqsim.processsimulation.mechanicaldesign.designstandards; +package neqsim.process.mechanicaldesign.designstandards; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; +import neqsim.process.mechanicaldesign.MechanicalDesign; /** *

@@ -29,7 +29,7 @@ public MaterialPipeDesignStandard() {} *

* * @param name a {@link java.lang.String} object - * @param equipmentInn a {@link neqsim.processsimulation.mechanicaldesign.MechanicalDesign} object + * @param equipmentInn a {@link neqsim.process.mechanicaldesign.MechanicalDesign} object */ public MaterialPipeDesignStandard(String name, MechanicalDesign equipmentInn) { super(name, equipmentInn); diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/MaterialPlateDesignStandard.java b/src/main/java/neqsim/process/mechanicaldesign/designstandards/MaterialPlateDesignStandard.java similarity index 93% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/MaterialPlateDesignStandard.java rename to src/main/java/neqsim/process/mechanicaldesign/designstandards/MaterialPlateDesignStandard.java index 9c4b559cc3..61e85773fe 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/MaterialPlateDesignStandard.java +++ b/src/main/java/neqsim/process/mechanicaldesign/designstandards/MaterialPlateDesignStandard.java @@ -1,8 +1,8 @@ -package neqsim.processsimulation.mechanicaldesign.designstandards; +package neqsim.process.mechanicaldesign.designstandards; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; +import neqsim.process.mechanicaldesign.MechanicalDesign; /** *

@@ -29,7 +29,7 @@ public MaterialPlateDesignStandard() {} *

* * @param name a {@link java.lang.String} object - * @param equipmentInn a {@link neqsim.processsimulation.mechanicaldesign.MechanicalDesign} object + * @param equipmentInn a {@link neqsim.process.mechanicaldesign.MechanicalDesign} object */ public MaterialPlateDesignStandard(String name, MechanicalDesign equipmentInn) { super(name, equipmentInn); diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/PipelineDesignStandard.java b/src/main/java/neqsim/process/mechanicaldesign/designstandards/PipelineDesignStandard.java similarity index 88% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/PipelineDesignStandard.java rename to src/main/java/neqsim/process/mechanicaldesign/designstandards/PipelineDesignStandard.java index 92e9a633ba..79e4130b36 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/PipelineDesignStandard.java +++ b/src/main/java/neqsim/process/mechanicaldesign/designstandards/PipelineDesignStandard.java @@ -1,8 +1,8 @@ -package neqsim.processsimulation.mechanicaldesign.designstandards; +package neqsim.process.mechanicaldesign.designstandards; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; +import neqsim.process.mechanicaldesign.MechanicalDesign; /** *

@@ -24,7 +24,7 @@ public class PipelineDesignStandard extends DesignStandard { *

* * @param name a {@link java.lang.String} object - * @param equipmentInn a {@link neqsim.processsimulation.mechanicaldesign.MechanicalDesign} object + * @param equipmentInn a {@link neqsim.process.mechanicaldesign.MechanicalDesign} object */ public PipelineDesignStandard(String name, MechanicalDesign equipmentInn) { super(name, equipmentInn); diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/PipingDesignStandard.java b/src/main/java/neqsim/process/mechanicaldesign/designstandards/PipingDesignStandard.java similarity index 65% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/PipingDesignStandard.java rename to src/main/java/neqsim/process/mechanicaldesign/designstandards/PipingDesignStandard.java index ab1fc3a58e..639ebeab9c 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/PipingDesignStandard.java +++ b/src/main/java/neqsim/process/mechanicaldesign/designstandards/PipingDesignStandard.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.mechanicaldesign.designstandards; +package neqsim.process.mechanicaldesign.designstandards; -import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; +import neqsim.process.mechanicaldesign.MechanicalDesign; /** *

@@ -19,7 +19,7 @@ public class PipingDesignStandard extends DesignStandard { *

* * @param name a {@link java.lang.String} object - * @param equipmentInn a {@link neqsim.processsimulation.mechanicaldesign.MechanicalDesign} object + * @param equipmentInn a {@link neqsim.process.mechanicaldesign.MechanicalDesign} object */ public PipingDesignStandard(String name, MechanicalDesign equipmentInn) { super(name, equipmentInn); diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/PressureVesselDesignStandard.java b/src/main/java/neqsim/process/mechanicaldesign/designstandards/PressureVesselDesignStandard.java similarity index 89% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/PressureVesselDesignStandard.java rename to src/main/java/neqsim/process/mechanicaldesign/designstandards/PressureVesselDesignStandard.java index 65f50e3b92..d61236678f 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/PressureVesselDesignStandard.java +++ b/src/main/java/neqsim/process/mechanicaldesign/designstandards/PressureVesselDesignStandard.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.mechanicaldesign.designstandards; +package neqsim.process.mechanicaldesign.designstandards; -import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; -import neqsim.processsimulation.processequipment.separator.Separator; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.mechanicaldesign.MechanicalDesign; /** *

@@ -20,7 +20,7 @@ public class PressureVesselDesignStandard extends DesignStandard { *

* * @param name a {@link java.lang.String} object - * @param equipmentInn a {@link neqsim.processsimulation.mechanicaldesign.MechanicalDesign} object + * @param equipmentInn a {@link neqsim.process.mechanicaldesign.MechanicalDesign} object */ public PressureVesselDesignStandard(String name, MechanicalDesign equipmentInn) { super(name, equipmentInn); diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/SeparatorDesignStandard.java b/src/main/java/neqsim/process/mechanicaldesign/designstandards/SeparatorDesignStandard.java similarity index 91% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/SeparatorDesignStandard.java rename to src/main/java/neqsim/process/mechanicaldesign/designstandards/SeparatorDesignStandard.java index 42f3012229..b088484d05 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/SeparatorDesignStandard.java +++ b/src/main/java/neqsim/process/mechanicaldesign/designstandards/SeparatorDesignStandard.java @@ -1,9 +1,9 @@ -package neqsim.processsimulation.mechanicaldesign.designstandards; +package neqsim.process.mechanicaldesign.designstandards; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; -import neqsim.processsimulation.processequipment.separator.SeparatorInterface; +import neqsim.process.equipment.separator.SeparatorInterface; +import neqsim.process.mechanicaldesign.MechanicalDesign; /** *

@@ -49,7 +49,7 @@ public void setFg(double Fg) { *

* * @param name a {@link java.lang.String} object - * @param equipmentInn a {@link neqsim.processsimulation.mechanicaldesign.MechanicalDesign} object + * @param equipmentInn a {@link neqsim.process.mechanicaldesign.MechanicalDesign} object */ public SeparatorDesignStandard(String name, MechanicalDesign equipmentInn) { super(name, equipmentInn); @@ -142,7 +142,7 @@ public void setVolumetricDesignFactor(double volumetricDesignFactor) { *

* * @param name a {@link java.lang.String} object - * @param equipmentInn a {@link neqsim.processsimulation.mechanicaldesign.MechanicalDesign} object + * @param equipmentInn a {@link neqsim.process.mechanicaldesign.MechanicalDesign} object * @return a double */ public double getLiquidRetentionTime(String name, MechanicalDesign equipmentInn) { diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/ValveDesignStandard.java b/src/main/java/neqsim/process/mechanicaldesign/designstandards/ValveDesignStandard.java similarity index 73% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/ValveDesignStandard.java rename to src/main/java/neqsim/process/mechanicaldesign/designstandards/ValveDesignStandard.java index 68b7c88207..88c84baaa1 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/ValveDesignStandard.java +++ b/src/main/java/neqsim/process/mechanicaldesign/designstandards/ValveDesignStandard.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.mechanicaldesign.designstandards; +package neqsim.process.mechanicaldesign.designstandards; -import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; +import neqsim.process.mechanicaldesign.MechanicalDesign; /** *

@@ -32,7 +32,7 @@ public double getValveCvMax() { *

* * @param name a {@link java.lang.String} object - * @param equipmentInn a {@link neqsim.processsimulation.mechanicaldesign.MechanicalDesign} object + * @param equipmentInn a {@link neqsim.process.mechanicaldesign.MechanicalDesign} object */ public ValveDesignStandard(String name, MechanicalDesign equipmentInn) { super(name, equipmentInn); diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/pipeline/PipelineMechanicalDesign.java b/src/main/java/neqsim/process/mechanicaldesign/pipeline/PipelineMechanicalDesign.java similarity index 85% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/pipeline/PipelineMechanicalDesign.java rename to src/main/java/neqsim/process/mechanicaldesign/pipeline/PipelineMechanicalDesign.java index b6272e7c8e..fca0221bde 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/pipeline/PipelineMechanicalDesign.java +++ b/src/main/java/neqsim/process/mechanicaldesign/pipeline/PipelineMechanicalDesign.java @@ -1,11 +1,11 @@ -package neqsim.processsimulation.mechanicaldesign.pipeline; +package neqsim.process.mechanicaldesign.pipeline; -import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; -import neqsim.processsimulation.mechanicaldesign.designstandards.MaterialPipeDesignStandard; -import neqsim.processsimulation.mechanicaldesign.designstandards.PipelineDesignStandard; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.pipeline.AdiabaticPipe; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.pipeline.AdiabaticPipe; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.mechanicaldesign.MechanicalDesign; +import neqsim.process.mechanicaldesign.designstandards.MaterialPipeDesignStandard; +import neqsim.process.mechanicaldesign.designstandards.PipelineDesignStandard; /** *

@@ -26,7 +26,7 @@ public class PipelineMechanicalDesign extends MechanicalDesign { * Constructor for PipelineMechanicalDesign. *

* - * @param equipment a {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} + * @param equipment a {@link neqsim.process.equipment.ProcessEquipmentInterface} * object */ public PipelineMechanicalDesign(ProcessEquipmentInterface equipment) { @@ -117,8 +117,8 @@ public static void main(String args[]) { pipe.getMechanicalDesign().setMinOperationPressure(50.0); pipe.getMechanicalDesign().setMaxDesignGassVolumeFlow(100.0); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(pipe); diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/GasScrubberMechanicalDesign.java b/src/main/java/neqsim/process/mechanicaldesign/separator/GasScrubberMechanicalDesign.java similarity index 88% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/separator/GasScrubberMechanicalDesign.java rename to src/main/java/neqsim/process/mechanicaldesign/separator/GasScrubberMechanicalDesign.java index 55fbd01756..53ad7137a9 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/GasScrubberMechanicalDesign.java +++ b/src/main/java/neqsim/process/mechanicaldesign/separator/GasScrubberMechanicalDesign.java @@ -1,11 +1,11 @@ -package neqsim.processsimulation.mechanicaldesign.separator; +package neqsim.process.mechanicaldesign.separator; -import neqsim.processsimulation.mechanicaldesign.designstandards.GasScrubberDesignStandard; -import neqsim.processsimulation.mechanicaldesign.separator.sectiontype.SepDesignSection; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.separator.SeparatorInterface; -import neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.separator.SeparatorInterface; +import neqsim.process.equipment.separator.sectiontype.SeparatorSection; +import neqsim.process.mechanicaldesign.designstandards.GasScrubberDesignStandard; +import neqsim.process.mechanicaldesign.separator.sectiontype.SepDesignSection; /** *

@@ -23,7 +23,7 @@ public class GasScrubberMechanicalDesign extends SeparatorMechanicalDesign { * Constructor for GasScrubberMechanicalDesign. *

* - * @param equipment a {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} + * @param equipment a {@link neqsim.process.equipment.ProcessEquipmentInterface} * object */ public GasScrubberMechanicalDesign(ProcessEquipmentInterface equipment) { diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/SeparatorMechanicalDesign.java b/src/main/java/neqsim/process/mechanicaldesign/separator/SeparatorMechanicalDesign.java similarity index 91% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/separator/SeparatorMechanicalDesign.java rename to src/main/java/neqsim/process/mechanicaldesign/separator/SeparatorMechanicalDesign.java index 170b49e593..e7253235e6 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/SeparatorMechanicalDesign.java +++ b/src/main/java/neqsim/process/mechanicaldesign/separator/SeparatorMechanicalDesign.java @@ -1,19 +1,19 @@ -package neqsim.processsimulation.mechanicaldesign.separator; +package neqsim.process.mechanicaldesign.separator; import java.awt.BorderLayout; import java.awt.Container; import javax.swing.JFrame; import javax.swing.JScrollPane; import javax.swing.JTable; -import neqsim.processsimulation.costestimation.separator.SeparatorCostEstimate; -import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; -import neqsim.processsimulation.mechanicaldesign.designstandards.MaterialPlateDesignStandard; -import neqsim.processsimulation.mechanicaldesign.designstandards.PressureVesselDesignStandard; -import neqsim.processsimulation.mechanicaldesign.designstandards.SeparatorDesignStandard; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.separator.SeparatorInterface; -import neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection; +import neqsim.process.costestimation.separator.SeparatorCostEstimate; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.separator.SeparatorInterface; +import neqsim.process.equipment.separator.sectiontype.SeparatorSection; +import neqsim.process.mechanicaldesign.MechanicalDesign; +import neqsim.process.mechanicaldesign.designstandards.MaterialPlateDesignStandard; +import neqsim.process.mechanicaldesign.designstandards.PressureVesselDesignStandard; +import neqsim.process.mechanicaldesign.designstandards.SeparatorDesignStandard; /** *

@@ -35,7 +35,7 @@ public class SeparatorMechanicalDesign extends MechanicalDesign { * Constructor for SeparatorMechanicalDesign. *

* - * @param equipment a {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} + * @param equipment a {@link neqsim.process.equipment.ProcessEquipmentInterface} * object */ public SeparatorMechanicalDesign(ProcessEquipmentInterface equipment) { diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/DistillationTraySection.java b/src/main/java/neqsim/process/mechanicaldesign/separator/sectiontype/DistillationTraySection.java similarity index 87% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/DistillationTraySection.java rename to src/main/java/neqsim/process/mechanicaldesign/separator/sectiontype/DistillationTraySection.java index 65fd2595ab..3c20553ea3 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/DistillationTraySection.java +++ b/src/main/java/neqsim/process/mechanicaldesign/separator/sectiontype/DistillationTraySection.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.mechanicaldesign.separator.sectiontype; +package neqsim.process.mechanicaldesign.separator.sectiontype; -import neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection; +import neqsim.process.equipment.separator.sectiontype.SeparatorSection; /** *

@@ -17,7 +17,7 @@ public class DistillationTraySection extends SepDesignSection { *

* * @param separatorSection a - * {@link neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection} + * {@link neqsim.process.equipment.separator.sectiontype.SeparatorSection} * object */ public DistillationTraySection(SeparatorSection separatorSection) { diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/MecMeshSection.java b/src/main/java/neqsim/process/mechanicaldesign/separator/sectiontype/MecMeshSection.java similarity index 86% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/MecMeshSection.java rename to src/main/java/neqsim/process/mechanicaldesign/separator/sectiontype/MecMeshSection.java index c347a55f97..c68fd8e144 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/MecMeshSection.java +++ b/src/main/java/neqsim/process/mechanicaldesign/separator/sectiontype/MecMeshSection.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.mechanicaldesign.separator.sectiontype; +package neqsim.process.mechanicaldesign.separator.sectiontype; -import neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection; +import neqsim.process.equipment.separator.sectiontype.SeparatorSection; /** *

@@ -17,7 +17,7 @@ public class MecMeshSection extends SepDesignSection { *

* * @param separatorSection a - * {@link neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection} + * {@link neqsim.process.equipment.separator.sectiontype.SeparatorSection} * object */ public MecMeshSection(SeparatorSection separatorSection) { diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/MechManwaySection.java b/src/main/java/neqsim/process/mechanicaldesign/separator/sectiontype/MechManwaySection.java similarity index 78% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/MechManwaySection.java rename to src/main/java/neqsim/process/mechanicaldesign/separator/sectiontype/MechManwaySection.java index b37945dee1..e1b6c320da 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/MechManwaySection.java +++ b/src/main/java/neqsim/process/mechanicaldesign/separator/sectiontype/MechManwaySection.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.mechanicaldesign.separator.sectiontype; +package neqsim.process.mechanicaldesign.separator.sectiontype; -import neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection; +import neqsim.process.equipment.separator.sectiontype.SeparatorSection; /** *

@@ -17,7 +17,7 @@ public class MechManwaySection extends SepDesignSection { *

* * @param separatorSection a - * {@link neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection} + * {@link neqsim.process.equipment.separator.sectiontype.SeparatorSection} * object */ public MechManwaySection(SeparatorSection separatorSection) { diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/MechNozzleSection.java b/src/main/java/neqsim/process/mechanicaldesign/separator/sectiontype/MechNozzleSection.java similarity index 84% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/MechNozzleSection.java rename to src/main/java/neqsim/process/mechanicaldesign/separator/sectiontype/MechNozzleSection.java index 914ddbb8d4..eecfe49dc5 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/MechNozzleSection.java +++ b/src/main/java/neqsim/process/mechanicaldesign/separator/sectiontype/MechNozzleSection.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.mechanicaldesign.separator.sectiontype; +package neqsim.process.mechanicaldesign.separator.sectiontype; -import neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection; +import neqsim.process.equipment.separator.sectiontype.SeparatorSection; /** *

@@ -17,7 +17,7 @@ public class MechNozzleSection extends SepDesignSection { *

* * @param separatorSection a - * {@link neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection} + * {@link neqsim.process.equipment.separator.sectiontype.SeparatorSection} * object */ public MechNozzleSection(SeparatorSection separatorSection) { diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/MechVaneSection.java b/src/main/java/neqsim/process/mechanicaldesign/separator/sectiontype/MechVaneSection.java similarity index 86% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/MechVaneSection.java rename to src/main/java/neqsim/process/mechanicaldesign/separator/sectiontype/MechVaneSection.java index 25e1b6bc0a..df0c2f9e66 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/MechVaneSection.java +++ b/src/main/java/neqsim/process/mechanicaldesign/separator/sectiontype/MechVaneSection.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.mechanicaldesign.separator.sectiontype; +package neqsim.process.mechanicaldesign.separator.sectiontype; -import neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection; +import neqsim.process.equipment.separator.sectiontype.SeparatorSection; /** *

@@ -17,7 +17,7 @@ public class MechVaneSection extends SepDesignSection { *

* * @param separatorSection a - * {@link neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection} + * {@link neqsim.process.equipment.separator.sectiontype.SeparatorSection} * object */ public MechVaneSection(SeparatorSection separatorSection) { diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/SepDesignSection.java b/src/main/java/neqsim/process/mechanicaldesign/separator/sectiontype/SepDesignSection.java similarity index 88% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/SepDesignSection.java rename to src/main/java/neqsim/process/mechanicaldesign/separator/sectiontype/SepDesignSection.java index 5a230dbfde..15d04356d2 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/SepDesignSection.java +++ b/src/main/java/neqsim/process/mechanicaldesign/separator/sectiontype/SepDesignSection.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.mechanicaldesign.separator.sectiontype; +package neqsim.process.mechanicaldesign.separator.sectiontype; -import neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection; +import neqsim.process.equipment.separator.sectiontype.SeparatorSection; /** *

@@ -23,7 +23,7 @@ public class SepDesignSection { *

* * @param separatorSection a - * {@link neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection} + * {@link neqsim.process.equipment.separator.sectiontype.SeparatorSection} * object */ public SepDesignSection(SeparatorSection separatorSection) { diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/valve/ValveMechanicalDesign.java b/src/main/java/neqsim/process/mechanicaldesign/valve/ValveMechanicalDesign.java similarity index 84% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/valve/ValveMechanicalDesign.java rename to src/main/java/neqsim/process/mechanicaldesign/valve/ValveMechanicalDesign.java index 98fc11cb9e..279ae62fb0 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/valve/ValveMechanicalDesign.java +++ b/src/main/java/neqsim/process/mechanicaldesign/valve/ValveMechanicalDesign.java @@ -1,15 +1,15 @@ -package neqsim.processsimulation.mechanicaldesign.valve; +package neqsim.process.mechanicaldesign.valve; import java.awt.BorderLayout; import java.awt.Container; import javax.swing.JFrame; import javax.swing.JScrollPane; import javax.swing.JTable; -import neqsim.processsimulation.costestimation.valve.ValveCostEstimate; -import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; -import neqsim.processsimulation.mechanicaldesign.designstandards.ValveDesignStandard; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.costestimation.valve.ValveCostEstimate; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.mechanicaldesign.MechanicalDesign; +import neqsim.process.mechanicaldesign.designstandards.ValveDesignStandard; /** *

@@ -33,7 +33,7 @@ public class ValveMechanicalDesign extends MechanicalDesign { * Constructor for ValveMechanicalDesign. *

* - * @param equipment a {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} + * @param equipment a {@link neqsim.process.equipment.ProcessEquipmentInterface} * object */ public ValveMechanicalDesign(ProcessEquipmentInterface equipment) { diff --git a/src/main/java/neqsim/processsimulation/processsystem/ModuleInterface.java b/src/main/java/neqsim/process/processmodel/ModuleInterface.java similarity index 77% rename from src/main/java/neqsim/processsimulation/processsystem/ModuleInterface.java rename to src/main/java/neqsim/process/processmodel/ModuleInterface.java index 442282c1c5..1af537750d 100644 --- a/src/main/java/neqsim/processsimulation/processsystem/ModuleInterface.java +++ b/src/main/java/neqsim/process/processmodel/ModuleInterface.java @@ -4,10 +4,10 @@ * Created on 1. november 2006, 21:48 */ -package neqsim.processsimulation.processsystem; +package neqsim.process.processmodel; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.stream.StreamInterface; /** *

@@ -23,9 +23,9 @@ public interface ModuleInterface extends ProcessEquipmentInterface { * getOperations. *

* - * @return a {@link neqsim.processsimulation.processsystem.ProcessSystem} object + * @return a {@link neqsim.process.processmodel.ProcessSystem} object */ - public neqsim.processsimulation.processsystem.ProcessSystem getOperations(); + public neqsim.process.processmodel.ProcessSystem getOperations(); /** *

@@ -33,7 +33,7 @@ public interface ModuleInterface extends ProcessEquipmentInterface { *

* * @param streamName a {@link java.lang.String} object - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public void addInputStream(String streamName, StreamInterface stream); @@ -43,7 +43,7 @@ public interface ModuleInterface extends ProcessEquipmentInterface { *

* * @param streamName a {@link java.lang.String} object - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface getOutputStream(String streamName); diff --git a/src/main/java/neqsim/processsimulation/processsystem/ProcessModule.java b/src/main/java/neqsim/process/processmodel/ProcessModule.java similarity index 94% rename from src/main/java/neqsim/processsimulation/processsystem/ProcessModule.java rename to src/main/java/neqsim/process/processmodel/ProcessModule.java index 29c571edcb..73bb0876ec 100644 --- a/src/main/java/neqsim/processsimulation/processsystem/ProcessModule.java +++ b/src/main/java/neqsim/process/processmodel/ProcessModule.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processsystem; +package neqsim.process.processmodel; import java.util.ArrayList; import java.util.List; @@ -6,10 +6,10 @@ import org.apache.commons.lang.SerializationUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.SimulationBaseClass; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.util.report.Report; +import neqsim.process.SimulationBaseClass; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.util.report.Report; /** * A class representing a process module class that can contain unit operations and other modules. @@ -230,7 +230,7 @@ public Object getMeasurementDevice(String name) { * Create deep copy. *

* - * @return a {@link neqsim.processsimulation.processsystem.ProcessModule} object + * @return a {@link neqsim.process.processmodel.ProcessModule} object */ public ProcessModule copy() { byte[] bytes = SerializationUtils.serialize(this); diff --git a/src/main/java/neqsim/processsimulation/processsystem/ProcessModuleBaseClass.java b/src/main/java/neqsim/process/processmodel/ProcessModuleBaseClass.java similarity index 88% rename from src/main/java/neqsim/processsimulation/processsystem/ProcessModuleBaseClass.java rename to src/main/java/neqsim/process/processmodel/ProcessModuleBaseClass.java index 10f4665d9f..af38992db2 100644 --- a/src/main/java/neqsim/processsimulation/processsystem/ProcessModuleBaseClass.java +++ b/src/main/java/neqsim/process/processmodel/ProcessModuleBaseClass.java @@ -4,14 +4,14 @@ * Created on 1. november 2006, 22:07 */ -package neqsim.processsimulation.processsystem; +package neqsim.process.processmodel; import java.util.UUID; -import neqsim.processsimulation.SimulationBaseClass; -import neqsim.processsimulation.controllerdevice.ControllerDeviceInterface; -import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.util.report.Report; +import neqsim.process.SimulationBaseClass; +import neqsim.process.controllerdevice.ControllerDeviceInterface; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.mechanicaldesign.MechanicalDesign; +import neqsim.process.util.report.Report; import neqsim.thermo.system.SystemInterface; /** @@ -31,8 +31,8 @@ public abstract class ProcessModuleBaseClass extends SimulationBaseClass protected boolean isInitializedStreams = false; private boolean isCalcDesign = false; - private neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + private neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); /** *

@@ -117,7 +117,7 @@ public void setIsCalcDesign(boolean isCalcDesign) { /** {@inheritDoc} */ @Override - public neqsim.processsimulation.processsystem.ProcessSystem getOperations() { + public neqsim.process.processmodel.ProcessSystem getOperations() { return operations; } diff --git a/src/main/java/neqsim/processsimulation/processsystem/ProcessSystem.java b/src/main/java/neqsim/process/processmodel/ProcessSystem.java similarity index 93% rename from src/main/java/neqsim/processsimulation/processsystem/ProcessSystem.java rename to src/main/java/neqsim/process/processmodel/ProcessSystem.java index e047c52beb..ada973b75c 100644 --- a/src/main/java/neqsim/processsimulation/processsystem/ProcessSystem.java +++ b/src/main/java/neqsim/process/processmodel/ProcessSystem.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processsystem; +package neqsim.process.processmodel; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -11,14 +11,14 @@ import org.apache.commons.lang.SerializationUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.SimulationBaseClass; -import neqsim.processsimulation.conditionmonitor.ConditionMonitor; -import neqsim.processsimulation.measurementdevice.MeasurementDeviceInterface; -import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processequipment.util.RecycleController; -import neqsim.processsimulation.util.report.Report; +import neqsim.process.SimulationBaseClass; +import neqsim.process.conditionmonitor.ConditionMonitor; +import neqsim.process.equipment.ProcessEquipmentBaseClass; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.equipment.util.RecycleController; +import neqsim.process.measurementdevice.MeasurementDeviceInterface; +import neqsim.process.util.report.Report; import neqsim.thermo.system.SystemInterface; /** @@ -67,7 +67,7 @@ public ProcessSystem(String name) { * Add to end. *

* - * @param operation a {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} + * @param operation a {@link neqsim.process.equipment.ProcessEquipmentInterface} * object */ public void add(ProcessEquipmentInterface operation) { @@ -81,7 +81,7 @@ public void add(ProcessEquipmentInterface operation) { *

* * @param position 0-based position - * @param operation a {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} + * @param operation a {@link neqsim.process.equipment.ProcessEquipmentInterface} * object */ public void add(int position, ProcessEquipmentInterface operation) { @@ -114,7 +114,7 @@ public void add(int position, ProcessEquipmentInterface operation) { *

* * @param measurementDevice a - * {@link neqsim.processsimulation.measurementdevice.MeasurementDeviceInterface} object + * {@link neqsim.process.measurementdevice.MeasurementDeviceInterface} object */ public void add(MeasurementDeviceInterface measurementDevice) { measurementDevices.add(measurementDevice); @@ -126,7 +126,7 @@ public void add(MeasurementDeviceInterface measurementDevice) { *

* * @param operations an array of - * {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} objects + * {@link neqsim.process.equipment.ProcessEquipmentInterface} objects */ public void add(ProcessEquipmentInterface[] operations) { getUnitOperations().addAll(Arrays.asList(operations)); @@ -180,7 +180,7 @@ public boolean hasUnitName(String name) { *

* * @param name Name of measurement device - * @return a {@link neqsim.processsimulation.measurementdevice.MeasurementDeviceInterface} object + * @return a {@link neqsim.process.measurementdevice.MeasurementDeviceInterface} object */ public MeasurementDeviceInterface getMeasurementDevice(String name) { for (int i = 0; i < measurementDevices.size(); i++) { @@ -222,7 +222,7 @@ public int getUnitNumber(String name) { *

* * @param unitName a {@link java.lang.String} object - * @param operation a {@link neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass} + * @param operation a {@link neqsim.process.equipment.ProcessEquipmentBaseClass} * object */ public void replaceObject(String unitName, ProcessEquipmentBaseClass operation) { @@ -440,7 +440,7 @@ public void run(UUID id) { for (int i = 0; i < unitOperations.size(); i++) { if (unitOperations.get(i).getClass().getSimpleName().equals("Adjuster")) { - if (!((neqsim.processsimulation.processequipment.util.Adjuster) unitOperations.get(i)) + if (!((neqsim.process.equipment.util.Adjuster) unitOperations.get(i)) .solved()) { isConverged = false; break; @@ -655,7 +655,7 @@ public void save(String filePath) { *

* * @param filePath a {@link java.lang.String} object - * @return a {@link neqsim.processsimulation.processsystem.ProcessSystem} object + * @return a {@link neqsim.process.processmodel.ProcessSystem} object */ public static ProcessSystem open(String filePath) { try (ObjectInputStream objectinputstream = @@ -784,10 +784,10 @@ public double getPower(String unit) { double power = 0.0; for (int i = 0; i < unitOperations.size(); i++) { if (unitOperations.get(i).getClass().getSimpleName().equals("Compressor")) { - power += ((neqsim.processsimulation.processequipment.compressor.Compressor) unitOperations + power += ((neqsim.process.equipment.compressor.Compressor) unitOperations .get(i)).getPower(); } else if (unitOperations.get(i).getClass().getSimpleName().equals("Pump")) { - power += ((neqsim.processsimulation.processequipment.pump.Pump) unitOperations.get(i)) + power += ((neqsim.process.equipment.pump.Pump) unitOperations.get(i)) .getPower(); } } @@ -813,7 +813,7 @@ public double getCoolerDuty(String unit) { for (int i = 0; i < unitOperations.size(); i++) { if (unitOperations.get(i).getClass().getSimpleName().equals("Cooler")) { heat += - ((neqsim.processsimulation.processequipment.heatexchanger.Cooler) unitOperations.get(i)) + ((neqsim.process.equipment.heatexchanger.Cooler) unitOperations.get(i)) .getDuty(); } } @@ -839,7 +839,7 @@ public double getHeaterDuty(String unit) { for (int i = 0; i < unitOperations.size(); i++) { if (unitOperations.get(i).getClass().getSimpleName().equals("Heater")) { heat += - ((neqsim.processsimulation.processequipment.heatexchanger.Heater) unitOperations.get(i)) + ((neqsim.process.equipment.heatexchanger.Heater) unitOperations.get(i)) .getDuty(); } } @@ -879,7 +879,7 @@ public void setSurroundingTemperature(double surroundingTemperature) { * Create deep copy. *

* - * @return a {@link neqsim.processsimulation.processsystem.ProcessSystem} object + * @return a {@link neqsim.process.processmodel.ProcessSystem} object */ public ProcessSystem copy() { byte[] bytes = SerializationUtils.serialize(this); @@ -892,7 +892,7 @@ public ProcessSystem copy() { * getConditionMonitor. *

* - * @return a {@link neqsim.processsimulation.conditionmonitor.ConditionMonitor} object + * @return a {@link neqsim.process.conditionmonitor.ConditionMonitor} object */ public ConditionMonitor getConditionMonitor() { return new ConditionMonitor(this); diff --git a/src/main/java/neqsim/processsimulation/processsystem/processmodules/AdsorptionDehydrationlModule.java b/src/main/java/neqsim/process/processmodel/processmodules/AdsorptionDehydrationlModule.java similarity index 90% rename from src/main/java/neqsim/processsimulation/processsystem/processmodules/AdsorptionDehydrationlModule.java rename to src/main/java/neqsim/process/processmodel/processmodules/AdsorptionDehydrationlModule.java index d07cb19342..98030a05e6 100644 --- a/src/main/java/neqsim/processsimulation/processsystem/processmodules/AdsorptionDehydrationlModule.java +++ b/src/main/java/neqsim/process/processmodel/processmodules/AdsorptionDehydrationlModule.java @@ -1,14 +1,14 @@ -package neqsim.processsimulation.processsystem.processmodules; +package neqsim.process.processmodel.processmodules; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.adsorber.SimpleAdsorber; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processsystem.ProcessModuleBaseClass; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.adsorber.SimpleAdsorber; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.processmodel.ProcessModuleBaseClass; import neqsim.thermo.ThermodynamicConstantsInterface; /** @@ -213,8 +213,8 @@ public static void main(String[] args) { Stream inletStream = new Stream("inletStream", testSystem); Separator separator = new Separator("Separator 1", inletStream); - neqsim.processsimulation.processsystem.processmodules.AdsorptionDehydrationlModule adsorptionPlant = - new neqsim.processsimulation.processsystem.processmodules.AdsorptionDehydrationlModule( + neqsim.process.processmodel.processmodules.AdsorptionDehydrationlModule adsorptionPlant = + new neqsim.process.processmodel.processmodules.AdsorptionDehydrationlModule( "absPlant"); adsorptionPlant.addInputStream("gasStreamToAdsorber", separator.getGasOutStream()); adsorptionPlant.setSpecification("water dew point temperature", 273.15 - 100.0); @@ -226,8 +226,8 @@ public static void main(String[] args) { adsorptionPlant.setSpecification("maxDesignPressure", 100.0); adsorptionPlant.setSpecification("maxDesignTemperature", 100.0); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(inletStream); operations.add(separator); operations.add(adsorptionPlant); diff --git a/src/main/java/neqsim/processsimulation/processsystem/processmodules/CO2RemovalModule.java b/src/main/java/neqsim/process/processmodel/processmodules/CO2RemovalModule.java similarity index 90% rename from src/main/java/neqsim/processsimulation/processsystem/processmodules/CO2RemovalModule.java rename to src/main/java/neqsim/process/processmodel/processmodules/CO2RemovalModule.java index fb3d388833..9e67363344 100644 --- a/src/main/java/neqsim/processsimulation/processsystem/processmodules/CO2RemovalModule.java +++ b/src/main/java/neqsim/process/processmodel/processmodules/CO2RemovalModule.java @@ -1,11 +1,11 @@ -package neqsim.processsimulation.processsystem.processmodules; +package neqsim.process.processmodel.processmodules; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processsystem.ProcessModuleBaseClass; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.processmodel.ProcessModuleBaseClass; /** *

diff --git a/src/main/java/neqsim/processsimulation/processsystem/processmodules/DPCUModule.java b/src/main/java/neqsim/process/processmodel/processmodules/DPCUModule.java similarity index 89% rename from src/main/java/neqsim/processsimulation/processsystem/processmodules/DPCUModule.java rename to src/main/java/neqsim/process/processmodel/processmodules/DPCUModule.java index a224499677..5e3aeb4270 100644 --- a/src/main/java/neqsim/processsimulation/processsystem/processmodules/DPCUModule.java +++ b/src/main/java/neqsim/process/processmodel/processmodules/DPCUModule.java @@ -1,24 +1,24 @@ -package neqsim.processsimulation.processsystem.processmodules; +package neqsim.process.processmodel.processmodules; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.distillation.Condenser; -import neqsim.processsimulation.processequipment.distillation.DistillationColumn; -import neqsim.processsimulation.processequipment.distillation.Reboiler; -import neqsim.processsimulation.processequipment.expander.Expander; -import neqsim.processsimulation.processequipment.heatexchanger.Cooler; -import neqsim.processsimulation.processequipment.heatexchanger.HeatExchanger; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.splitter.Splitter; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; -import neqsim.processsimulation.processequipment.valve.ValveInterface; -import neqsim.processsimulation.processsystem.ProcessModuleBaseClass; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.distillation.Condenser; +import neqsim.process.equipment.distillation.DistillationColumn; +import neqsim.process.equipment.distillation.Reboiler; +import neqsim.process.equipment.expander.Expander; +import neqsim.process.equipment.heatexchanger.Cooler; +import neqsim.process.equipment.heatexchanger.HeatExchanger; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.splitter.Splitter; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.equipment.valve.ValveInterface; +import neqsim.process.processmodel.ProcessModuleBaseClass; /** *

@@ -313,8 +313,8 @@ public static void main(String[] args) { dpcuModule.addInputStream("feed stream", feedStream); dpcuModule.setSpecification("pressure after reduction valve", 108.0); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(feedStream); operations.add(dpcuModule); operations.run(); diff --git a/src/main/java/neqsim/processsimulation/processsystem/processmodules/GlycolDehydrationlModule.java b/src/main/java/neqsim/process/processmodel/processmodules/GlycolDehydrationlModule.java similarity index 94% rename from src/main/java/neqsim/processsimulation/processsystem/processmodules/GlycolDehydrationlModule.java rename to src/main/java/neqsim/process/processmodel/processmodules/GlycolDehydrationlModule.java index ba729a0a73..d41f000531 100644 --- a/src/main/java/neqsim/processsimulation/processsystem/processmodules/GlycolDehydrationlModule.java +++ b/src/main/java/neqsim/process/processmodel/processmodules/GlycolDehydrationlModule.java @@ -1,19 +1,19 @@ -package neqsim.processsimulation.processsystem.processmodules; +package neqsim.process.processmodel.processmodules; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; -import neqsim.processsimulation.processequipment.absorber.SimpleTEGAbsorber; -import neqsim.processsimulation.processequipment.heatexchanger.Cooler; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.pump.Pump; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processequipment.util.StreamSaturatorUtil; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; -import neqsim.processsimulation.processsystem.ProcessModuleBaseClass; +import neqsim.process.equipment.ProcessEquipmentBaseClass; +import neqsim.process.equipment.absorber.SimpleTEGAbsorber; +import neqsim.process.equipment.heatexchanger.Cooler; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.pump.Pump; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.equipment.util.StreamSaturatorUtil; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.processmodel.ProcessModuleBaseClass; /** *

@@ -471,8 +471,8 @@ public static void main(String[] args) { Separator separator = new Separator("Separator 1", saturator.getOutletStream()); - neqsim.processsimulation.processsystem.processmodules.GlycolDehydrationlModule TEGplant = - new neqsim.processsimulation.processsystem.processmodules.GlycolDehydrationlModule( + neqsim.process.processmodel.processmodules.GlycolDehydrationlModule TEGplant = + new neqsim.process.processmodel.processmodules.GlycolDehydrationlModule( "TEGplant"); TEGplant.addInputStream("gasStreamToAbsorber", saturator.getOutletStream()); TEGplant.addInputStream("strippingGas", strippingGasStream); @@ -486,8 +486,8 @@ public static void main(String[] args) { TEGplant.setSpecification("regenerationPressure", 1.21325); TEGplant.setSpecification("reboilerTemperature", 273.15 + 205.0); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(gasinletStream); operations.add(saturator); // operations.add(separator); diff --git a/src/main/java/neqsim/processsimulation/processsystem/processmodules/MEGReclaimerModule.java b/src/main/java/neqsim/process/processmodel/processmodules/MEGReclaimerModule.java similarity index 89% rename from src/main/java/neqsim/processsimulation/processsystem/processmodules/MEGReclaimerModule.java rename to src/main/java/neqsim/process/processmodel/processmodules/MEGReclaimerModule.java index e28c01267c..f428f51898 100644 --- a/src/main/java/neqsim/processsimulation/processsystem/processmodules/MEGReclaimerModule.java +++ b/src/main/java/neqsim/process/processmodel/processmodules/MEGReclaimerModule.java @@ -1,16 +1,16 @@ -package neqsim.processsimulation.processsystem.processmodules; +package neqsim.process.processmodel.processmodules; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.pump.Pump; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; -import neqsim.processsimulation.processsystem.ProcessModuleBaseClass; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.pump.Pump; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.processmodel.ProcessModuleBaseClass; /** *

diff --git a/src/main/java/neqsim/processsimulation/processsystem/processmodules/MixerGasProcessingModule.java b/src/main/java/neqsim/process/processmodel/processmodules/MixerGasProcessingModule.java similarity index 91% rename from src/main/java/neqsim/processsimulation/processsystem/processmodules/MixerGasProcessingModule.java rename to src/main/java/neqsim/process/processmodel/processmodules/MixerGasProcessingModule.java index 6e04b8a608..91c42bbf0c 100644 --- a/src/main/java/neqsim/processsimulation/processsystem/processmodules/MixerGasProcessingModule.java +++ b/src/main/java/neqsim/process/processmodel/processmodules/MixerGasProcessingModule.java @@ -1,16 +1,16 @@ -package neqsim.processsimulation.processsystem.processmodules; +package neqsim.process.processmodel.processmodules; import java.util.UUID; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.heatexchanger.Cooler; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.pump.Pump; -import neqsim.processsimulation.processequipment.pump.PumpInterface; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processsystem.ProcessModuleBaseClass; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.heatexchanger.Cooler; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.pump.Pump; +import neqsim.process.equipment.pump.PumpInterface; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.processmodel.ProcessModuleBaseClass; /** *

@@ -256,8 +256,8 @@ public static void main(String[] args) { separationModule.setSpecification("export gas temperature", 30.0); separationModule.setSpecification("liquid pump out pressure", 150.0); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(wellStream); operations.add(glycolFeedStream); operations.add(separationModule); diff --git a/src/main/java/neqsim/processsimulation/processsystem/processmodules/PropaneCoolingModule.java b/src/main/java/neqsim/process/processmodel/processmodules/PropaneCoolingModule.java similarity index 91% rename from src/main/java/neqsim/processsimulation/processsystem/processmodules/PropaneCoolingModule.java rename to src/main/java/neqsim/process/processmodel/processmodules/PropaneCoolingModule.java index 37ab8b29cd..ef073bf6e2 100644 --- a/src/main/java/neqsim/processsimulation/processsystem/processmodules/PropaneCoolingModule.java +++ b/src/main/java/neqsim/process/processmodel/processmodules/PropaneCoolingModule.java @@ -1,14 +1,14 @@ -package neqsim.processsimulation.processsystem.processmodules; +package neqsim.process.processmodel.processmodules; import java.util.UUID; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.compressor.CompressorInterface; -import neqsim.processsimulation.processequipment.heatexchanger.Cooler; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; -import neqsim.processsimulation.processsystem.ProcessModuleBaseClass; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.compressor.CompressorInterface; +import neqsim.process.equipment.heatexchanger.Cooler; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.processmodel.ProcessModuleBaseClass; /** *

diff --git a/src/main/java/neqsim/processsimulation/processsystem/processmodules/SeparationTrainModule.java b/src/main/java/neqsim/process/processmodel/processmodules/SeparationTrainModule.java similarity index 92% rename from src/main/java/neqsim/processsimulation/processsystem/processmodules/SeparationTrainModule.java rename to src/main/java/neqsim/process/processmodel/processmodules/SeparationTrainModule.java index df0ff90ad0..5b2f55cc08 100644 --- a/src/main/java/neqsim/processsimulation/processsystem/processmodules/SeparationTrainModule.java +++ b/src/main/java/neqsim/process/processmodel/processmodules/SeparationTrainModule.java @@ -1,18 +1,18 @@ -package neqsim.processsimulation.processsystem.processmodules; +package neqsim.process.processmodel.processmodules; import java.util.UUID; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.heatexchanger.Cooler; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; -import neqsim.processsimulation.processsystem.ProcessModuleBaseClass; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.heatexchanger.Cooler; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.separator.ThreePhaseSeparator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.processmodel.ProcessModuleBaseClass; /** *

@@ -265,8 +265,8 @@ public static void main(String[] args) { 273.15 + 25.0); separationModule.setSpecification("Export oil temperature", 273.15 + 25.0); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(wellStream); operations.add(separationModule); diff --git a/src/main/java/neqsim/processsimulation/processsystem/processmodules/SeparationTrainModuleSimple.java b/src/main/java/neqsim/process/processmodel/processmodules/SeparationTrainModuleSimple.java similarity index 92% rename from src/main/java/neqsim/processsimulation/processsystem/processmodules/SeparationTrainModuleSimple.java rename to src/main/java/neqsim/process/processmodel/processmodules/SeparationTrainModuleSimple.java index 29b441bf08..aa5de67a47 100644 --- a/src/main/java/neqsim/processsimulation/processsystem/processmodules/SeparationTrainModuleSimple.java +++ b/src/main/java/neqsim/process/processmodel/processmodules/SeparationTrainModuleSimple.java @@ -1,18 +1,18 @@ -package neqsim.processsimulation.processsystem.processmodules; +package neqsim.process.processmodel.processmodules; import java.util.UUID; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.heatexchanger.Cooler; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; -import neqsim.processsimulation.processsystem.ProcessModuleBaseClass; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.heatexchanger.Cooler; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.separator.ThreePhaseSeparator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.processmodel.ProcessModuleBaseClass; /** *

@@ -261,8 +261,8 @@ public static void main(String[] args) { 273.15 + 25.0); separationModule.setSpecification("Export oil temperature", 273.15 + 25.0); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(wellStream); operations.add(separationModule); diff --git a/src/main/java/neqsim/processsimulation/processsystem/processmodules/WellFluidModule.java b/src/main/java/neqsim/process/processmodel/processmodules/WellFluidModule.java similarity index 90% rename from src/main/java/neqsim/processsimulation/processsystem/processmodules/WellFluidModule.java rename to src/main/java/neqsim/process/processmodel/processmodules/WellFluidModule.java index eee44390d0..1d8c3a5e25 100644 --- a/src/main/java/neqsim/processsimulation/processsystem/processmodules/WellFluidModule.java +++ b/src/main/java/neqsim/process/processmodel/processmodules/WellFluidModule.java @@ -1,15 +1,15 @@ -package neqsim.processsimulation.processsystem.processmodules; +package neqsim.process.processmodel.processmodules; import java.util.UUID; -import neqsim.processsimulation.processequipment.heatexchanger.Cooler; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; -import neqsim.processsimulation.processsystem.ProcessModuleBaseClass; +import neqsim.process.equipment.heatexchanger.Cooler; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.separator.ThreePhaseSeparator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.processmodel.ProcessModuleBaseClass; import neqsim.thermo.ThermodynamicConstantsInterface; /** @@ -249,8 +249,8 @@ public static void main(String[] args) { separationModule.setSpecification("Third stage pressure", ThermodynamicConstantsInterface.referencePressure); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(wellStream); operations.add(separationModule); diff --git a/src/main/java/neqsim/processsimulation/util/monitor/CompressorResponse.java b/src/main/java/neqsim/process/util/monitor/CompressorResponse.java similarity index 91% rename from src/main/java/neqsim/processsimulation/util/monitor/CompressorResponse.java rename to src/main/java/neqsim/process/util/monitor/CompressorResponse.java index 4f2c5d7afd..d25649726a 100644 --- a/src/main/java/neqsim/processsimulation/util/monitor/CompressorResponse.java +++ b/src/main/java/neqsim/process/util/monitor/CompressorResponse.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.util.monitor; +package neqsim.process.util.monitor; -import neqsim.processsimulation.processequipment.compressor.Compressor; +import neqsim.process.equipment.compressor.Compressor; /** *

@@ -42,7 +42,7 @@ public CompressorResponse() {} *

* * @param inputCompressor a - * {@link neqsim.processsimulation.processequipment.compressor.Compressor} object + * {@link neqsim.process.equipment.compressor.Compressor} object */ public CompressorResponse(Compressor inputCompressor) { name = inputCompressor.getName(); diff --git a/src/main/java/neqsim/processsimulation/util/monitor/FluidComponentResponse.java b/src/main/java/neqsim/process/util/monitor/FluidComponentResponse.java similarity index 98% rename from src/main/java/neqsim/processsimulation/util/monitor/FluidComponentResponse.java rename to src/main/java/neqsim/process/util/monitor/FluidComponentResponse.java index 23e7737231..5fa2c769b1 100644 --- a/src/main/java/neqsim/processsimulation/util/monitor/FluidComponentResponse.java +++ b/src/main/java/neqsim/process/util/monitor/FluidComponentResponse.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.monitor; +package neqsim.process.util.monitor; import java.util.HashMap; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/neqsim/processsimulation/util/monitor/FluidResponse.java b/src/main/java/neqsim/process/util/monitor/FluidResponse.java similarity index 99% rename from src/main/java/neqsim/processsimulation/util/monitor/FluidResponse.java rename to src/main/java/neqsim/process/util/monitor/FluidResponse.java index 96d9e0517e..d4e413cab4 100644 --- a/src/main/java/neqsim/processsimulation/util/monitor/FluidResponse.java +++ b/src/main/java/neqsim/process/util/monitor/FluidResponse.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.monitor; +package neqsim.process.util.monitor; import java.util.HashMap; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/neqsim/processsimulation/util/monitor/HXResponse.java b/src/main/java/neqsim/process/util/monitor/HXResponse.java similarity index 84% rename from src/main/java/neqsim/processsimulation/util/monitor/HXResponse.java rename to src/main/java/neqsim/process/util/monitor/HXResponse.java index d7b3a5e3f3..8e135c4ad0 100644 --- a/src/main/java/neqsim/processsimulation/util/monitor/HXResponse.java +++ b/src/main/java/neqsim/process/util/monitor/HXResponse.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.util.monitor; +package neqsim.process.util.monitor; -import neqsim.processsimulation.processequipment.heatexchanger.HeatExchanger; +import neqsim.process.equipment.heatexchanger.HeatExchanger; /** *

@@ -37,7 +37,7 @@ public HXResponse() {} *

* * @param inputHeatExchanger a - * {@link neqsim.processsimulation.processequipment.heatexchanger.HeatExchanger} object + * {@link neqsim.process.equipment.heatexchanger.HeatExchanger} object */ public HXResponse(HeatExchanger inputHeatExchanger) { name = inputHeatExchanger.getName(); diff --git a/src/main/java/neqsim/processsimulation/util/monitor/HeaterResponse.java b/src/main/java/neqsim/process/util/monitor/HeaterResponse.java similarity index 72% rename from src/main/java/neqsim/processsimulation/util/monitor/HeaterResponse.java rename to src/main/java/neqsim/process/util/monitor/HeaterResponse.java index 7d612f21be..5f2fc8ed56 100644 --- a/src/main/java/neqsim/processsimulation/util/monitor/HeaterResponse.java +++ b/src/main/java/neqsim/process/util/monitor/HeaterResponse.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.util.monitor; +package neqsim.process.util.monitor; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; +import neqsim.process.equipment.heatexchanger.Heater; /** *

@@ -22,7 +22,7 @@ public class HeaterResponse { * Constructor for HeaterResponse. *

* - * @param inputHeater a {@link neqsim.processsimulation.processequipment.heatexchanger.Heater} object + * @param inputHeater a {@link neqsim.process.equipment.heatexchanger.Heater} object */ public HeaterResponse(Heater inputHeater) { name = inputHeater.getName(); diff --git a/src/main/java/neqsim/processsimulation/util/monitor/MPMResponse.java b/src/main/java/neqsim/process/util/monitor/MPMResponse.java similarity index 77% rename from src/main/java/neqsim/processsimulation/util/monitor/MPMResponse.java rename to src/main/java/neqsim/process/util/monitor/MPMResponse.java index e6a805120e..9647bb1671 100644 --- a/src/main/java/neqsim/processsimulation/util/monitor/MPMResponse.java +++ b/src/main/java/neqsim/process/util/monitor/MPMResponse.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.util.monitor; +package neqsim.process.util.monitor; -import neqsim.processsimulation.measurementdevice.MultiPhaseMeter; +import neqsim.process.measurementdevice.MultiPhaseMeter; /** *

@@ -19,7 +19,7 @@ public class MPMResponse { * Constructor for MPMResponse. *

* - * @param inputMPM a {@link neqsim.processsimulation.measurementdevice.MultiPhaseMeter} object + * @param inputMPM a {@link neqsim.process.measurementdevice.MultiPhaseMeter} object */ public MPMResponse(MultiPhaseMeter inputMPM) { name = inputMPM.getName(); diff --git a/src/main/java/neqsim/processsimulation/util/monitor/PumpResponse.java b/src/main/java/neqsim/process/util/monitor/PumpResponse.java similarity index 91% rename from src/main/java/neqsim/processsimulation/util/monitor/PumpResponse.java rename to src/main/java/neqsim/process/util/monitor/PumpResponse.java index 7d8aae8b98..afef090d13 100644 --- a/src/main/java/neqsim/processsimulation/util/monitor/PumpResponse.java +++ b/src/main/java/neqsim/process/util/monitor/PumpResponse.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.util.monitor; +package neqsim.process.util.monitor; -import neqsim.processsimulation.processequipment.pump.Pump; +import neqsim.process.equipment.pump.Pump; /** *

@@ -35,7 +35,7 @@ public class PumpResponse { * Constructor for PumpResponse. *

* - * @param inputPump a {@link neqsim.processsimulation.processequipment.pump.Pump} object + * @param inputPump a {@link neqsim.process.equipment.pump.Pump} object */ public PumpResponse(Pump inputPump) { name = inputPump.getName(); diff --git a/src/main/java/neqsim/processsimulation/util/monitor/SeparatorResponse.java b/src/main/java/neqsim/process/util/monitor/SeparatorResponse.java similarity index 81% rename from src/main/java/neqsim/processsimulation/util/monitor/SeparatorResponse.java rename to src/main/java/neqsim/process/util/monitor/SeparatorResponse.java index b615964c07..cf286887cd 100644 --- a/src/main/java/neqsim/processsimulation/util/monitor/SeparatorResponse.java +++ b/src/main/java/neqsim/process/util/monitor/SeparatorResponse.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.util.monitor; +package neqsim.process.util.monitor; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.separator.ThreePhaseSeparator; /** *

@@ -22,7 +22,7 @@ public class SeparatorResponse { *

* * @param inputSeparator a - * {@link neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator} object + * {@link neqsim.process.equipment.separator.ThreePhaseSeparator} object */ public SeparatorResponse(ThreePhaseSeparator inputSeparator) { name = inputSeparator.getName(); @@ -45,7 +45,7 @@ public SeparatorResponse(ThreePhaseSeparator inputSeparator) { * Constructor for SeparatorResponse. *

* - * @param inputSeparator a {@link neqsim.processsimulation.processequipment.separator.Separator} + * @param inputSeparator a {@link neqsim.process.equipment.separator.Separator} * object */ public SeparatorResponse(Separator inputSeparator) { diff --git a/src/main/java/neqsim/processsimulation/util/monitor/StreamResponse.java b/src/main/java/neqsim/process/util/monitor/StreamResponse.java similarity index 98% rename from src/main/java/neqsim/processsimulation/util/monitor/StreamResponse.java rename to src/main/java/neqsim/process/util/monitor/StreamResponse.java index 3081843e6c..46b27e6f1b 100644 --- a/src/main/java/neqsim/processsimulation/util/monitor/StreamResponse.java +++ b/src/main/java/neqsim/process/util/monitor/StreamResponse.java @@ -1,9 +1,9 @@ -package neqsim.processsimulation.util.monitor; +package neqsim.process.util.monitor; import java.util.HashMap; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.standards.gasquality.Standard_ISO6976; /** @@ -29,7 +29,7 @@ public class StreamResponse { * Constructor for StreamResponse. *

* - * @param inputStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inputStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public StreamResponse(StreamInterface inputStream) { diff --git a/src/main/java/neqsim/processsimulation/util/monitor/ThreePhaseSeparatorResponse.java b/src/main/java/neqsim/process/util/monitor/ThreePhaseSeparatorResponse.java similarity index 74% rename from src/main/java/neqsim/processsimulation/util/monitor/ThreePhaseSeparatorResponse.java rename to src/main/java/neqsim/process/util/monitor/ThreePhaseSeparatorResponse.java index 105f82dcb8..8bbd875dcd 100644 --- a/src/main/java/neqsim/processsimulation/util/monitor/ThreePhaseSeparatorResponse.java +++ b/src/main/java/neqsim/process/util/monitor/ThreePhaseSeparatorResponse.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.util.monitor; +package neqsim.process.util.monitor; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.separator.ThreePhaseSeparator; /** *

@@ -22,7 +22,7 @@ public class ThreePhaseSeparatorResponse { * Constructor for ThreePhaseSeparatorResponse. *

* - * @param inputSeparator a {@link neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator} object + * @param inputSeparator a {@link neqsim.process.equipment.separator.ThreePhaseSeparator} object */ public ThreePhaseSeparatorResponse(ThreePhaseSeparator inputSeparator) { name = inputSeparator.getName(); @@ -37,7 +37,7 @@ public ThreePhaseSeparatorResponse(ThreePhaseSeparator inputSeparator) { * Constructor for ThreePhaseSeparatorResponse. *

* - * @param inputSeparator a {@link neqsim.processsimulation.processequipment.separator.Separator} object + * @param inputSeparator a {@link neqsim.process.equipment.separator.Separator} object */ public ThreePhaseSeparatorResponse(Separator inputSeparator) { name = inputSeparator.getName(); diff --git a/src/main/java/neqsim/processsimulation/util/monitor/Value.java b/src/main/java/neqsim/process/util/monitor/Value.java similarity index 89% rename from src/main/java/neqsim/processsimulation/util/monitor/Value.java rename to src/main/java/neqsim/process/util/monitor/Value.java index 0a56d3d73d..1b02be415a 100644 --- a/src/main/java/neqsim/processsimulation/util/monitor/Value.java +++ b/src/main/java/neqsim/process/util/monitor/Value.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.monitor; +package neqsim.process.util.monitor; /** * Unit class nested within Units. diff --git a/src/main/java/neqsim/processsimulation/util/monitor/ValveResponse.java b/src/main/java/neqsim/process/util/monitor/ValveResponse.java similarity index 80% rename from src/main/java/neqsim/processsimulation/util/monitor/ValveResponse.java rename to src/main/java/neqsim/process/util/monitor/ValveResponse.java index 017b999399..fcd9fd97f2 100644 --- a/src/main/java/neqsim/processsimulation/util/monitor/ValveResponse.java +++ b/src/main/java/neqsim/process/util/monitor/ValveResponse.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.util.monitor; +package neqsim.process.util.monitor; import java.util.ArrayList; -import neqsim.processsimulation.processequipment.valve.ValveInterface; +import neqsim.process.equipment.valve.ValveInterface; /** *

@@ -20,7 +20,7 @@ public class ValveResponse { * Constructor for StreamResponse. *

* - * @param valve a {@link neqsim.processsimulation.processequipment.valve.ValveInterface} object + * @param valve a {@link neqsim.process.equipment.valve.ValveInterface} object */ public ValveResponse(ValveInterface valve) { name = valve.getName(); diff --git a/src/main/java/neqsim/processsimulation/util/monitor/WellAllocatorResponse.java b/src/main/java/neqsim/process/util/monitor/WellAllocatorResponse.java similarity index 75% rename from src/main/java/neqsim/processsimulation/util/monitor/WellAllocatorResponse.java rename to src/main/java/neqsim/process/util/monitor/WellAllocatorResponse.java index 53a0127b6d..53bd27d757 100644 --- a/src/main/java/neqsim/processsimulation/util/monitor/WellAllocatorResponse.java +++ b/src/main/java/neqsim/process/util/monitor/WellAllocatorResponse.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.util.monitor; +package neqsim.process.util.monitor; -import neqsim.processsimulation.measurementdevice.WellAllocator; +import neqsim.process.measurementdevice.WellAllocator; /** *

@@ -19,7 +19,7 @@ public class WellAllocatorResponse { * Constructor for WellAllocatorResponse. *

* - * @param inputAllocator a {@link neqsim.processsimulation.measurementdevice.WellAllocator} object + * @param inputAllocator a {@link neqsim.process.measurementdevice.WellAllocator} object */ public WellAllocatorResponse(WellAllocator inputAllocator) { name = inputAllocator.getName(); diff --git a/src/main/java/neqsim/processsimulation/util/report/Report.java b/src/main/java/neqsim/process/util/report/Report.java similarity index 80% rename from src/main/java/neqsim/processsimulation/util/report/Report.java rename to src/main/java/neqsim/process/util/report/Report.java index 7a8a43ef16..cc8e41b743 100644 --- a/src/main/java/neqsim/processsimulation/util/report/Report.java +++ b/src/main/java/neqsim/process/util/report/Report.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.report; +package neqsim.process.util.report; import java.util.HashMap; import java.util.Map; @@ -8,11 +8,11 @@ import com.google.gson.GsonBuilder; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processsystem.ProcessModule; -import neqsim.processsimulation.processsystem.ProcessModuleBaseClass; -import neqsim.processsimulation.processsystem.ProcessSystem; +import neqsim.process.equipment.ProcessEquipmentBaseClass; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.processmodel.ProcessModule; +import neqsim.process.processmodel.ProcessModuleBaseClass; +import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.system.SystemInterface; /** @@ -34,7 +34,7 @@ public class Report { * Constructor for Report. *

* - * @param process a {@link neqsim.processsimulation.processsystem.ProcessSystem} object + * @param process a {@link neqsim.process.processmodel.ProcessSystem} object */ public Report(ProcessSystem process) { this.process = process; @@ -57,7 +57,7 @@ public Report(SystemInterface fluid) { *

* * @param processEquipmentBaseClass a - * {@link neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass} object + * {@link neqsim.process.equipment.ProcessEquipmentBaseClass} object */ public Report(ProcessEquipmentBaseClass processEquipmentBaseClass) { processEquipment = processEquipmentBaseClass; @@ -68,7 +68,7 @@ public Report(ProcessEquipmentBaseClass processEquipmentBaseClass) { * Constructor for Report. *

* - * @param processModule a {@link neqsim.processsimulation.processsystem.ProcessModule} object + * @param processModule a {@link neqsim.process.processmodel.ProcessModule} object */ public Report(ProcessModule processModule) { // TODO Auto-generated constructor stub @@ -80,7 +80,7 @@ public Report(ProcessModule processModule) { *

* * @param processModuleBaseClass a - * {@link neqsim.processsimulation.processsystem.ProcessModuleBaseClass} object + * {@link neqsim.process.processmodel.ProcessModuleBaseClass} object */ public Report(ProcessModuleBaseClass processModuleBaseClass) { // TODO Auto-generated constructor stub diff --git a/src/main/java/neqsim/processsimulation/processequipment/heatexchanger/HeatExchangerInterface.java b/src/main/java/neqsim/processsimulation/processequipment/heatexchanger/HeatExchangerInterface.java deleted file mode 100644 index 8947fceaea..0000000000 --- a/src/main/java/neqsim/processsimulation/processequipment/heatexchanger/HeatExchangerInterface.java +++ /dev/null @@ -1,21 +0,0 @@ -package neqsim.processsimulation.processequipment.heatexchanger; - -/** - *

- * HeatExchangerInterface interface. - *

- * - * @author esol - * @version $Id: $Id - */ -public interface HeatExchangerInterface extends HeaterInterface { - /** - *

- * getOutStream. - *

- * - * @param i a int - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object - */ - public neqsim.processsimulation.processequipment.stream.StreamInterface getOutStream(int i); -} diff --git a/src/main/java/neqsim/thermo/system/SystemThermo.java b/src/main/java/neqsim/thermo/system/SystemThermo.java index 7125e89dc0..baed65f4d0 100644 --- a/src/main/java/neqsim/thermo/system/SystemThermo.java +++ b/src/main/java/neqsim/thermo/system/SystemThermo.java @@ -5050,14 +5050,14 @@ public double[] getzvector() { @Override public String toJson() { return new GsonBuilder().create() - .toJson(new neqsim.processsimulation.util.monitor.FluidResponse(this)); + .toJson(new neqsim.process.util.monitor.FluidResponse(this)); } /** {@inheritDoc} */ @Override public String toCompJson() { return new GsonBuilder().create() - .toJson(new neqsim.processsimulation.util.monitor.FluidComponentResponse(this)); + .toJson(new neqsim.process.util.monitor.FluidComponentResponse(this)); } /** {@inheritDoc} */ diff --git a/src/test/java/neqsim/fluidmechanics/util/example/WettedWall_CO2_water.java b/src/test/java/neqsim/fluidmechanics/util/example/WettedWall_CO2_water.java index 0bc35dccac..eb0cedb8e6 100644 --- a/src/test/java/neqsim/fluidmechanics/util/example/WettedWall_CO2_water.java +++ b/src/test/java/neqsim/fluidmechanics/util/example/WettedWall_CO2_water.java @@ -1,10 +1,10 @@ package neqsim.fluidmechanics.util.example; -import neqsim.processsimulation.processequipment.pipeline.Pipeline; -import neqsim.processsimulation.processequipment.pipeline.TwoPhasePipeLine; -import neqsim.processsimulation.processequipment.stream.NeqStream; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processsystem.ProcessSystem; +import neqsim.process.equipment.pipeline.Pipeline; +import neqsim.process.equipment.pipeline.TwoPhasePipeLine; +import neqsim.process.equipment.stream.NeqStream; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; diff --git a/src/test/java/neqsim/processsimulation/controllerdevice/ControllerDeviceBaseClassTest.java b/src/test/java/neqsim/processsimulation/controllerdevice/ControllerDeviceBaseClassTest.java index b981a50abc..43f59bdfc9 100644 --- a/src/test/java/neqsim/processsimulation/controllerdevice/ControllerDeviceBaseClassTest.java +++ b/src/test/java/neqsim/processsimulation/controllerdevice/ControllerDeviceBaseClassTest.java @@ -3,6 +3,7 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import neqsim.process.controllerdevice.ControllerDeviceBaseClass; public class ControllerDeviceBaseClassTest { static ControllerDeviceBaseClass c; diff --git a/src/test/java/neqsim/processsimulation/measurementdevice/CombustionEmissionsCalculatorTest.java b/src/test/java/neqsim/processsimulation/measurementdevice/CombustionEmissionsCalculatorTest.java index 3c85e4f31f..b97d456557 100644 --- a/src/test/java/neqsim/processsimulation/measurementdevice/CombustionEmissionsCalculatorTest.java +++ b/src/test/java/neqsim/processsimulation/measurementdevice/CombustionEmissionsCalculatorTest.java @@ -2,7 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.measurementdevice.CombustionEmissionsCalculator; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; diff --git a/src/test/java/neqsim/processsimulation/measurementdevice/FLowInducedVibrationTest.java b/src/test/java/neqsim/processsimulation/measurementdevice/FLowInducedVibrationTest.java index 8591c2867b..1f9ae0e167 100644 --- a/src/test/java/neqsim/processsimulation/measurementdevice/FLowInducedVibrationTest.java +++ b/src/test/java/neqsim/processsimulation/measurementdevice/FLowInducedVibrationTest.java @@ -2,10 +2,11 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.pipeline.PipeBeggsAndBrills; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.util.FlowRateAdjuster; -import neqsim.processsimulation.processsystem.ProcessSystem; +import neqsim.process.equipment.pipeline.PipeBeggsAndBrills; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.util.FlowRateAdjuster; +import neqsim.process.measurementdevice.FlowInducedVibrationAnalyser; +import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -94,8 +95,8 @@ public void testSetUnit() { flowInducedVibrationAnalyserFRMS.setMethod("FRMS"); pipe.getOutletStream(); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(flowRateAdj); operations.add(pipe); diff --git a/src/test/java/neqsim/processsimulation/measurementdevice/MultiPhaseMeterTest.java b/src/test/java/neqsim/processsimulation/measurementdevice/MultiPhaseMeterTest.java index c546e4d14a..d54a261a35 100644 --- a/src/test/java/neqsim/processsimulation/measurementdevice/MultiPhaseMeterTest.java +++ b/src/test/java/neqsim/processsimulation/measurementdevice/MultiPhaseMeterTest.java @@ -2,7 +2,8 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.measurementdevice.MultiPhaseMeter; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; @@ -33,8 +34,8 @@ void testMain() { multiPhaseMeter.setTemperature(90.0, "C"); multiPhaseMeter.setPressure(60.0, "bara"); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(multiPhaseMeter); operations.run(); diff --git a/src/test/java/neqsim/processsimulation/measurementdevice/WellAllocatorTest.java b/src/test/java/neqsim/processsimulation/measurementdevice/WellAllocatorTest.java index a0316002be..68ad4e6268 100644 --- a/src/test/java/neqsim/processsimulation/measurementdevice/WellAllocatorTest.java +++ b/src/test/java/neqsim/processsimulation/measurementdevice/WellAllocatorTest.java @@ -3,9 +3,10 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.util.monitor.WellAllocatorResponse; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.measurementdevice.WellAllocator; +import neqsim.process.util.monitor.WellAllocatorResponse; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; @@ -17,7 +18,7 @@ class WellAllocatorTest extends neqsim.NeqSimTest { /** * Test method for - * {@link neqsim.processsimulation.measurementdevice.WellAllocator#getMeasuredValue(java.lang.String)}. + * {@link neqsim.process.measurementdevice.WellAllocator#getMeasuredValue(java.lang.String)}. */ @Test void testGetMeasuredValueString() { @@ -60,8 +61,8 @@ void testGetMeasuredValueString() { wellAlloc.setExportGasStream(stream_gasExp); wellAlloc.setExportOilStream(stream_oilExp); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(stream_2); operations.add(sep1); diff --git a/src/test/java/neqsim/processsimulation/measurementdevice/nmVOCTest.java b/src/test/java/neqsim/processsimulation/measurementdevice/nmVOCTest.java index d59c4006ab..b5d7935627 100644 --- a/src/test/java/neqsim/processsimulation/measurementdevice/nmVOCTest.java +++ b/src/test/java/neqsim/processsimulation/measurementdevice/nmVOCTest.java @@ -3,8 +3,9 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processsystem.ProcessSystem; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.measurementdevice.NMVOCAnalyser; +import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; diff --git a/src/test/java/neqsim/processsimulation/measurementdevice/pHProbeTest.java b/src/test/java/neqsim/processsimulation/measurementdevice/pHProbeTest.java index 958bfdbffa..07a9ce7016 100644 --- a/src/test/java/neqsim/processsimulation/measurementdevice/pHProbeTest.java +++ b/src/test/java/neqsim/processsimulation/measurementdevice/pHProbeTest.java @@ -5,8 +5,9 @@ import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.measurementdevice.pHProbe; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; diff --git a/src/test/java/neqsim/processsimulation/measurementdevice/simpleflowregime/SevereSlugTest.java b/src/test/java/neqsim/processsimulation/measurementdevice/simpleflowregime/SevereSlugTest.java index a591813e51..a354980416 100644 --- a/src/test/java/neqsim/processsimulation/measurementdevice/simpleflowregime/SevereSlugTest.java +++ b/src/test/java/neqsim/processsimulation/measurementdevice/simpleflowregime/SevereSlugTest.java @@ -2,7 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.measurementdevice.simpleflowregime.SevereSlugAnalyser; public class SevereSlugTest { @Test diff --git a/src/test/java/neqsim/processsimulation/mechanicaldesign/SystemMechanicalDesignTest.java b/src/test/java/neqsim/processsimulation/mechanicaldesign/SystemMechanicalDesignTest.java index 6d97c44868..36e1745b39 100644 --- a/src/test/java/neqsim/processsimulation/mechanicaldesign/SystemMechanicalDesignTest.java +++ b/src/test/java/neqsim/processsimulation/mechanicaldesign/SystemMechanicalDesignTest.java @@ -2,25 +2,26 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.costestimation.CostEstimateBaseClass; -import neqsim.processsimulation.mechanicaldesign.pipeline.PipelineMechanicalDesign; -import neqsim.processsimulation.mechanicaldesign.separator.GasScrubberMechanicalDesign; -import neqsim.processsimulation.mechanicaldesign.separator.SeparatorMechanicalDesign; -import neqsim.processsimulation.mechanicaldesign.valve.ValveMechanicalDesign; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.pipeline.AdiabaticPipe; -import neqsim.processsimulation.processequipment.pump.Pump; -import neqsim.processsimulation.processequipment.separator.GasScrubber; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.costestimation.CostEstimateBaseClass; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.pipeline.AdiabaticPipe; +import neqsim.process.equipment.pump.Pump; +import neqsim.process.equipment.separator.GasScrubber; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.mechanicaldesign.SystemMechanicalDesign; +import neqsim.process.mechanicaldesign.pipeline.PipelineMechanicalDesign; +import neqsim.process.mechanicaldesign.separator.GasScrubberMechanicalDesign; +import neqsim.process.mechanicaldesign.separator.SeparatorMechanicalDesign; +import neqsim.process.mechanicaldesign.valve.ValveMechanicalDesign; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; public class SystemMechanicalDesignTest { - static neqsim.processsimulation.processsystem.ProcessSystem operations; + static neqsim.process.processmodel.ProcessSystem operations; @BeforeAll static void createProcess() { @@ -61,8 +62,8 @@ static void createProcess() { feedStream.setTemperature(25.5, "C"); feedStream.setPressure(26.0, "bara"); - neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator seprator1stStage = - new neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator( + neqsim.process.equipment.separator.ThreePhaseSeparator seprator1stStage = + new neqsim.process.equipment.separator.ThreePhaseSeparator( "1st stage separator", feedStream); ThrottlingValve valve1 = new ThrottlingValve("valve1", seprator1stStage.getLiquidOutStream()); @@ -71,8 +72,8 @@ static void createProcess() { Heater oilHeater = new Heater("oil heater", valve1.getOutletStream()); oilHeater.setOutTemperature(359.0); - neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator seprator2ndStage = - new neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator( + neqsim.process.equipment.separator.ThreePhaseSeparator seprator2ndStage = + new neqsim.process.equipment.separator.ThreePhaseSeparator( "2nd stage separator", oilHeater.getOutletStream()); ThrottlingValve valve2 = new ThrottlingValve("valve2", seprator2ndStage.getLiquidOutStream()); @@ -81,8 +82,8 @@ static void createProcess() { StreamInterface recircstream1 = valve2.getOutletStream().clone("oilRecirc1"); recircstream1.setFlowRate(1e-6, "kg/hr"); - neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator seprator3rdStage = - new neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator( + neqsim.process.equipment.separator.ThreePhaseSeparator seprator3rdStage = + new neqsim.process.equipment.separator.ThreePhaseSeparator( "3rd stage separator"); seprator3rdStage.addStream(valve2.getOutletStream()); seprator3rdStage.addStream(recircstream1); @@ -106,7 +107,7 @@ static void createProcess() { recycle1.addStream(valveLP1.getOutletStream()); recycle1.setOutletStream(recircstream1); - operations = new neqsim.processsimulation.processsystem.ProcessSystem(); + operations = new neqsim.process.processmodel.ProcessSystem(); operations.add(feedStream); operations.add(seprator1stStage); operations.add(valve1); @@ -196,7 +197,7 @@ void testRunDesignCalculationforValve() { @Test void testRunDesignForPipeline() { AdiabaticPipe pipe = new AdiabaticPipe("pipe1", - ((neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator) operations + ((neqsim.process.equipment.separator.ThreePhaseSeparator) operations .getUnit("1st stage separator")).getGasOutStream()); pipe.setDiameter(1.0); pipe.setLength(1000.0); diff --git a/src/test/java/neqsim/processsimulation/processequipment/absorber/SimpleAbsorberTest.java b/src/test/java/neqsim/processsimulation/processequipment/absorber/SimpleAbsorberTest.java index 1019b49ec4..b840273e8a 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/absorber/SimpleAbsorberTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/absorber/SimpleAbsorberTest.java @@ -3,7 +3,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.stream.Stream; public class SimpleAbsorberTest extends neqsim.NeqSimTest { neqsim.thermo.system.SystemFurstElectrolyteEos testSystem; @@ -21,8 +21,8 @@ void setUp() { @Test void testRun() { Stream stream_Hot = new Stream("Stream1", testSystem); - neqsim.processsimulation.processequipment.absorber.SimpleAbsorber absorber1 = - new neqsim.processsimulation.processequipment.absorber.SimpleAbsorber("absorber", + neqsim.process.equipment.absorber.SimpleAbsorber absorber1 = + new neqsim.process.equipment.absorber.SimpleAbsorber("absorber", stream_Hot); absorber1.setAproachToEquilibrium(0.75); diff --git a/src/test/java/neqsim/processsimulation/processequipment/adsorber/SimpleAdsorberTest.java b/src/test/java/neqsim/processsimulation/processequipment/adsorber/SimpleAdsorberTest.java index 23167b9c76..384842cb40 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/adsorber/SimpleAdsorberTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/adsorber/SimpleAdsorberTest.java @@ -3,7 +3,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.stream.Stream; public class SimpleAdsorberTest extends neqsim.NeqSimTest { neqsim.thermo.system.SystemFurstElectrolyteEos testSystem; @@ -21,8 +21,8 @@ void setUp() { @Test void testRun() { Stream stream_Hot = new Stream("Stream1", testSystem); - neqsim.processsimulation.processequipment.adsorber.SimpleAdsorber adsorber1 = - new neqsim.processsimulation.processequipment.adsorber.SimpleAdsorber("adsorber", + neqsim.process.equipment.adsorber.SimpleAdsorber adsorber1 = + new neqsim.process.equipment.adsorber.SimpleAdsorber("adsorber", stream_Hot); adsorber1.setAproachToEquilibrium(0.75); diff --git a/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorCalculationTest.java b/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorCalculationTest.java index 4d086a27e0..cb078c8bb8 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorCalculationTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorCalculationTest.java @@ -3,7 +3,8 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.stream.Stream; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; @@ -96,8 +97,8 @@ public void testRun() { setCurves(); comp1.setUsePolytropicCalc(true); comp1.setSpeed(11918); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(comp1); operations.run(); diff --git a/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorChartTest.java b/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorChartTest.java index ed1692a38d..b1a4a5ad19 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorChartTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorChartTest.java @@ -4,7 +4,9 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.compressor.CompressorChart; +import neqsim.process.equipment.stream.Stream; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; @@ -117,8 +119,8 @@ public void setUp() { @Test public void test_Run() { - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); Stream stream_1 = (Stream) comp1.getInletStream(); operations.add(stream_1); operations.add(comp1); diff --git a/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorPropertyProfileTest.java b/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorPropertyProfileTest.java index 25b79d425d..1cc9e4a103 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorPropertyProfileTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorPropertyProfileTest.java @@ -3,8 +3,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processsystem.ProcessSystem; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.system.SystemSrkEos; class CompressorPropertyProfileTest extends neqsim.NeqSimTest { @@ -15,7 +15,7 @@ class CompressorPropertyProfileTest extends neqsim.NeqSimTest { double gasFlowRate = 5.0; double pressure_Out = 150.0; ProcessSystem processOps = null; - neqsim.processsimulation.processequipment.compressor.Compressor compressor1 = null; + neqsim.process.equipment.compressor.Compressor compressor1 = null; /** *

@@ -33,7 +33,7 @@ public void setUp() { inletStream.setPressure(pressure_inlet, "bara"); inletStream.setTemperature(temperature_inlet, "C"); inletStream.setFlowRate(gasFlowRate, "MSm3/day"); - compressor1 = new neqsim.processsimulation.processequipment.compressor.Compressor("Compressor1", + compressor1 = new neqsim.process.equipment.compressor.Compressor("Compressor1", inletStream); compressor1.setOutletPressure(pressure_Out); compressor1.setUsePolytropicCalc(true); diff --git a/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorTest.java b/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorTest.java index 0f8f0a905d..2ad2b977d2 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorTest.java @@ -12,8 +12,9 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processsystem.ProcessSystem; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.system.SystemSrkEos; class CompressorTest extends neqsim.NeqSimTest { @@ -27,7 +28,7 @@ class CompressorTest extends neqsim.NeqSimTest { double pressure_Out = 150.0; double polytropicEff = 0.77; ProcessSystem processOps = null; - neqsim.processsimulation.processequipment.compressor.Compressor compressor1 = null; + neqsim.process.equipment.compressor.Compressor compressor1 = null; String unitName = "Compressor1"; @@ -148,8 +149,8 @@ public void testCompressorWithSrk() { inletStream.setTemperature(temperature_inlet, "C"); inletStream.setFlowRate(gasFlowRate, "MSm3/day"); inletStream.run(); - neqsim.processsimulation.processequipment.compressor.Compressor compressor1 = - new neqsim.processsimulation.processequipment.compressor.Compressor("Compressor1", + neqsim.process.equipment.compressor.Compressor compressor1 = + new neqsim.process.equipment.compressor.Compressor("Compressor1", inletStream); compressor1.setUsePolytropicCalc(true); compressor1.setOutletPressure(pressure_Out); @@ -177,8 +178,8 @@ public void testCompressorWithGERG2008() { inletStream.setTemperature(temperature_inlet, "C"); inletStream.setFlowRate(gasFlowRate, "MSm3/day"); inletStream.run(); - neqsim.processsimulation.processequipment.compressor.Compressor compressor1 = - new neqsim.processsimulation.processequipment.compressor.Compressor("Compressor1", + neqsim.process.equipment.compressor.Compressor compressor1 = + new neqsim.process.equipment.compressor.Compressor("Compressor1", inletStream); compressor1.setUsePolytropicCalc(true); compressor1.setOutletPressure(pressure_Out); @@ -208,8 +209,8 @@ public void testCompressorWithGERG2008_2() { inletStream.setTemperature(temperature_inlet, "C"); inletStream.setFlowRate(gasFlowRate, "MSm3/day"); inletStream.run(); - neqsim.processsimulation.processequipment.compressor.Compressor compressor1 = - new neqsim.processsimulation.processequipment.compressor.Compressor("Compressor1", + neqsim.process.equipment.compressor.Compressor compressor1 = + new neqsim.process.equipment.compressor.Compressor("Compressor1", inletStream); compressor1.setOutletPressure(pressure_Out); compressor1.setPolytropicEfficiency(0.56); diff --git a/src/test/java/neqsim/processsimulation/processequipment/distillation/DistillationColumnTest.java b/src/test/java/neqsim/processsimulation/processequipment/distillation/DistillationColumnTest.java index 4c2414e63c..706e433b67 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/distillation/DistillationColumnTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/distillation/DistillationColumnTest.java @@ -2,8 +2,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.distillation.Condenser; +import neqsim.process.equipment.distillation.DistillationColumn; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; public class DistillationColumnTest { /** diff --git a/src/test/java/neqsim/processsimulation/processequipment/heatexchanger/HeatExchangerTest.java b/src/test/java/neqsim/processsimulation/processequipment/heatexchanger/HeatExchangerTest.java index f35dbe5043..171c5077b1 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/heatexchanger/HeatExchangerTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/heatexchanger/HeatExchangerTest.java @@ -3,10 +3,11 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.heatexchanger.HeatExchanger; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.equipment.valve.ThrottlingValve; import neqsim.thermodynamicoperations.ThermodynamicOperations; /** @@ -59,8 +60,8 @@ void testRun1() { resyc.addStream(valv1.getOutletStream()); resyc.setOutletStream(stream_Cold); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_Hot); operations.add(stream_Cold); operations.add(heatEx); @@ -89,12 +90,12 @@ void testRun2() { Stream stream_Cold = new Stream("Stream2", testSystem2); - neqsim.processsimulation.processequipment.heatexchanger.HeatExchanger heatExchanger1 = - new neqsim.processsimulation.processequipment.heatexchanger.HeatExchanger("heatEx", + neqsim.process.equipment.heatexchanger.HeatExchanger heatExchanger1 = + new neqsim.process.equipment.heatexchanger.HeatExchanger("heatEx", stream_Hot, stream_Cold); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_Hot); operations.add(stream_Cold); operations.add(heatExchanger1); @@ -107,7 +108,7 @@ void testRun2() { assertEquals(15780.77130, heatExchanger1.getUAvalue(), 1e-3); - heatExchanger1 = new neqsim.processsimulation.processequipment.heatexchanger.HeatExchanger( + heatExchanger1 = new neqsim.process.equipment.heatexchanger.HeatExchanger( "heatEx", stream_Hot, stream_Cold); heatExchanger1.setDeltaT(1.0); heatExchanger1.run(); diff --git a/src/test/java/neqsim/processsimulation/processequipment/heatexchanger/HeaterTest.java b/src/test/java/neqsim/processsimulation/processequipment/heatexchanger/HeaterTest.java index a628fdb724..b338878c8a 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/heatexchanger/HeaterTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/heatexchanger/HeaterTest.java @@ -4,8 +4,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processsystem.ProcessSystem; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.system.SystemSrkEos; public class HeaterTest { diff --git a/src/test/java/neqsim/processsimulation/processequipment/manifold/ManifoldTest.java b/src/test/java/neqsim/processsimulation/processequipment/manifold/ManifoldTest.java index 681046cedc..de842d04e0 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/manifold/ManifoldTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/manifold/ManifoldTest.java @@ -2,8 +2,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processsystem.ProcessSystem; +import neqsim.process.equipment.manifold.Manifold; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.system.SystemSrkEos; public class ManifoldTest { diff --git a/src/test/java/neqsim/processsimulation/processequipment/mixer/MixerTest.java b/src/test/java/neqsim/processsimulation/processequipment/mixer/MixerTest.java index d0c53214f3..252ea24d1c 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/mixer/MixerTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/mixer/MixerTest.java @@ -5,8 +5,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processsystem.ProcessSystem; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.system.SystemSrkEos; /** @@ -48,7 +49,7 @@ static void setUpBeforeClass() { } /** - * Test method for {@link neqsim.processsimulation.processequipment.mixer.Mixer#run()}. + * Test method for {@link neqsim.process.equipment.mixer.Mixer#run()}. */ @Test void testRun() { @@ -61,7 +62,7 @@ void testRun() { } /** - * Test method for {@link neqsim.processsimulation.processequipment.mixer.Mixer#run()}. + * Test method for {@link neqsim.process.equipment.mixer.Mixer#run()}. */ @Test void testNeedRecalculation() { diff --git a/src/test/java/neqsim/processsimulation/processequipment/pipeline/AdiabaticTwoPhasePipeTest.java b/src/test/java/neqsim/processsimulation/processequipment/pipeline/AdiabaticTwoPhasePipeTest.java index 982b81f934..e254a03e90 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/pipeline/AdiabaticTwoPhasePipeTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/pipeline/AdiabaticTwoPhasePipeTest.java @@ -2,7 +2,8 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.pipeline.AdiabaticTwoPhasePipe; +import neqsim.process.equipment.stream.Stream; public class AdiabaticTwoPhasePipeTest { @Test @@ -28,8 +29,8 @@ public void testMain() { pipe2.setPipeWallRoughness(5e-6); // pipe.setOutPressure(112.0); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(pipe); operations.add(pipe2); diff --git a/src/test/java/neqsim/processsimulation/processequipment/pipeline/BeggsAndBrillsPipeTest.java b/src/test/java/neqsim/processsimulation/processequipment/pipeline/BeggsAndBrillsPipeTest.java index 7383281f99..f8e80bb45a 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/pipeline/BeggsAndBrillsPipeTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/pipeline/BeggsAndBrillsPipeTest.java @@ -2,7 +2,8 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.pipeline.PipeBeggsAndBrills; +import neqsim.process.equipment.stream.Stream; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -76,8 +77,8 @@ public void testPipeLineBeggsAndBrills() { pipe.setNumberOfIncrements(20); pipe.setRunIsothermal(false); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(pipe); operations.run(); @@ -124,8 +125,8 @@ public void testPipeLineBeggsAndBrills2() { pipe.setNumberOfIncrements(50); pipe.setRunIsothermal(false); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(pipe); operations.run(); @@ -174,8 +175,8 @@ public void testPipeLineBeggsAndBrills3() { pipe.setNumberOfIncrements(10); pipe.setRunIsothermal(false); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(pipe); operations.run(); @@ -238,8 +239,8 @@ public void testPipeLineBeggsAndBrills4() { pipe.setRunIsothermal(false); // test with only water phase - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(pipe); operations.run(); @@ -292,8 +293,8 @@ public void testPipeLineBeggsAndBrills4() { pipe2.setNumberOfIncrements(10); pipe2.setRunIsothermal(false); - neqsim.processsimulation.processsystem.ProcessSystem operations2 = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations2 = + new neqsim.process.processmodel.ProcessSystem(); operations2.add(stream_2); operations2.add(pipe2); operations2.run(); @@ -331,8 +332,8 @@ public void testPipeLineBeggsAndBrills4() { pipe3.setNumberOfIncrements(10); pipe3.setRunIsothermal(false); - neqsim.processsimulation.processsystem.ProcessSystem operations3 = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations3 = + new neqsim.process.processmodel.ProcessSystem(); operations3.add(stream_3); operations3.add(pipe3); operations3.run(); diff --git a/src/test/java/neqsim/processsimulation/processequipment/pipeline/PipelineTest.java b/src/test/java/neqsim/processsimulation/processequipment/pipeline/PipelineTest.java index 7ed7056421..5a40b069bc 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/pipeline/PipelineTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/pipeline/PipelineTest.java @@ -2,7 +2,10 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.pipeline.AdiabaticPipe; +import neqsim.process.equipment.pipeline.OnePhasePipeLine; +import neqsim.process.equipment.pipeline.PipeBeggsAndBrills; +import neqsim.process.equipment.stream.Stream; public class PipelineTest { @Test @@ -52,8 +55,8 @@ public void testMain() { beggsBrilsPipe.setDiameter(diameter); beggsBrilsPipe.setRunIsothermal(false); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(pipeline); operations.add(simplePipeline); diff --git a/src/test/java/neqsim/processsimulation/processequipment/powergeneration/GasTurbineTest.java b/src/test/java/neqsim/processsimulation/processequipment/powergeneration/GasTurbineTest.java index a8f34de392..424b66a72f 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/powergeneration/GasTurbineTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/powergeneration/GasTurbineTest.java @@ -7,7 +7,8 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.powergeneration.GasTurbine; +import neqsim.process.equipment.stream.Stream; import neqsim.thermo.system.SystemSrkEos; public class GasTurbineTest extends neqsim.NeqSimTest { diff --git a/src/test/java/neqsim/processsimulation/processequipment/pump/PumpChartTest.java b/src/test/java/neqsim/processsimulation/processequipment/pump/PumpChartTest.java index de6b4d7b51..f13fca6924 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/pump/PumpChartTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/pump/PumpChartTest.java @@ -2,6 +2,7 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import neqsim.process.equipment.pump.PumpChart; public class PumpChartTest { @Test diff --git a/src/test/java/neqsim/processsimulation/processequipment/pump/PumpTest.java b/src/test/java/neqsim/processsimulation/processequipment/pump/PumpTest.java index ef11df0683..e362643d72 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/pump/PumpTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/pump/PumpTest.java @@ -2,7 +2,8 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.pump.Pump; +import neqsim.process.equipment.stream.Stream; /** *

diff --git a/src/test/java/neqsim/processsimulation/processequipment/reservoir/SimpleReservoirTest.java b/src/test/java/neqsim/processsimulation/processequipment/reservoir/SimpleReservoirTest.java index 7334b61421..885a62c916 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/reservoir/SimpleReservoirTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/reservoir/SimpleReservoirTest.java @@ -4,7 +4,8 @@ import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.reservoir.SimpleReservoir; +import neqsim.process.equipment.stream.StreamInterface; public class SimpleReservoirTest { static Logger logger = LogManager.getLogger(SimpleReservoirTest.class); diff --git a/src/test/java/neqsim/processsimulation/processequipment/reservoir/WellFlowTest.java b/src/test/java/neqsim/processsimulation/processequipment/reservoir/WellFlowTest.java index 78fb2cbfa6..d30eb6791f 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/reservoir/WellFlowTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/reservoir/WellFlowTest.java @@ -1,11 +1,13 @@ package neqsim.processsimulation.processequipment.reservoir; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.pipeline.PipeBeggsAndBrills; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processequipment.util.Adjuster; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; -import neqsim.processsimulation.processsystem.ProcessSystem; +import neqsim.process.equipment.pipeline.PipeBeggsAndBrills; +import neqsim.process.equipment.reservoir.SimpleReservoir; +import neqsim.process.equipment.reservoir.WellFlow; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.equipment.util.Adjuster; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.processmodel.ProcessSystem; public class WellFlowTest { @Test @@ -56,53 +58,53 @@ void testRunTransientRes2() { double producxtionIndex = 10.000100751427403E-3; - neqsim.processsimulation.processequipment.reservoir.SimpleReservoir reservoirOps = - new neqsim.processsimulation.processequipment.reservoir.SimpleReservoir("Well 1 reservoir"); + neqsim.process.equipment.reservoir.SimpleReservoir reservoirOps = + new neqsim.process.equipment.reservoir.SimpleReservoir("Well 1 reservoir"); reservoirOps.setReservoirFluid(fluid1.clone(), 700000000.0, 1.0, 10.0e7); reservoirOps.setLowPressureLimit(10.0, "bara"); StreamInterface producedGasStream = reservoirOps.addGasProducer("SLP_A32566GI"); producedGasStream.setFlowRate(9.0, "MSm3/day"); - neqsim.processsimulation.processequipment.reservoir.WellFlow wellflow = - new neqsim.processsimulation.processequipment.reservoir.WellFlow("well flow unit"); + neqsim.process.equipment.reservoir.WellFlow wellflow = + new neqsim.process.equipment.reservoir.WellFlow("well flow unit"); wellflow.setInletStream(producedGasStream); wellflow.setWellProductionIndex(producxtionIndex); - neqsim.processsimulation.processequipment.pipeline.PipeBeggsAndBrills pipe = - new neqsim.processsimulation.processequipment.pipeline.PipeBeggsAndBrills("pipe", + neqsim.process.equipment.pipeline.PipeBeggsAndBrills pipe = + new neqsim.process.equipment.pipeline.PipeBeggsAndBrills("pipe", wellflow.getOutletStream()); pipe.setPipeWallRoughness(5e-6); pipe.setLength(170.0); pipe.setElevation(170); pipe.setDiameter(0.625); - neqsim.processsimulation.processequipment.compressor.Compressor compressor = - new neqsim.processsimulation.processequipment.compressor.Compressor("subcomp"); + neqsim.process.equipment.compressor.Compressor compressor = + new neqsim.process.equipment.compressor.Compressor("subcomp"); compressor.setInletStream(pipe.getOutletStream()); compressor.setUsePolytropicCalc(true); compressor.setPolytropicEfficiency(0.6); compressor.setCompressionRatio(2.0); - neqsim.processsimulation.processequipment.heatexchanger.Cooler intercooler = - new neqsim.processsimulation.processequipment.heatexchanger.Cooler("cooler", + neqsim.process.equipment.heatexchanger.Cooler intercooler = + new neqsim.process.equipment.heatexchanger.Cooler("cooler", compressor.getOutletStream()); intercooler.setOutTemperature(25.0, "C"); - neqsim.processsimulation.processequipment.compressor.Compressor compressor2 = - new neqsim.processsimulation.processequipment.compressor.Compressor("subcomp2"); + neqsim.process.equipment.compressor.Compressor compressor2 = + new neqsim.process.equipment.compressor.Compressor("subcomp2"); compressor2.setInletStream(intercooler.getOutletStream()); compressor2.setUsePolytropicCalc(true); compressor2.setPolytropicEfficiency(0.6); compressor2.setCompressionRatio(2.0); - neqsim.processsimulation.processequipment.heatexchanger.Heater cooler1 = - new neqsim.processsimulation.processequipment.heatexchanger.Heater("cooler 1", + neqsim.process.equipment.heatexchanger.Heater cooler1 = + new neqsim.process.equipment.heatexchanger.Heater("cooler 1", compressor2.getOutletStream()); cooler1.setOutTemperature(30.0, "C"); - neqsim.processsimulation.processequipment.pipeline.PipeBeggsAndBrills pipeline = - new neqsim.processsimulation.processequipment.pipeline.PipeBeggsAndBrills("pipeline", + neqsim.process.equipment.pipeline.PipeBeggsAndBrills pipeline = + new neqsim.process.equipment.pipeline.PipeBeggsAndBrills("pipeline", cooler1.getOutletStream()); pipeline.setPipeWallRoughness(50e-6); pipeline.setLength(50 * 1e3); @@ -111,16 +113,16 @@ void testRunTransientRes2() { double richgas_inlet_pressure = 150.0; double max_gas_production = 9.0; - neqsim.processsimulation.processequipment.util.Adjuster adjuster = - new neqsim.processsimulation.processequipment.util.Adjuster("adjuster"); + neqsim.process.equipment.util.Adjuster adjuster = + new neqsim.process.equipment.util.Adjuster("adjuster"); adjuster.setTargetVariable(pipeline.getOutletStream(), "pressure", richgas_inlet_pressure, "bara"); adjuster.setAdjustedVariable(producedGasStream, "flow", "MSm3/day"); adjuster.setMaxAdjustedValue(max_gas_production); adjuster.setMinAdjustedValue(1.0); - neqsim.processsimulation.processsystem.ProcessSystem process = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem process = + new neqsim.process.processmodel.ProcessSystem(); process.add(reservoirOps); process.add(wellflow); process.add(pipe); diff --git a/src/test/java/neqsim/processsimulation/processequipment/separator/SeparatorTest.java b/src/test/java/neqsim/processsimulation/processequipment/separator/SeparatorTest.java index b465c5cee0..a45ff3bf1a 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/separator/SeparatorTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/separator/SeparatorTest.java @@ -3,10 +3,11 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.measurementdevice.LevelTransmitter; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processsystem.ProcessSystem; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.measurementdevice.LevelTransmitter; +import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.system.SystemSrkCPAstatoil; /** diff --git a/src/test/java/neqsim/processsimulation/processequipment/separator/ThreePhaseSeparatorTest.java b/src/test/java/neqsim/processsimulation/processequipment/separator/ThreePhaseSeparatorTest.java index 169c702c1d..da14df8931 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/separator/ThreePhaseSeparatorTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/separator/ThreePhaseSeparatorTest.java @@ -6,9 +6,9 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; - -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.separator.ThreePhaseSeparator; +import neqsim.process.equipment.stream.Stream; import neqsim.thermo.phase.PhaseEosInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; diff --git a/src/test/java/neqsim/processsimulation/processequipment/splitter/ComponentSplitterTest.java b/src/test/java/neqsim/processsimulation/processequipment/splitter/ComponentSplitterTest.java index a718905e55..7ca433f301 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/splitter/ComponentSplitterTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/splitter/ComponentSplitterTest.java @@ -5,13 +5,15 @@ import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; -import neqsim.processsimulation.processsystem.ProcessSystem; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.splitter.ComponentSplitter; +import neqsim.process.equipment.splitter.Splitter; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.system.SystemSrkEos; class ComponentSplitterTest { diff --git a/src/test/java/neqsim/processsimulation/processequipment/stream/StreamTest.java b/src/test/java/neqsim/processsimulation/processequipment/stream/StreamTest.java index 9205f26680..bafcc3fa84 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/stream/StreamTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/stream/StreamTest.java @@ -6,7 +6,8 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processsystem.ProcessSystem; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.system.SystemSrkEos; /** diff --git a/src/test/java/neqsim/processsimulation/processequipment/stream/VirtualStreamTest.java b/src/test/java/neqsim/processsimulation/processequipment/stream/VirtualStreamTest.java index 8cf0b72f09..15fc3817aa 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/stream/VirtualStreamTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/stream/VirtualStreamTest.java @@ -3,7 +3,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processsystem.ProcessSystem; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.VirtualStream; +import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.system.SystemSrkEos; public class VirtualStreamTest { diff --git a/src/test/java/neqsim/processsimulation/processequipment/util/AdjusterTest.java b/src/test/java/neqsim/processsimulation/processequipment/util/AdjusterTest.java index f41701e4c7..7f6624d003 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/util/AdjusterTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/util/AdjusterTest.java @@ -12,14 +12,14 @@ void testRun() { neqsim.thermo.system.SystemInterface fluid1 = neqsim.thermo.FluidCreator.create("light oil"); fluid1.setMixingRule("classic"); - neqsim.processsimulation.processequipment.stream.Stream stream1 = - new neqsim.processsimulation.processequipment.stream.Stream("light oil", fluid1.clone()); + neqsim.process.equipment.stream.Stream stream1 = + new neqsim.process.equipment.stream.Stream("light oil", fluid1.clone()); stream1.setFlowRate(1.5, "MSm3/day"); stream1.setPressure(bottomholepressure, "bara"); stream1.setTemperature(75.0, "C"); - neqsim.processsimulation.processequipment.pipeline.PipeBeggsAndBrills flowline1 = - new neqsim.processsimulation.processequipment.pipeline.PipeBeggsAndBrills("flowline", + neqsim.process.equipment.pipeline.PipeBeggsAndBrills flowline1 = + new neqsim.process.equipment.pipeline.PipeBeggsAndBrills("flowline", stream1); flowline1.setDiameter(0.25); flowline1.setPipeWallRoughness(15e-6); @@ -27,16 +27,16 @@ void testRun() { flowline1.setElevation(1200.0); flowline1.setNumberOfIncrements(20); - neqsim.processsimulation.processequipment.util.Adjuster adjuster = - new neqsim.processsimulation.processequipment.util.Adjuster("adjuster"); + neqsim.process.equipment.util.Adjuster adjuster = + new neqsim.process.equipment.util.Adjuster("adjuster"); adjuster.setTargetVariable(flowline1.getOutletStream(), "pressure", wellheadpressure, "bara"); adjuster.setAdjustedVariable(stream1, "flow", "MSm3/day"); adjuster.setMaxAdjustedValue(10.0); adjuster.setMinAdjustedValue(1); adjuster.setTolerance(1e-5); - neqsim.processsimulation.processsystem.ProcessSystem process = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem process = + new neqsim.process.processmodel.ProcessSystem(); process.add(stream1); process.add(flowline1); process.add(adjuster); @@ -54,14 +54,14 @@ void testRun2() { neqsim.thermo.system.SystemInterface fluid1 = neqsim.thermo.FluidCreator.create("light oil"); fluid1.setMixingRule("classic"); - neqsim.processsimulation.processequipment.stream.Stream stream1 = - new neqsim.processsimulation.processequipment.stream.Stream("light oil", fluid1.clone()); + neqsim.process.equipment.stream.Stream stream1 = + new neqsim.process.equipment.stream.Stream("light oil", fluid1.clone()); stream1.setFlowRate(4.0, "MSm3/day"); stream1.setPressure(170, "bara"); stream1.setTemperature(75.0, "C"); - neqsim.processsimulation.processequipment.pipeline.PipeBeggsAndBrills flowline1 = - new neqsim.processsimulation.processequipment.pipeline.PipeBeggsAndBrills("flowline", + neqsim.process.equipment.pipeline.PipeBeggsAndBrills flowline1 = + new neqsim.process.equipment.pipeline.PipeBeggsAndBrills("flowline", stream1); flowline1.setDiameter(0.25); flowline1.setPipeWallRoughness(15e-6); @@ -69,16 +69,16 @@ void testRun2() { flowline1.setElevation(1200.0); flowline1.setNumberOfIncrements(20); - neqsim.processsimulation.processequipment.util.Adjuster adjuster = - new neqsim.processsimulation.processequipment.util.Adjuster("adjuster"); + neqsim.process.equipment.util.Adjuster adjuster = + new neqsim.process.equipment.util.Adjuster("adjuster"); adjuster.setTargetVariable(flowline1.getOutletStream(), "pressure", wellheadpressure, "bara"); adjuster.setAdjustedVariable(stream1, "pressure", "bara"); adjuster.setMaxAdjustedValue(260.0); adjuster.setMinAdjustedValue(50.1); adjuster.setTolerance(1e-5); - neqsim.processsimulation.processsystem.ProcessSystem process = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem process = + new neqsim.process.processmodel.ProcessSystem(); process.add(stream1); process.add(flowline1); process.add(adjuster); diff --git a/src/test/java/neqsim/processsimulation/processequipment/util/FlowSetterTest.java b/src/test/java/neqsim/processsimulation/processequipment/util/FlowSetterTest.java index b76f835775..e26d8650c6 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/util/FlowSetterTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/util/FlowSetterTest.java @@ -2,10 +2,11 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.measurementdevice.MultiPhaseMeter; -import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.separator.ThreePhaseSeparator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.equipment.util.FlowSetter; +import neqsim.process.measurementdevice.MultiPhaseMeter; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; @@ -40,8 +41,8 @@ void testMain() { flowset.setGasFlowRate(multiPhaseMeter.getMeasuredValue("Gas Flow Rate", "Sm3/hr"), "Sm3/hr"); flowset.setOilFlowRate(multiPhaseMeter.getMeasuredValue("Oil Flow Rate", "m3/hr"), "m3/hr"); flowset.setWaterFlowRate(multiPhaseMeter.getMeasuredValue("Water Flow Rate", "m3/hr"), "m3/hr"); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(multiPhaseMeter); operations.add(flowset); @@ -89,8 +90,8 @@ void testProcessWithFlowSetter() { StreamInterface gasFromSepStream = separator.getGasOutStream(); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(flowset); operations.add(separator); diff --git a/src/test/java/neqsim/processsimulation/processequipment/util/GORfitterTest.java b/src/test/java/neqsim/processsimulation/processequipment/util/GORfitterTest.java index 2a62683dbc..ebbc4580ab 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/util/GORfitterTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/util/GORfitterTest.java @@ -2,8 +2,9 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.measurementdevice.MultiPhaseMeter; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.util.GORfitter; +import neqsim.process.measurementdevice.MultiPhaseMeter; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; @@ -48,8 +49,8 @@ void testMain() { multiPhaseMeter2.setTemperature(90.0, "C"); multiPhaseMeter2.setPressure(60.0, "bara"); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(multiPhaseMeter); operations.add(gORFItter); diff --git a/src/test/java/neqsim/processsimulation/processequipment/util/MPFMfitterTest.java b/src/test/java/neqsim/processsimulation/processequipment/util/MPFMfitterTest.java index 9f19e53327..401363c516 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/util/MPFMfitterTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/util/MPFMfitterTest.java @@ -2,8 +2,9 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.measurementdevice.MultiPhaseMeter; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.util.MPFMfitter; +import neqsim.process.measurementdevice.MultiPhaseMeter; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; @@ -56,8 +57,8 @@ void testRun() { multiPhaseMeter2.setTemperature(90.0, "C"); multiPhaseMeter2.setPressure(60.0, "bara"); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(MPFMfitter); operations.add(stream_2); diff --git a/src/test/java/neqsim/processsimulation/processequipment/util/PressureDropTest.java b/src/test/java/neqsim/processsimulation/processequipment/util/PressureDropTest.java index fba8db02f2..97e1c18d50 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/util/PressureDropTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/util/PressureDropTest.java @@ -2,7 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.util.PressureDrop; import neqsim.thermo.system.SystemSrkEos; public class PressureDropTest { diff --git a/src/test/java/neqsim/processsimulation/processequipment/util/StreamSaturatorUtilTest.java b/src/test/java/neqsim/processsimulation/processequipment/util/StreamSaturatorUtilTest.java index b69e3703bb..947966c4cf 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/util/StreamSaturatorUtilTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/util/StreamSaturatorUtilTest.java @@ -4,8 +4,9 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processsystem.ProcessSystem; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.util.StreamSaturatorUtil; +import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.system.SystemSrkEos; public class StreamSaturatorUtilTest extends neqsim.NeqSimTest { diff --git a/src/test/java/neqsim/processsimulation/processequipment/valve/ThrottlingValveTest.java b/src/test/java/neqsim/processsimulation/processequipment/valve/ThrottlingValveTest.java index 1445dbce85..f4c94a24ce 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/valve/ThrottlingValveTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/valve/ThrottlingValveTest.java @@ -2,7 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.valve.ThrottlingValve; public class ThrottlingValveTest { @Test diff --git a/src/test/java/neqsim/processsimulation/processsystem/CombinedOilGasFieldTest.java b/src/test/java/neqsim/processsimulation/processsystem/CombinedOilGasFieldTest.java index 62b7404b30..48e6a98414 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/CombinedOilGasFieldTest.java +++ b/src/test/java/neqsim/processsimulation/processsystem/CombinedOilGasFieldTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.measurementdevice.MultiPhaseMeter; -import neqsim.processsimulation.processequipment.reservoir.ReservoirTPsim; +import neqsim.process.equipment.reservoir.ReservoirTPsim; +import neqsim.process.measurementdevice.MultiPhaseMeter; public class CombinedOilGasFieldTest { @Test @@ -75,8 +75,8 @@ public void testreservoirTPsim() { // MPFMoil.setTemperature(60.0, "C"); // MPFMoil.setPressure(20.0, "bara"); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(reservoirGasTPsim); operations.add(MPFMgas); operations.run(); diff --git a/src/test/java/neqsim/processsimulation/processsystem/CompressorModule.java b/src/test/java/neqsim/processsimulation/processsystem/CompressorModule.java index a39e91a819..2509fb3867 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/CompressorModule.java +++ b/src/test/java/neqsim/processsimulation/processsystem/CompressorModule.java @@ -3,17 +3,17 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.heatexchanger.Cooler; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator; -import neqsim.processsimulation.processequipment.splitter.Splitter; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.heatexchanger.Cooler; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.separator.ThreePhaseSeparator; +import neqsim.process.equipment.splitter.Splitter; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.equipment.valve.ThrottlingValve; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; @@ -113,8 +113,8 @@ public void testProcess() { recycle1.addStream(scrubber1.getLiquidOutStream()); recycle1.setOutletStream(recycleScrubberStream); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(feedStream); operations.add(inletSeparator); operations.add(oilHeater); @@ -136,8 +136,8 @@ public void testProcess() { assertEquals(2042.17826, recycleScrubberStream.getFlowRate("kg/hr"), 0.1); - neqsim.processsimulation.processequipment.compressor.CompressorChartGenerator compchartgenerator = - new neqsim.processsimulation.processequipment.compressor.CompressorChartGenerator( + neqsim.process.equipment.compressor.CompressorChartGenerator compchartgenerator = + new neqsim.process.equipment.compressor.CompressorChartGenerator( seccondStageCompressor); compchartgenerator.generateCompressorChart("mid range"); diff --git a/src/test/java/neqsim/processsimulation/processsystem/GlycolModulesTest.java b/src/test/java/neqsim/processsimulation/processsystem/GlycolModulesTest.java index eff2fe10a3..027dda98fa 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/GlycolModulesTest.java +++ b/src/test/java/neqsim/processsimulation/processsystem/GlycolModulesTest.java @@ -1,22 +1,22 @@ package neqsim.processsimulation.processsystem; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.measurementdevice.HydrateEquilibriumTemperatureAnalyser; -import neqsim.processsimulation.measurementdevice.WaterDewPointAnalyser; -import neqsim.processsimulation.processequipment.absorber.SimpleTEGAbsorber; -import neqsim.processsimulation.processequipment.absorber.WaterStripperColumn; -import neqsim.processsimulation.processequipment.distillation.DistillationColumn; -import neqsim.processsimulation.processequipment.filter.Filter; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.StaticMixer; -import neqsim.processsimulation.processequipment.pump.Pump; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.splitter.Splitter; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.util.Calculator; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processequipment.util.StreamSaturatorUtil; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.absorber.SimpleTEGAbsorber; +import neqsim.process.equipment.absorber.WaterStripperColumn; +import neqsim.process.equipment.distillation.DistillationColumn; +import neqsim.process.equipment.filter.Filter; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.StaticMixer; +import neqsim.process.equipment.pump.Pump; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.splitter.Splitter; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.util.Calculator; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.equipment.util.StreamSaturatorUtil; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.measurementdevice.HydrateEquilibriumTemperatureAnalyser; +import neqsim.process.measurementdevice.WaterDewPointAnalyser; import neqsim.thermo.phase.PhaseEosInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -301,8 +301,8 @@ public void runProcessTEG() throws InterruptedException { recycleLeanTEG.setPriority(200); recycleLeanTEG.setDownstreamProperty("flow rate"); - neqsim.processsimulation.processsystem.ProcessSystem operations1 = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations1 = + new neqsim.process.processmodel.ProcessSystem(); operations1.add(dryFeedGasSmøbukk); operations1.add(saturatedFeedGasSmøbukk); operations1.add(waterSaturatedFeedGasSmøbukk); @@ -318,8 +318,8 @@ public void runProcessTEG() throws InterruptedException { operations1.add(hydrateTAnalyser2); operations1.add(waterDewPointAnalyserToAbsorber); - neqsim.processsimulation.processsystem.ProcessSystem operations2 = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations2 = + new neqsim.process.processmodel.ProcessSystem(); // Rec module TEG operations2.add(TEGFeed); operations2.add(feedToAbsorber); @@ -336,8 +336,8 @@ public void runProcessTEG() throws InterruptedException { operations2.add(heatEx); operations2.add(strippingGas); - neqsim.processsimulation.processsystem.ProcessSystem operations3 = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations3 = + new neqsim.process.processmodel.ProcessSystem(); // Rec module gas to rebo,0 operations3.add(gasToReboiler); operations3.add(glycol_flash_valve2); @@ -352,8 +352,8 @@ public void runProcessTEG() throws InterruptedException { operations3.add(recycleFlareGas); // Finish Rec Stripping gas - neqsim.processsimulation.processsystem.ProcessSystem operations4 = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations4 = + new neqsim.process.processmodel.ProcessSystem(); operations4.add(liquidToTreatment); operations4.add(makeupTEG); operations4.add(makeupCalculator); @@ -363,34 +363,34 @@ public void runProcessTEG() throws InterruptedException { operations4.add(leanTEGtoabs); operations4.add(recycleLeanTEG); - neqsim.processsimulation.processsystem.ProcessSystem operations5 = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations5 = + new neqsim.process.processmodel.ProcessSystem(); // Finish Rec Lean TEG l operations5.add(dehydratedGas); operations5.add(waterDewPointAnalyser); operations5.add(waterDewPointAnalyser2); - neqsim.processsimulation.processsystem.ProcessModule module1 = - new neqsim.processsimulation.processsystem.ProcessModule("Start process"); + neqsim.process.processmodel.ProcessModule module1 = + new neqsim.process.processmodel.ProcessModule("Start process"); module1.add(operations1); module1.add(operations2); - neqsim.processsimulation.processsystem.ProcessModule module2 = - new neqsim.processsimulation.processsystem.ProcessModule("Column recycle"); + neqsim.process.processmodel.ProcessModule module2 = + new neqsim.process.processmodel.ProcessModule("Column recycle"); module2.add(operations3); - neqsim.processsimulation.processsystem.ProcessModule module3 = - new neqsim.processsimulation.processsystem.ProcessModule("TEG recycle"); + neqsim.process.processmodel.ProcessModule module3 = + new neqsim.process.processmodel.ProcessModule("TEG recycle"); module3.add(operations2); module3.add(module2); module3.add(operations4); - neqsim.processsimulation.processsystem.ProcessModule module4 = - new neqsim.processsimulation.processsystem.ProcessModule("Finish Process"); + neqsim.process.processmodel.ProcessModule module4 = + new neqsim.process.processmodel.ProcessModule("Finish Process"); module4.add(operations5); - neqsim.processsimulation.processsystem.ProcessModule modules = - new neqsim.processsimulation.processsystem.ProcessModule("Modules wrapper"); + neqsim.process.processmodel.ProcessModule modules = + new neqsim.process.processmodel.ProcessModule("Modules wrapper"); modules.add(module1); modules.add(module2); modules.add(module3); diff --git a/src/test/java/neqsim/processsimulation/processsystem/GlycolRigTest.java b/src/test/java/neqsim/processsimulation/processsystem/GlycolRigTest.java index fb2deb2f0e..439fb59766 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/GlycolRigTest.java +++ b/src/test/java/neqsim/processsimulation/processsystem/GlycolRigTest.java @@ -5,14 +5,15 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.absorber.WaterStripperColumn; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.distillation.DistillationColumn; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.util.Recycle; +import neqsim.process.equipment.absorber.WaterStripperColumn; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.distillation.DistillationColumn; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.ThermodynamicConstantsInterface; /** @@ -102,8 +103,8 @@ public void runTEGProcessTest() { TEGWaterMixer.addStream(coolerStripper.getOutletStream()); TEGWaterMixer.addStream(liquidToTreatment); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(TEGtoRegenerator); operations.add(strippingGas); operations.add(gasToReboiler); @@ -198,8 +199,8 @@ public void runDistillationProcessTest() { column.setTopPressure(1.0 + ThermodynamicConstantsInterface.referencePressure); column.setBottomPressure(1.0 + ThermodynamicConstantsInterface.referencePressure); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(feedToRegenerator); operations.add(column); @@ -245,8 +246,8 @@ public void runDistillationProcessTest2() { column.setTopPressure(1.0 + 5.01325); column.setBottomPressure(1.0 + 5.01325); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(feedToRegenerator); operations.add(column); @@ -295,8 +296,8 @@ public void runDistillationProcessTest3() { column.addFeedStream(feedToRegenerator2, 0); column.addFeedStream(feedToRegenerator, 1); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(feedToRegenerator); operations.add(feedToRegenerator2); operations.add(column); diff --git a/src/test/java/neqsim/processsimulation/processsystem/MLA_bug_test.java b/src/test/java/neqsim/processsimulation/processsystem/MLA_bug_test.java index 816a23a8e8..8099763e69 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/MLA_bug_test.java +++ b/src/test/java/neqsim/processsimulation/processsystem/MLA_bug_test.java @@ -4,22 +4,23 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.measurementdevice.WaterDewPointAnalyser; -import neqsim.processsimulation.processequipment.absorber.SimpleTEGAbsorber; -import neqsim.processsimulation.processequipment.absorber.WaterStripperColumn; -import neqsim.processsimulation.processequipment.distillation.DistillationColumn; -import neqsim.processsimulation.processequipment.filter.Filter; -import neqsim.processsimulation.processequipment.heatexchanger.HeatExchanger; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.pump.Pump; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processequipment.util.Calculator; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processequipment.util.StreamSaturatorUtil; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.absorber.SimpleTEGAbsorber; +import neqsim.process.equipment.absorber.WaterStripperColumn; +import neqsim.process.equipment.distillation.DistillationColumn; +import neqsim.process.equipment.filter.Filter; +import neqsim.process.equipment.heatexchanger.HeatExchanger; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.pump.Pump; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.equipment.util.Calculator; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.equipment.util.StreamSaturatorUtil; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.measurementdevice.WaterDewPointAnalyser; +import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPA; import neqsim.thermo.util.empiric.BukacekWaterInGas; diff --git a/src/test/java/neqsim/processsimulation/processsystem/OilGasProcessTest.java b/src/test/java/neqsim/processsimulation/processsystem/OilGasProcessTest.java index 946479700d..6de2aa2eee 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/OilGasProcessTest.java +++ b/src/test/java/neqsim/processsimulation/processsystem/OilGasProcessTest.java @@ -2,18 +2,18 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.heatexchanger.Cooler; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.pump.Pump; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.splitter.Splitter; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processequipment.util.Calculator; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.heatexchanger.Cooler; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.pump.Pump; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.splitter.Splitter; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.equipment.util.Calculator; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.equipment.valve.ThrottlingValve; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; @@ -57,8 +57,8 @@ public void runProcess() throws InterruptedException { feedStream.setTemperature(25.5, "C"); feedStream.setPressure(26.0, "bara"); - neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator seprator1stStage = - new neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator( + neqsim.process.equipment.separator.ThreePhaseSeparator seprator1stStage = + new neqsim.process.equipment.separator.ThreePhaseSeparator( "1st stage separator", feedStream); ThrottlingValve valve1 = new ThrottlingValve("valve1", seprator1stStage.getLiquidOutStream()); @@ -67,8 +67,8 @@ public void runProcess() throws InterruptedException { Heater oilHeater = new Heater("oil heater", valve1.getOutletStream()); oilHeater.setOutTemperature(359.0); - neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator seprator2ndStage = - new neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator( + neqsim.process.equipment.separator.ThreePhaseSeparator seprator2ndStage = + new neqsim.process.equipment.separator.ThreePhaseSeparator( "2nd stage separator", oilHeater.getOutletStream()); ThrottlingValve valve2 = new ThrottlingValve("valve2", seprator2ndStage.getLiquidOutStream()); @@ -77,8 +77,8 @@ public void runProcess() throws InterruptedException { StreamInterface recircstream1 = valve2.getOutletStream().clone("oilRecirc1"); recircstream1.setFlowRate(1e-6, "kg/hr"); - neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator seprator3rdStage = - new neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator( + neqsim.process.equipment.separator.ThreePhaseSeparator seprator3rdStage = + new neqsim.process.equipment.separator.ThreePhaseSeparator( "3rd stage separator"); seprator3rdStage.addStream(valve2.getOutletStream()); seprator3rdStage.addStream(recircstream1); @@ -102,8 +102,8 @@ public void runProcess() throws InterruptedException { recycle1.addStream(valveLP1.getOutletStream()); recycle1.setOutletStream(recircstream1); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(feedStream); operations.add(seprator1stStage); operations.add(valve1); @@ -161,8 +161,8 @@ public void runAntiSurgeProcess() throws InterruptedException { gascompressor.run(); double fluidh = gascompressor.getPolytropicFluidHead(); - neqsim.processsimulation.processequipment.compressor.CompressorChartGenerator compchartgenerator = - new neqsim.processsimulation.processequipment.compressor.CompressorChartGenerator( + neqsim.process.equipment.compressor.CompressorChartGenerator compchartgenerator = + new neqsim.process.equipment.compressor.CompressorChartGenerator( gascompressor); gascompressor.setCompressorChart(compchartgenerator.generateCompressorChart("mid range")); @@ -194,8 +194,8 @@ public void runAntiSurgeProcess() throws InterruptedException { antisurgeCalculator.addInputVariable(gascompressor); antisurgeCalculator.setOutputVariable(gassplitter); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(gas_from_separator); operations.add(recyclegasstream); operations.add(gasmixer); @@ -297,8 +297,8 @@ public void runAntiSurgeProcess2() throws InterruptedException { recycl.setOutletStream(recyclegasstream); recycl.setFlowTolerance(1e-2); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(gas_from_separator); operations.add(recyclegasstream); operations.add(gasmixer); @@ -314,8 +314,8 @@ public void runAntiSurgeProcess2() throws InterruptedException { double fluidh = gascompressor.getPolytropicFluidHead(); double flowratetocompressor = gascompressor.getInletStream().getFlowRate("MSm3/day"); - neqsim.processsimulation.processequipment.compressor.CompressorChartGenerator compchartgenerator = - new neqsim.processsimulation.processequipment.compressor.CompressorChartGenerator( + neqsim.process.equipment.compressor.CompressorChartGenerator compchartgenerator = + new neqsim.process.equipment.compressor.CompressorChartGenerator( gascompressor); gascompressor.setCompressorChart(compchartgenerator.generateCompressorChart("mid range")); gascompressor.setOutletPressure(90.0); diff --git a/src/test/java/neqsim/processsimulation/processsystem/OilProcessTest.java b/src/test/java/neqsim/processsimulation/processsystem/OilProcessTest.java index 366bb29092..f3c63ae65f 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/OilProcessTest.java +++ b/src/test/java/neqsim/processsimulation/processsystem/OilProcessTest.java @@ -3,6 +3,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.BeforeEach; +import neqsim.process.processmodel.ProcessSystem; /** * Test class for GlycolRig. diff --git a/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemControllerTest.java b/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemControllerTest.java index 8d88be03f3..12a86affe6 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemControllerTest.java +++ b/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemControllerTest.java @@ -5,12 +5,13 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.controllerdevice.ControllerDeviceBaseClass; -import neqsim.processsimulation.controllerdevice.ControllerDeviceInterface; -import neqsim.processsimulation.measurementdevice.VolumeFlowTransmitter; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.controllerdevice.ControllerDeviceBaseClass; +import neqsim.process.controllerdevice.ControllerDeviceInterface; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.measurementdevice.VolumeFlowTransmitter; +import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.system.SystemInterface; public class ProcessSystemControllerTest extends neqsim.NeqSimTest { diff --git a/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemRunTransientTest.java b/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemRunTransientTest.java index f7ec65b5f6..a253ca6ccb 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemRunTransientTest.java +++ b/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemRunTransientTest.java @@ -4,21 +4,22 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.SimulationInterface; -import neqsim.processsimulation.controllerdevice.ControllerDeviceBaseClass; -import neqsim.processsimulation.controllerdevice.ControllerDeviceInterface; -import neqsim.processsimulation.measurementdevice.CompressorMonitor; -import neqsim.processsimulation.measurementdevice.LevelTransmitter; -import neqsim.processsimulation.measurementdevice.PressureTransmitter; -import neqsim.processsimulation.measurementdevice.VolumeFlowTransmitter; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.heatexchanger.Cooler; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.splitter.Splitter; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processequipment.util.SetPoint; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.SimulationInterface; +import neqsim.process.controllerdevice.ControllerDeviceBaseClass; +import neqsim.process.controllerdevice.ControllerDeviceInterface; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.heatexchanger.Cooler; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.splitter.Splitter; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.equipment.util.SetPoint; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.measurementdevice.CompressorMonitor; +import neqsim.process.measurementdevice.LevelTransmitter; +import neqsim.process.measurementdevice.PressureTransmitter; +import neqsim.process.measurementdevice.VolumeFlowTransmitter; +import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.system.SystemInterface; public class ProcessSystemRunTransientTest extends neqsim.NeqSimTest { @@ -289,8 +290,8 @@ public void testDynamicCompressor() { */ assertEquals(100.0, compressor1.getOutletStream().getPressure(), 0.01); - neqsim.processsimulation.processequipment.compressor.CompressorChartGenerator compchartgenerator = - new neqsim.processsimulation.processequipment.compressor.CompressorChartGenerator( + neqsim.process.equipment.compressor.CompressorChartGenerator compchartgenerator = + new neqsim.process.equipment.compressor.CompressorChartGenerator( compressor1); compressor1.setCompressorChart(compchartgenerator.generateCompressorChart("normal")); compressor1.getCompressorChart().setUseCompressorChart(true); @@ -394,8 +395,8 @@ public void testDynamicCompressor22() { assertEquals(100.0, compressor1.getOutletStream().getPressure(), 0.01); // System.out.println("steady state with compressor curves....."); - neqsim.processsimulation.processequipment.compressor.CompressorChartGenerator compchartgenerator = - new neqsim.processsimulation.processequipment.compressor.CompressorChartGenerator( + neqsim.process.equipment.compressor.CompressorChartGenerator compchartgenerator = + new neqsim.process.equipment.compressor.CompressorChartGenerator( compressor1); compressor1.setCompressorChart(compchartgenerator.generateCompressorChart("normal")); compressor1.getCompressorChart().setUseCompressorChart(true); @@ -508,8 +509,8 @@ public void testDynamicCompressorSpeedControl() { */ assertEquals(100.0, compressor1.getOutletStream().getPressure(), 0.01); - neqsim.processsimulation.processequipment.compressor.CompressorChartGenerator compchartgenerator = - new neqsim.processsimulation.processequipment.compressor.CompressorChartGenerator( + neqsim.process.equipment.compressor.CompressorChartGenerator compchartgenerator = + new neqsim.process.equipment.compressor.CompressorChartGenerator( compressor1); compressor1.setCompressorChart(compchartgenerator.generateCompressorChart("normal")); compressor1.getCompressorChart().setUseCompressorChart(true); @@ -676,8 +677,8 @@ public void testAntiSurgeControl() { * " pres inn " + compressor1.getInletStream().getPressure() + " pres out " + * compressor1.getOutletStream().getPressure() + " distancetosurge "); */ - neqsim.processsimulation.processequipment.compressor.CompressorChartGenerator compchartgenerator = - new neqsim.processsimulation.processequipment.compressor.CompressorChartGenerator( + neqsim.process.equipment.compressor.CompressorChartGenerator compchartgenerator = + new neqsim.process.equipment.compressor.CompressorChartGenerator( compressor1); compressor1.setCompressorChart(compchartgenerator.generateCompressorChart("normal")); compressor1.getCompressorChart().setUseCompressorChart(true); diff --git a/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemSerializationTest.java b/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemSerializationTest.java index 68861499c5..dcbf60d2dc 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemSerializationTest.java +++ b/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemSerializationTest.java @@ -3,23 +3,23 @@ import org.junit.jupiter.api.Test; import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.security.AnyTypePermission; -import neqsim.processsimulation.measurementdevice.HydrateEquilibriumTemperatureAnalyser; -import neqsim.processsimulation.measurementdevice.WaterDewPointAnalyser; -import neqsim.processsimulation.processequipment.absorber.SimpleTEGAbsorber; -import neqsim.processsimulation.processequipment.absorber.WaterStripperColumn; -import neqsim.processsimulation.processequipment.distillation.DistillationColumn; -import neqsim.processsimulation.processequipment.filter.Filter; -import neqsim.processsimulation.processequipment.heatexchanger.HeatExchanger; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.StaticMixer; -import neqsim.processsimulation.processequipment.pump.Pump; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.splitter.Splitter; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.util.Calculator; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processequipment.util.StreamSaturatorUtil; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.absorber.SimpleTEGAbsorber; +import neqsim.process.equipment.absorber.WaterStripperColumn; +import neqsim.process.equipment.distillation.DistillationColumn; +import neqsim.process.equipment.filter.Filter; +import neqsim.process.equipment.heatexchanger.HeatExchanger; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.StaticMixer; +import neqsim.process.equipment.pump.Pump; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.splitter.Splitter; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.util.Calculator; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.equipment.util.StreamSaturatorUtil; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.measurementdevice.HydrateEquilibriumTemperatureAnalyser; +import neqsim.process.measurementdevice.WaterDewPointAnalyser; public class ProcessSystemSerializationTest extends neqsim.NeqSimTest { @Test @@ -261,8 +261,8 @@ public void runTEGProcessTest2() { recycleLeanTEG.setPriority(200); recycleLeanTEG.setDownstreamProperty("flow rate"); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(dryFeedGasSmorbukk); operations.add(saturatedFeedGasSmorbukk); operations.add(waterSaturatedFeedGasSmorbukk); @@ -332,8 +332,8 @@ public void runTEGProcessTest2() { xstream.addPermission(AnyTypePermission.ANY); // Deserialize from xml - neqsim.processsimulation.processsystem.ProcessSystem operationsCopy = - (neqsim.processsimulation.processsystem.ProcessSystem) xstream.fromXML(xml); + neqsim.process.processmodel.ProcessSystem operationsCopy = + (neqsim.process.processmodel.ProcessSystem) xstream.fromXML(xml); operationsCopy.run(); } } diff --git a/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemTest.java b/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemTest.java index 2a18b57843..8016f3c8a4 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemTest.java +++ b/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemTest.java @@ -5,25 +5,26 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.measurementdevice.HydrateEquilibriumTemperatureAnalyser; -import neqsim.processsimulation.measurementdevice.WaterDewPointAnalyser; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.absorber.SimpleTEGAbsorber; -import neqsim.processsimulation.processequipment.absorber.WaterStripperColumn; -import neqsim.processsimulation.processequipment.distillation.DistillationColumn; -import neqsim.processsimulation.processequipment.filter.Filter; -import neqsim.processsimulation.processequipment.heatexchanger.HeatExchanger; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.StaticMixer; -import neqsim.processsimulation.processequipment.pump.Pump; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.splitter.Splitter; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.tank.Tank; -import neqsim.processsimulation.processequipment.util.Calculator; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processequipment.util.StreamSaturatorUtil; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.absorber.SimpleTEGAbsorber; +import neqsim.process.equipment.absorber.WaterStripperColumn; +import neqsim.process.equipment.distillation.DistillationColumn; +import neqsim.process.equipment.filter.Filter; +import neqsim.process.equipment.heatexchanger.HeatExchanger; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.StaticMixer; +import neqsim.process.equipment.pump.Pump; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.splitter.Splitter; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.tank.Tank; +import neqsim.process.equipment.util.Calculator; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.equipment.util.StreamSaturatorUtil; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.measurementdevice.HydrateEquilibriumTemperatureAnalyser; +import neqsim.process.measurementdevice.WaterDewPointAnalyser; +import neqsim.process.processmodel.ProcessSystem; /** * Class for testing ProcessSystem class. @@ -509,8 +510,8 @@ public void runTEGProcessTest2() { recycleLeanTEG.setPriority(200); recycleLeanTEG.setDownstreamProperty("flow rate"); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(dryFeedGasSmorbukk); operations.add(saturatedFeedGasSmorbukk); operations.add(waterSaturatedFeedGasSmorbukk); @@ -827,8 +828,8 @@ public void testRun_step() { recycleLeanTEG.setPriority(200); recycleLeanTEG.setDownstreamProperty("flow rate"); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(dryFeedGasSmorbukk); operations.add(saturatedFeedGasSmorbukk); operations.add(waterSaturatedFeedGasSmorbukk); diff --git a/src/test/java/neqsim/processsimulation/processsystem/ReferenceProcessTest.java b/src/test/java/neqsim/processsimulation/processsystem/ReferenceProcessTest.java index 7c9fa48bd1..f80a98d82c 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/ReferenceProcessTest.java +++ b/src/test/java/neqsim/processsimulation/processsystem/ReferenceProcessTest.java @@ -40,62 +40,62 @@ public void testProcess() { 0.007751, 0.014665, 0.004249, 0.004878, 0.004541, 0.007189, 0.006904, 0.004355, 0.007658, 0.003861, 0.003301, 0.002624, 0.001857, 0.001320, 0.001426, 0.001164, 0.000916}); - neqsim.processsimulation.processequipment.stream.Stream wellStream = - new neqsim.processsimulation.processequipment.stream.Stream("well stream", thermoSystem); + neqsim.process.equipment.stream.Stream wellStream = + new neqsim.process.equipment.stream.Stream("well stream", thermoSystem); wellStream.setTemperature(70.0, "C"); wellStream.setPressure(90.0, "bara"); - neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator firstStageSeparator = - new neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator( + neqsim.process.equipment.separator.ThreePhaseSeparator firstStageSeparator = + new neqsim.process.equipment.separator.ThreePhaseSeparator( "1st stage separator", wellStream); - neqsim.processsimulation.processequipment.heatexchanger.Heater oilHeaterSecondStage = - new neqsim.processsimulation.processequipment.heatexchanger.Heater( + neqsim.process.equipment.heatexchanger.Heater oilHeaterSecondStage = + new neqsim.process.equipment.heatexchanger.Heater( "oil heater second stage", firstStageSeparator.getOilOutStream()); oilHeaterSecondStage.setOutPressure(30.0); oilHeaterSecondStage.setOutTemperature(68.0, "C"); - neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator secondStageSeparator = - new neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator( + neqsim.process.equipment.separator.ThreePhaseSeparator secondStageSeparator = + new neqsim.process.equipment.separator.ThreePhaseSeparator( "2nd stage separator", oilHeaterSecondStage.getOutletStream()); - neqsim.processsimulation.processequipment.heatexchanger.Heater oilHeaterThirdStage = - new neqsim.processsimulation.processequipment.heatexchanger.Heater("oil heater third stage", + neqsim.process.equipment.heatexchanger.Heater oilHeaterThirdStage = + new neqsim.process.equipment.heatexchanger.Heater("oil heater third stage", secondStageSeparator.getOilOutStream()); oilHeaterThirdStage.setOutPressure(2.8); oilHeaterThirdStage.setOutTemperature(70.0, "C"); - neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator thirdStageSeparator = - new neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator( + neqsim.process.equipment.separator.ThreePhaseSeparator thirdStageSeparator = + new neqsim.process.equipment.separator.ThreePhaseSeparator( "3rd stage separator", oilHeaterThirdStage.getOutletStream()); - neqsim.processsimulation.processequipment.heatexchanger.Heater oilHeaterStandardStage = - new neqsim.processsimulation.processequipment.heatexchanger.Heater( + neqsim.process.equipment.heatexchanger.Heater oilHeaterStandardStage = + new neqsim.process.equipment.heatexchanger.Heater( "oil heater standard stage", thirdStageSeparator.getOilOutStream()); oilHeaterStandardStage.setOutPressure(1.01325); oilHeaterStandardStage.setOutTemperature(15.0, "C"); - neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator standardStageSeparator = - new neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator( + neqsim.process.equipment.separator.ThreePhaseSeparator standardStageSeparator = + new neqsim.process.equipment.separator.ThreePhaseSeparator( "standard stage separator", oilHeaterStandardStage.getOutletStream()); - neqsim.processsimulation.processequipment.mixer.Mixer gasMixer = - new neqsim.processsimulation.processequipment.mixer.Mixer("gas mixer"); + neqsim.process.equipment.mixer.Mixer gasMixer = + new neqsim.process.equipment.mixer.Mixer("gas mixer"); gasMixer.addStream(firstStageSeparator.getGasOutStream()); gasMixer.addStream(secondStageSeparator.getGasOutStream()); gasMixer.addStream(thirdStageSeparator.getGasOutStream()); gasMixer.addStream(standardStageSeparator.getGasOutStream()); gasMixer.setOutTemperature(288.15); - neqsim.processsimulation.processequipment.stream.Stream exportoil = - new neqsim.processsimulation.processequipment.stream.Stream("export oil", + neqsim.process.equipment.stream.Stream exportoil = + new neqsim.process.equipment.stream.Stream("export oil", standardStageSeparator.getOilOutStream()); - neqsim.processsimulation.processequipment.stream.Stream exportgas = - new neqsim.processsimulation.processequipment.stream.Stream("export gas", + neqsim.process.equipment.stream.Stream exportgas = + new neqsim.process.equipment.stream.Stream("export gas", gasMixer.getOutletStream()); - neqsim.processsimulation.processsystem.ProcessSystem oilprocess = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem oilprocess = + new neqsim.process.processmodel.ProcessSystem(); oilprocess.add(wellStream); oilprocess.add(firstStageSeparator); oilprocess.add(oilHeaterSecondStage); diff --git a/src/test/java/neqsim/processsimulation/processsystem/waterDegasserTest.java b/src/test/java/neqsim/processsimulation/processsystem/waterDegasserTest.java index 29dab6e12d..eacc3d9f21 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/waterDegasserTest.java +++ b/src/test/java/neqsim/processsimulation/processsystem/waterDegasserTest.java @@ -50,35 +50,35 @@ public void runProcess() throws InterruptedException { fluid1.setMultiPhaseCheck(true); fluid1.init(0); - neqsim.processsimulation.processequipment.stream.Stream inlet_stream_VA_01 = - new neqsim.processsimulation.processequipment.stream.Stream("INLET_STREAM_1ST_SEPARATOR", + neqsim.process.equipment.stream.Stream inlet_stream_VA_01 = + new neqsim.process.equipment.stream.Stream("INLET_STREAM_1ST_SEPARATOR", fluid1); inlet_stream_VA_01.setTemperature(79.36872863769531, "C"); inlet_stream_VA_01.setPressure(66.97672112018574, "bara"); inlet_stream_VA_01.setFlowRate(273050.4311185292, "kg/hr"); - neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator separator_VA_01 = - new neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator( + neqsim.process.equipment.separator.ThreePhaseSeparator separator_VA_01 = + new neqsim.process.equipment.separator.ThreePhaseSeparator( "FIRST_SEPARATOR", inlet_stream_VA_01); - neqsim.processsimulation.processequipment.heatexchanger.Heater TP_setter_hydrocyclone = - new neqsim.processsimulation.processequipment.heatexchanger.Heater( + neqsim.process.equipment.heatexchanger.Heater TP_setter_hydrocyclone = + new neqsim.process.equipment.heatexchanger.Heater( "TP_SETTER_HYDROCYCLONE_AFTER_1ST_SEPARATOR", separator_VA_01.getWaterOutStream()); TP_setter_hydrocyclone.setOutPressure(30.047772073489377, "bara"); - neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator hydrocyclone_main = - new neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator( + neqsim.process.equipment.separator.ThreePhaseSeparator hydrocyclone_main = + new neqsim.process.equipment.separator.ThreePhaseSeparator( "HYDROCYCLONE_AFTER_THE_1ST_SEPARATOR", TP_setter_hydrocyclone.getOutletStream()); // hydrocyclone_main.setEntrainment(0.0, "mole", "feed", "aqueous", "gas"); - neqsim.processsimulation.processequipment.heatexchanger.Heater heater_TP_setter_main_stream = - new neqsim.processsimulation.processequipment.heatexchanger.Heater( + neqsim.process.equipment.heatexchanger.Heater heater_TP_setter_main_stream = + new neqsim.process.equipment.heatexchanger.Heater( "TP_SETTER_FOR_THE_DEGASSER_MAIN_STREAM", hydrocyclone_main.getWaterOutStream()); heater_TP_setter_main_stream.setOutPressure(4.076956398010254, "bara"); heater_TP_setter_main_stream.setOutTemperature(76.51406860351562, "C"); - neqsim.processsimulation.processsystem.ProcessSystem process = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem process = + new neqsim.process.processmodel.ProcessSystem(); process.add(inlet_stream_VA_01); process.add(separator_VA_01); process.add(TP_setter_hydrocyclone); @@ -137,27 +137,27 @@ public void runProcess2() throws InterruptedException { fluid1.setMultiPhaseCheck(true); fluid1.init(0); - neqsim.processsimulation.processequipment.stream.Stream inlet_stream_VA_01 = - new neqsim.processsimulation.processequipment.stream.Stream("INLET_STREAM_1ST_SEPARATOR", + neqsim.process.equipment.stream.Stream inlet_stream_VA_01 = + new neqsim.process.equipment.stream.Stream("INLET_STREAM_1ST_SEPARATOR", fluid1); inlet_stream_VA_01.setTemperature(79.21922658197582, "C"); inlet_stream_VA_01.setPressure(62.3388000793457, "bara"); inlet_stream_VA_01.setFlowRate(450261.1588574318, "kg/hr"); inlet_stream_VA_01.run(); - neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator separator_VA_01 = - new neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator( + neqsim.process.equipment.separator.ThreePhaseSeparator separator_VA_01 = + new neqsim.process.equipment.separator.ThreePhaseSeparator( "FIRST_SEPARATOR", inlet_stream_VA_01); separator_VA_01.run(); - neqsim.processsimulation.processequipment.heatexchanger.Heater TP_setter_hydrocyclone = - new neqsim.processsimulation.processequipment.heatexchanger.Heater( + neqsim.process.equipment.heatexchanger.Heater TP_setter_hydrocyclone = + new neqsim.process.equipment.heatexchanger.Heater( "TP_SETTER_HYDROCYCLONE_AFTER_1ST_SEPARATOR", separator_VA_01.getWaterOutStream()); TP_setter_hydrocyclone.setOutPressure(61.0700675688386, "bara"); TP_setter_hydrocyclone.run(); - neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator hydrocyclone_main = - (new neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator( + neqsim.process.equipment.separator.ThreePhaseSeparator hydrocyclone_main = + (new neqsim.process.equipment.separator.ThreePhaseSeparator( "HYDROCYCLONE_AFTER_THE_1ST_SEPARATOR", TP_setter_hydrocyclone.getOutletStream())); hydrocyclone_main.setEntrainment(0.01, "mole", "feed", "aqueous", "gas"); hydrocyclone_main.run(); diff --git a/src/test/java/neqsim/processsimulation/util/example/LNGfilling.java b/src/test/java/neqsim/processsimulation/util/example/LNGfilling.java index b941935a17..c5f5ce3cf1 100644 --- a/src/test/java/neqsim/processsimulation/util/example/LNGfilling.java +++ b/src/test/java/neqsim/processsimulation/util/example/LNGfilling.java @@ -6,8 +6,8 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.stream.Stream; /** *

@@ -44,12 +44,12 @@ public static void main(String args[]) { Stream stream_1 = new Stream("Methane Stream", testSystem); Stream stream_2 = new Stream("Nitrogen Stream", testSystem2); - Mixer mixer = new neqsim.processsimulation.processequipment.mixer.StaticMixer("LNG Tank Mix"); + Mixer mixer = new neqsim.process.equipment.mixer.StaticMixer("LNG Tank Mix"); mixer.addStream(stream_1); mixer.addStream(stream_2); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(stream_2); operations.add(mixer); diff --git a/src/test/java/neqsim/processsimulation/util/example/LNGfilling2.java b/src/test/java/neqsim/processsimulation/util/example/LNGfilling2.java index b3dd4c39ab..4900c94882 100644 --- a/src/test/java/neqsim/processsimulation/util/example/LNGfilling2.java +++ b/src/test/java/neqsim/processsimulation/util/example/LNGfilling2.java @@ -1,8 +1,8 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processequipment.tank.Tank; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.equipment.tank.Tank; /** *

LNGfilling2 class.

@@ -37,13 +37,13 @@ public static void main(String args[]) { Stream stream_1 = new Stream("Methane Stream", testSystem); - Tank tank = new neqsim.processsimulation.processequipment.tank.Tank("tank"); + Tank tank = new neqsim.process.equipment.tank.Tank("tank"); tank.addStream(stream_1); StreamInterface liqstream = tank.getLiquidOutStream(); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(tank); operations.add(liqstream); diff --git a/src/test/java/neqsim/processsimulation/util/example/LNGtankfilling.java b/src/test/java/neqsim/processsimulation/util/example/LNGtankfilling.java index a9c1fbfd8e..e141658fd7 100644 --- a/src/test/java/neqsim/processsimulation/util/example/LNGtankfilling.java +++ b/src/test/java/neqsim/processsimulation/util/example/LNGtankfilling.java @@ -1,11 +1,11 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.measurementdevice.PressureTransmitter; -import neqsim.processsimulation.measurementdevice.TemperatureTransmitter; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.tank.Tank; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; -import neqsim.processsimulation.processequipment.valve.ValveInterface; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.tank.Tank; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.equipment.valve.ValveInterface; +import neqsim.process.measurementdevice.PressureTransmitter; +import neqsim.process.measurementdevice.TemperatureTransmitter; import neqsim.thermo.ThermodynamicConstantsInterface; /** @@ -63,7 +63,7 @@ public static void main(String args[]) { ValveInterface valve = new ThrottlingValve("valve", stream_1); valve.setOutletPressure(ThermodynamicConstantsInterface.referencePressure + 0.110); - Tank tank = new neqsim.processsimulation.processequipment.tank.Tank("tank"); + Tank tank = new neqsim.process.equipment.tank.Tank("tank"); tank.addStream(valve.getOutletStream()); // tank.addStream(stream_2); @@ -88,8 +88,8 @@ public static void main(String args[]) { // pressureController.setControllerSetPoint(ThermodynamicConstantsInterface.referencePressure+0.110); // pressureController.setControllerParameters(2.0,400,0); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(valve); operations.add(tank); diff --git a/src/test/java/neqsim/processsimulation/util/example/MEGinjection.java b/src/test/java/neqsim/processsimulation/util/example/MEGinjection.java index 3dac139533..406488f9d6 100644 --- a/src/test/java/neqsim/processsimulation/util/example/MEGinjection.java +++ b/src/test/java/neqsim/processsimulation/util/example/MEGinjection.java @@ -1,12 +1,12 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.StaticMixer; -import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator; -import neqsim.processsimulation.processequipment.splitter.Splitter; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.util.Adjuster; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.StaticMixer; +import neqsim.process.equipment.separator.ThreePhaseSeparator; +import neqsim.process.equipment.splitter.Splitter; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.util.Adjuster; +import neqsim.process.equipment.valve.ThrottlingValve; /** *

@@ -78,8 +78,8 @@ public static void main(String[] args) { adjuster.setAdjustedVariable(MEGFeed, "mass flow"); adjuster.setTargetVariable(mixerStream, "mass fraction", 0.6, "-", "aqueous", "MEG"); - neqsim.processsimulation.processsystem.ProcessSystem MEGwelloperations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem MEGwelloperations = + new neqsim.process.processmodel.ProcessSystem(); MEGwelloperations.add(feedGasStream); MEGwelloperations.add(MEGFeed); MEGwelloperations.add(feedGasMEGmixer); @@ -110,7 +110,7 @@ public static void main(String[] args) { MEGFeedOnshore.setTemperature(35.0, "C"); MEGFeedOnshore.setPressure(80.0, "bara"); - neqsim.processsimulation.processequipment.splitter.Splitter MEGsplitter = + neqsim.process.equipment.splitter.Splitter MEGsplitter = new Splitter("MEG splitter", MEGFeedOnshore); MEGsplitter.setSplitFactors(new double[] {0.1, 0.1, 0.8}); @@ -121,8 +121,8 @@ public static void main(String[] args) { ThrottlingValve DPvalve1 = new ThrottlingValve("DP valve 1", MEGmixer1.getOutletStream()); DPvalve1.setOutletPressure(70.0); - neqsim.processsimulation.processsystem.ProcessSystem onshoreOperations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem onshoreOperations = + new neqsim.process.processmodel.ProcessSystem(); onshoreOperations.add(feedStream); onshoreOperations.add(onshoreChockeValve); onshoreOperations.add(slugCatcher); diff --git a/src/test/java/neqsim/processsimulation/util/example/MasstransferMeOH.java b/src/test/java/neqsim/processsimulation/util/example/MasstransferMeOH.java index 48255ab4c4..66e2ccd65c 100644 --- a/src/test/java/neqsim/processsimulation/util/example/MasstransferMeOH.java +++ b/src/test/java/neqsim/processsimulation/util/example/MasstransferMeOH.java @@ -1,10 +1,10 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.mixer.StaticMixer; -import neqsim.processsimulation.processequipment.mixer.StaticPhaseMixer; -import neqsim.processsimulation.processequipment.separator.GasScrubber; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.util.StreamSaturatorUtil; +import neqsim.process.equipment.mixer.StaticMixer; +import neqsim.process.equipment.mixer.StaticPhaseMixer; +import neqsim.process.equipment.separator.GasScrubber; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.util.StreamSaturatorUtil; import neqsim.thermo.ThermodynamicConstantsInterface; /** @@ -59,8 +59,8 @@ public static void main(String[] args) { mainMixer.addStream(waterSaturatedFeedGas); mainMixer.addStream(MeOHFeed); - neqsim.processsimulation.processequipment.util.NeqSimUnit pipeline = - new neqsim.processsimulation.processequipment.util.NeqSimUnit(mainMixer.getOutletStream(), + neqsim.process.equipment.util.NeqSimUnit pipeline = + new neqsim.process.equipment.util.NeqSimUnit(mainMixer.getOutletStream(), "pipeline", "stratified"); pipeline.setLength(123.01); @@ -68,8 +68,8 @@ public static void main(String[] args) { Stream gasFromScrubber = new Stream("gasFromScrubber", scrubber.getGasOutStream()); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(dryFeedGas); operations.add(saturatedFeedGas); operations.add(waterSaturatedFeedGas); diff --git a/src/test/java/neqsim/processsimulation/util/example/OffshoreProcess.java b/src/test/java/neqsim/processsimulation/util/example/OffshoreProcess.java index b2d8eea61c..93decf4912 100644 --- a/src/test/java/neqsim/processsimulation/util/example/OffshoreProcess.java +++ b/src/test/java/neqsim/processsimulation/util/example/OffshoreProcess.java @@ -1,14 +1,14 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.mixer.StaticPhaseMixer; -import neqsim.processsimulation.processequipment.pipeline.Pipeline; -import neqsim.processsimulation.processequipment.pipeline.TwoPhasePipeLine; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.NeqStream; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.mixer.StaticPhaseMixer; +import neqsim.process.equipment.pipeline.Pipeline; +import neqsim.process.equipment.pipeline.TwoPhasePipeLine; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.NeqStream; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; /** *

OffshoreProcess class.

@@ -113,8 +113,8 @@ public static void main(String args[]) { pipe.setEquilibriumMassTransfer(false); pipe.setEquilibriumHeatTransfer(false); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(separator); operations.add(stream_2); diff --git a/src/test/java/neqsim/processsimulation/util/example/OffshoreProcess2.java b/src/test/java/neqsim/processsimulation/util/example/OffshoreProcess2.java index d0df39a337..e8df49e303 100644 --- a/src/test/java/neqsim/processsimulation/util/example/OffshoreProcess2.java +++ b/src/test/java/neqsim/processsimulation/util/example/OffshoreProcess2.java @@ -1,10 +1,10 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.mixer.StaticPhaseMixer; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.mixer.StaticPhaseMixer; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPA; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -74,8 +74,8 @@ public static void main(String args[]) { mixer.addStream(stream_2); mixer.addStream(stream_4); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(separator); operations.add(stream_2); diff --git a/src/test/java/neqsim/processsimulation/util/example/OffshoreProcess3.java b/src/test/java/neqsim/processsimulation/util/example/OffshoreProcess3.java index c82bf32e6e..1d9c37fae7 100644 --- a/src/test/java/neqsim/processsimulation/util/example/OffshoreProcess3.java +++ b/src/test/java/neqsim/processsimulation/util/example/OffshoreProcess3.java @@ -1,16 +1,16 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.heatexchanger.Cooler; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.util.MoleFractionControllerUtil; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processequipment.util.SetPoint; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.heatexchanger.Cooler; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.separator.ThreePhaseSeparator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.util.MoleFractionControllerUtil; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.equipment.util.SetPoint; +import neqsim.process.equipment.valve.ThrottlingValve; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemSrkEos; @@ -206,8 +206,8 @@ public static void main(String[] args) { Stream exportGas = new Stream("export gas", exportGasCompressorCooler2.getOutletStream()); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(wellStream); operations.add(inletTempControl); operations.add(valve); diff --git a/src/test/java/neqsim/processsimulation/util/example/OnshoreMEGprocess.java b/src/test/java/neqsim/processsimulation/util/example/OnshoreMEGprocess.java index e43be14826..a195ed1d9b 100644 --- a/src/test/java/neqsim/processsimulation/util/example/OnshoreMEGprocess.java +++ b/src/test/java/neqsim/processsimulation/util/example/OnshoreMEGprocess.java @@ -1,22 +1,22 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.distillation.Condenser; -import neqsim.processsimulation.processequipment.distillation.DistillationColumn; -import neqsim.processsimulation.processequipment.distillation.Reboiler; -import neqsim.processsimulation.processequipment.heatexchanger.Cooler; -import neqsim.processsimulation.processequipment.heatexchanger.HeatExchanger; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.StaticMixer; -import neqsim.processsimulation.processequipment.pump.Pump; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator; -import neqsim.processsimulation.processequipment.splitter.Splitter; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.util.Calculator; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processequipment.util.StreamSaturatorUtil; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.distillation.Condenser; +import neqsim.process.equipment.distillation.DistillationColumn; +import neqsim.process.equipment.distillation.Reboiler; +import neqsim.process.equipment.heatexchanger.Cooler; +import neqsim.process.equipment.heatexchanger.HeatExchanger; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.StaticMixer; +import neqsim.process.equipment.pump.Pump; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.separator.ThreePhaseSeparator; +import neqsim.process.equipment.splitter.Splitter; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.util.Calculator; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.equipment.util.StreamSaturatorUtil; +import neqsim.process.equipment.valve.ThrottlingValve; /** *

@@ -208,8 +208,8 @@ public static void main(String[] args) { richMEGstreamHeater2.setEnergyStream(column.getCondenser().getEnergyStream()); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(dryFeedGas); operations.add(saturatedFeedGas); operations.add(waterSaturatedFeedGas); diff --git a/src/test/java/neqsim/processsimulation/util/example/OnshoreProcess1.java b/src/test/java/neqsim/processsimulation/util/example/OnshoreProcess1.java index 585de3faad..615b274576 100644 --- a/src/test/java/neqsim/processsimulation/util/example/OnshoreProcess1.java +++ b/src/test/java/neqsim/processsimulation/util/example/OnshoreProcess1.java @@ -2,20 +2,20 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.measurementdevice.MeasurementDeviceInterface; -import neqsim.processsimulation.measurementdevice.MolarMassAnalyser; -import neqsim.processsimulation.measurementdevice.PressureTransmitter; -import neqsim.processsimulation.measurementdevice.TemperatureTransmitter; -import neqsim.processsimulation.measurementdevice.VolumeFlowTransmitter; -import neqsim.processsimulation.measurementdevice.WaterContentAnalyser; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.pipeline.SimpleTPoutPipeline; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.pipeline.SimpleTPoutPipeline; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.separator.ThreePhaseSeparator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.measurementdevice.MeasurementDeviceInterface; +import neqsim.process.measurementdevice.MolarMassAnalyser; +import neqsim.process.measurementdevice.PressureTransmitter; +import neqsim.process.measurementdevice.TemperatureTransmitter; +import neqsim.process.measurementdevice.VolumeFlowTransmitter; +import neqsim.process.measurementdevice.WaterContentAnalyser; /** *

@@ -429,8 +429,8 @@ public static void main(String[] args) { // VolumeFlowTransmitter("Stream to CO2 removal Volume FLow",streamToCO2removal); // volumeTransmitter_StreamToCO2removal.setUnit("Nm^3/day"); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(reservoirTemperaturTransmitter); operations.add(reservoirPressureTransmitter); diff --git a/src/test/java/neqsim/processsimulation/util/example/TEGAbsorberTest.java b/src/test/java/neqsim/processsimulation/util/example/TEGAbsorberTest.java index deb0525b66..8793e9e24f 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TEGAbsorberTest.java +++ b/src/test/java/neqsim/processsimulation/util/example/TEGAbsorberTest.java @@ -1,13 +1,13 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.absorber.SimpleTEGAbsorber; -import neqsim.processsimulation.processequipment.heatexchanger.ReBoiler; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.separator.GasScrubberSimple; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.absorber.SimpleTEGAbsorber; +import neqsim.process.equipment.heatexchanger.ReBoiler; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.separator.GasScrubberSimple; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.equipment.valve.ThrottlingValve; /** *

@@ -99,8 +99,8 @@ public static void main(String args[]) { // processSimulation.processEquipment.absorber.SimpleGlycolAbsorber(gasStreamIn); // TEGabsorber.setName("TEGabsorber"); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(fluidStreamIn); operations.add(gasScrubber); operations.add(gasToAbsorber); diff --git a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcess2.java b/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcess2.java index 996b5a2042..094a28b439 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcess2.java +++ b/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcess2.java @@ -1,17 +1,17 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.absorber.SimpleTEGAbsorber; -import neqsim.processsimulation.processequipment.absorber.WaterStripperColumn; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.mixer.StaticMixer; -import neqsim.processsimulation.processequipment.pump.Pump; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.util.Calculator; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processequipment.util.StreamSaturatorUtil; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.absorber.SimpleTEGAbsorber; +import neqsim.process.equipment.absorber.WaterStripperColumn; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.mixer.StaticMixer; +import neqsim.process.equipment.pump.Pump; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.util.Calculator; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.equipment.util.StreamSaturatorUtil; +import neqsim.process.equipment.valve.ThrottlingValve; /** *

@@ -187,8 +187,8 @@ public static void main(String[] args) { Recycle recycleLeanTEG = new Recycle("lean TEG recycle"); recycleLeanTEG.addStream(makeupMixer.getOutletStream()); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(dryFeedGas); operations.add(saturatedFeedGas); operations.add(waterSaturatedFeedGas); diff --git a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillation.java b/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillation.java index 1b80e4ed1a..b943a60dac 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillation.java +++ b/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillation.java @@ -1,20 +1,20 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.absorber.SimpleTEGAbsorber; -import neqsim.processsimulation.processequipment.absorber.WaterStripperColumn; -import neqsim.processsimulation.processequipment.distillation.Condenser; -import neqsim.processsimulation.processequipment.distillation.DistillationColumn; -import neqsim.processsimulation.processequipment.distillation.Reboiler; -import neqsim.processsimulation.processequipment.heatexchanger.HeatExchanger; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.StaticMixer; -import neqsim.processsimulation.processequipment.pump.Pump; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.util.Calculator; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processequipment.util.StreamSaturatorUtil; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.absorber.SimpleTEGAbsorber; +import neqsim.process.equipment.absorber.WaterStripperColumn; +import neqsim.process.equipment.distillation.Condenser; +import neqsim.process.equipment.distillation.DistillationColumn; +import neqsim.process.equipment.distillation.Reboiler; +import neqsim.process.equipment.heatexchanger.HeatExchanger; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.StaticMixer; +import neqsim.process.equipment.pump.Pump; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.util.Calculator; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.equipment.util.StreamSaturatorUtil; +import neqsim.process.equipment.valve.ThrottlingValve; import neqsim.thermo.ThermodynamicConstantsInterface; /** @@ -197,8 +197,8 @@ public static void main(String[] args) { richGLycolHeaterCondenser.setEnergyStream(column.getCondenser().getEnergyStream()); // richGLycolHeater.isSetEnergyStream(); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(dryFeedGas); operations.add(saturatedFeedGas); operations.add(waterSaturatedFeedGas); diff --git a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillation3.java b/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillation3.java index b6646f2da6..861036a19b 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillation3.java +++ b/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillation3.java @@ -1,20 +1,20 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.absorber.SimpleTEGAbsorber; -import neqsim.processsimulation.processequipment.absorber.WaterStripperColumn; -import neqsim.processsimulation.processequipment.distillation.Condenser; -import neqsim.processsimulation.processequipment.distillation.DistillationColumn; -import neqsim.processsimulation.processequipment.distillation.Reboiler; -import neqsim.processsimulation.processequipment.heatexchanger.HeatExchanger; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.StaticMixer; -import neqsim.processsimulation.processequipment.pump.Pump; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.util.Calculator; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processequipment.util.StreamSaturatorUtil; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.absorber.SimpleTEGAbsorber; +import neqsim.process.equipment.absorber.WaterStripperColumn; +import neqsim.process.equipment.distillation.Condenser; +import neqsim.process.equipment.distillation.DistillationColumn; +import neqsim.process.equipment.distillation.Reboiler; +import neqsim.process.equipment.heatexchanger.HeatExchanger; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.StaticMixer; +import neqsim.process.equipment.pump.Pump; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.util.Calculator; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.equipment.util.StreamSaturatorUtil; +import neqsim.process.equipment.valve.ThrottlingValve; import neqsim.thermo.ThermodynamicConstantsInterface; /** @@ -194,8 +194,8 @@ public static void main(String[] args) { richGLycolHeaterCondenser.setEnergyStream(column.getCondenser().getEnergyStream()); richGLycolHeater.isSetEnergyStream(); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(dryFeedGas); operations.add(saturatedFeedGas); operations.add(waterSaturatedFeedGas); diff --git a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillationAaHa.java b/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillationAaHa.java index 7fa1adcd20..3d490efd33 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillationAaHa.java +++ b/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillationAaHa.java @@ -1,22 +1,22 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.conditionmonitor.ConditionMonitor; -import neqsim.processsimulation.measurementdevice.HydrateEquilibriumTemperatureAnalyser; -import neqsim.processsimulation.processequipment.absorber.SimpleTEGAbsorber; -import neqsim.processsimulation.processequipment.absorber.WaterStripperColumn; -import neqsim.processsimulation.processequipment.distillation.DistillationColumn; -import neqsim.processsimulation.processequipment.filter.Filter; -import neqsim.processsimulation.processequipment.heatexchanger.HeatExchanger; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.StaticMixer; -import neqsim.processsimulation.processequipment.pump.Pump; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.util.Calculator; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processequipment.util.SetPoint; -import neqsim.processsimulation.processequipment.util.StreamSaturatorUtil; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.conditionmonitor.ConditionMonitor; +import neqsim.process.equipment.absorber.SimpleTEGAbsorber; +import neqsim.process.equipment.absorber.WaterStripperColumn; +import neqsim.process.equipment.distillation.DistillationColumn; +import neqsim.process.equipment.filter.Filter; +import neqsim.process.equipment.heatexchanger.HeatExchanger; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.StaticMixer; +import neqsim.process.equipment.pump.Pump; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.util.Calculator; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.equipment.util.SetPoint; +import neqsim.process.equipment.util.StreamSaturatorUtil; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.measurementdevice.HydrateEquilibriumTemperatureAnalyser; import neqsim.thermo.ThermodynamicConstantsInterface; /** @@ -34,9 +34,9 @@ public class TEGdehydrationProcessDistillationAaHa { * getProcess. *

* - * @return a {@link neqsim.processsimulation.processsystem.ProcessSystem} object + * @return a {@link neqsim.process.processmodel.ProcessSystem} object */ - public static neqsim.processsimulation.processsystem.ProcessSystem getProcess() { + public static neqsim.process.processmodel.ProcessSystem getProcess() { neqsim.thermo.system.SystemInterface feedGas = new neqsim.thermo.system.SystemSrkCPAstatoil(273.15 + 42.0, 10.00); feedGas.addComponent("nitrogen", 1.42); @@ -231,8 +231,8 @@ public static neqsim.processsimulation.processsystem.ProcessSystem getProcess() richGLycolHeaterCondenser.setEnergyStream(column.getCondenser().getEnergyStream()); // richGLycolHeater.isSetEnergyStream(); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(dryFeedGas); operations.add(saturatedFeedGas); operations.add(waterSaturatedFeedGas); @@ -286,7 +286,7 @@ public static neqsim.processsimulation.processsystem.ProcessSystem getProcess() */ @SuppressWarnings("unused") public static void main(String[] args) { - neqsim.processsimulation.processsystem.ProcessSystem operations = + neqsim.process.processmodel.ProcessSystem operations = TEGdehydrationProcessDistillationAaHa.getProcess(); operations.run(); diff --git a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillationGFA.java b/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillationGFA.java index 3a8b9a716b..5057796aad 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillationGFA.java +++ b/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillationGFA.java @@ -1,25 +1,25 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.conditionmonitor.ConditionMonitor; -import neqsim.processsimulation.measurementdevice.HydrateEquilibriumTemperatureAnalyser; -import neqsim.processsimulation.measurementdevice.WaterDewPointAnalyser; -import neqsim.processsimulation.processequipment.absorber.SimpleTEGAbsorber; -import neqsim.processsimulation.processequipment.absorber.WaterStripperColumn; -import neqsim.processsimulation.processequipment.distillation.Condenser; -import neqsim.processsimulation.processequipment.distillation.DistillationColumn; -import neqsim.processsimulation.processequipment.distillation.Reboiler; -import neqsim.processsimulation.processequipment.filter.Filter; -import neqsim.processsimulation.processequipment.heatexchanger.HeatExchanger; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.StaticMixer; -import neqsim.processsimulation.processequipment.pump.Pump; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.util.Calculator; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processequipment.util.SetPoint; -import neqsim.processsimulation.processequipment.util.StreamSaturatorUtil; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.conditionmonitor.ConditionMonitor; +import neqsim.process.equipment.absorber.SimpleTEGAbsorber; +import neqsim.process.equipment.absorber.WaterStripperColumn; +import neqsim.process.equipment.distillation.Condenser; +import neqsim.process.equipment.distillation.DistillationColumn; +import neqsim.process.equipment.distillation.Reboiler; +import neqsim.process.equipment.filter.Filter; +import neqsim.process.equipment.heatexchanger.HeatExchanger; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.StaticMixer; +import neqsim.process.equipment.pump.Pump; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.util.Calculator; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.equipment.util.SetPoint; +import neqsim.process.equipment.util.StreamSaturatorUtil; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.measurementdevice.HydrateEquilibriumTemperatureAnalyser; +import neqsim.process.measurementdevice.WaterDewPointAnalyser; /** *

@@ -161,9 +161,9 @@ public class TEGdehydrationProcessDistillationGFA { * getProcess. *

* - * @return a {@link neqsim.processsimulation.processsystem.ProcessSystem} object + * @return a {@link neqsim.process.processmodel.ProcessSystem} object */ - public neqsim.processsimulation.processsystem.ProcessSystem getProcess() { + public neqsim.process.processmodel.ProcessSystem getProcess() { // Create the input fluid to the TEG process and saturate it with water at // scrubber conditions neqsim.thermo.system.SystemInterface feedGas = @@ -346,8 +346,8 @@ public neqsim.processsimulation.processsystem.ProcessSystem getProcess() { richGLycolHeaterCondenser.setEnergyStream(column.getCondenser().getEnergyStream()); // richGLycolHeater.isSetEnergyStream(); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(dryFeedGas); operations.add(saturatedFeedGas); operations.add(waterSaturatedFeedGas); @@ -401,7 +401,7 @@ public neqsim.processsimulation.processsystem.ProcessSystem getProcess() { @SuppressWarnings("unused") public static void main(String[] args) { TEGdehydrationProcessDistillationGFA tempClass = new TEGdehydrationProcessDistillationGFA(); - neqsim.processsimulation.processsystem.ProcessSystem operations = tempClass.getProcess(); + neqsim.process.processmodel.ProcessSystem operations = tempClass.getProcess(); operations.run(); // operations.run(); // operations = diff --git a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillationJS.java b/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillationJS.java index d425f6f9c8..836b2562f8 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillationJS.java +++ b/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillationJS.java @@ -1,21 +1,21 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.measurementdevice.HydrateEquilibriumTemperatureAnalyser; -import neqsim.processsimulation.processequipment.absorber.SimpleTEGAbsorber; -import neqsim.processsimulation.processequipment.absorber.WaterStripperColumn; -import neqsim.processsimulation.processequipment.distillation.DistillationColumn; -import neqsim.processsimulation.processequipment.filter.Filter; -import neqsim.processsimulation.processequipment.heatexchanger.HeatExchanger; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.StaticMixer; -import neqsim.processsimulation.processequipment.pump.Pump; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.util.Calculator; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processequipment.util.SetPoint; -import neqsim.processsimulation.processequipment.util.StreamSaturatorUtil; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.absorber.SimpleTEGAbsorber; +import neqsim.process.equipment.absorber.WaterStripperColumn; +import neqsim.process.equipment.distillation.DistillationColumn; +import neqsim.process.equipment.filter.Filter; +import neqsim.process.equipment.heatexchanger.HeatExchanger; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.StaticMixer; +import neqsim.process.equipment.pump.Pump; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.util.Calculator; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.equipment.util.SetPoint; +import neqsim.process.equipment.util.StreamSaturatorUtil; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.measurementdevice.HydrateEquilibriumTemperatureAnalyser; /** *

@@ -164,9 +164,9 @@ public TEGdehydrationProcessDistillationJS() {} * getProcess. *

* - * @return a {@link neqsim.processsimulation.processsystem.ProcessSystem} object + * @return a {@link neqsim.process.processmodel.ProcessSystem} object */ - public neqsim.processsimulation.processsystem.ProcessSystem getProcess() { + public neqsim.process.processmodel.ProcessSystem getProcess() { // Create the input fluid to the TEG process and saturate it with water at // scrubber conditions neqsim.thermo.system.SystemInterface feedGas = @@ -352,8 +352,8 @@ public neqsim.processsimulation.processsystem.ProcessSystem getProcess() { richGLycolHeaterCondenser.setEnergyStream(column.getCondenser().getEnergyStream()); // richGLycolHeater.isSetEnergyStream(); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(dryFeedGas); operations.add(saturatedFeedGas); operations.add(waterSaturatedFeedGas); @@ -408,7 +408,7 @@ public neqsim.processsimulation.processsystem.ProcessSystem getProcess() { */ public static void main(String[] args) { TEGdehydrationProcessDistillationJS tempClass = new TEGdehydrationProcessDistillationJS(); - neqsim.processsimulation.processsystem.ProcessSystem operations = tempClass.getProcess(); + neqsim.process.processmodel.ProcessSystem operations = tempClass.getProcess(); operations.run(); operations.save("c:/temp/TEGprocessJS.neqsim"); diff --git a/src/test/java/neqsim/processsimulation/util/example/TEGstripperProcess.java b/src/test/java/neqsim/processsimulation/util/example/TEGstripperProcess.java index 2e5fe54702..7be5af4fee 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TEGstripperProcess.java +++ b/src/test/java/neqsim/processsimulation/util/example/TEGstripperProcess.java @@ -1,7 +1,7 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.absorber.WaterStripperColumn; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.absorber.WaterStripperColumn; +import neqsim.process.equipment.stream.Stream; /** *

@@ -60,8 +60,8 @@ public static void main(String[] args) { stripper.setNumberOfStages(3); stripper.setStageEfficiency(0.5); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(dryFeedGas); operations.add(TEGFeed); operations.add(stripper); diff --git a/src/test/java/neqsim/processsimulation/util/example/TestMechanicalDesign.java b/src/test/java/neqsim/processsimulation/util/example/TestMechanicalDesign.java index 5b8dc215db..34d0d05e9c 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TestMechanicalDesign.java +++ b/src/test/java/neqsim/processsimulation/util/example/TestMechanicalDesign.java @@ -1,7 +1,7 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; /** *

TestMechanicalDesign class.

@@ -54,8 +54,8 @@ public static void main(String args[]) { * "manway"); sep.getSeparatorSection("top manway").getMechanicalDesign().setANSIclass(300) * ; sep.getSeparatorSection("top manway").getMechanicalDesign(). setNominalSize("DN 500"); */ - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(sep); operations.run(); diff --git a/src/test/java/neqsim/processsimulation/util/example/TestNeqsim.java b/src/test/java/neqsim/processsimulation/util/example/TestNeqsim.java index dec5d82a8c..c82a5ba398 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TestNeqsim.java +++ b/src/test/java/neqsim/processsimulation/util/example/TestNeqsim.java @@ -1,7 +1,7 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.stream.Stream; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; @@ -67,8 +67,8 @@ public static void main(String[] args) { compressor1.setPolytropicEfficiency(0.64951); Stream stream2 = new Stream("stream2", compressor1.getOutletStream()); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream1); operations.add(compressor1); operations.add(stream2); diff --git a/src/test/java/neqsim/processsimulation/util/example/TestOnlineProcess.java b/src/test/java/neqsim/processsimulation/util/example/TestOnlineProcess.java index 21d4b3abe1..e9ce96110a 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TestOnlineProcess.java +++ b/src/test/java/neqsim/processsimulation/util/example/TestOnlineProcess.java @@ -1,8 +1,8 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.measurementdevice.TemperatureTransmitter; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.measurementdevice.TemperatureTransmitter; /** *

TestOnlineProcess class.

@@ -34,8 +34,8 @@ public static void main(String args[]) { ThrottlingValve valve_1 = new ThrottlingValve("valve_1", stream_1); valve_1.setOutletPressure(5.0); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(temperatureTransmitter); operations.add(valve_1); diff --git a/src/test/java/neqsim/processsimulation/util/example/TestProcess4.java b/src/test/java/neqsim/processsimulation/util/example/TestProcess4.java index 3d9b29c195..69a34c9933 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TestProcess4.java +++ b/src/test/java/neqsim/processsimulation/util/example/TestProcess4.java @@ -1,7 +1,7 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; /** *

TestProcess4 class.

@@ -45,8 +45,8 @@ public static void main(String args[]) { Stream liquidStream = new Stream("liquidStream", separator.getLiquidOutStream()); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(separator); // operations.add(valve_1); diff --git a/src/test/java/neqsim/processsimulation/util/example/TestSeparationTrain.java b/src/test/java/neqsim/processsimulation/util/example/TestSeparationTrain.java index f1062dbda5..7464b64d94 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TestSeparationTrain.java +++ b/src/test/java/neqsim/processsimulation/util/example/TestSeparationTrain.java @@ -1,14 +1,14 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.heatexchanger.Cooler; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.heatexchanger.Cooler; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.separator.ThreePhaseSeparator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.equipment.valve.ThrottlingValve; /** *

@@ -108,8 +108,8 @@ public static void main(String args[]) { HPliquidRecycle.addStream(gasInletScrubber.getLiquidOutStream()); inletSeparator.addStream(HPliquidRecycle.getOutletStream()); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(wellStream); operations.add(inletSeparator); operations.add(liquidOutHeater); diff --git a/src/test/java/neqsim/processsimulation/util/example/TestSlugcatcher.java b/src/test/java/neqsim/processsimulation/util/example/TestSlugcatcher.java index e9601388aa..13bc7a241a 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TestSlugcatcher.java +++ b/src/test/java/neqsim/processsimulation/util/example/TestSlugcatcher.java @@ -6,10 +6,10 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.measurementdevice.VolumeFlowTransmitter; -import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.separator.ThreePhaseSeparator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.measurementdevice.VolumeFlowTransmitter; /** *

@@ -62,8 +62,8 @@ public static void main(String args[]) { "Water Volume FLow From Slug Catcher", separator2.getWaterOutStream()); volumeTransmitter4.setMeasuredPhaseNumber(0); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(separator); operations.add(valve1); diff --git a/src/test/java/neqsim/processsimulation/util/example/TestTransientFlow.java b/src/test/java/neqsim/processsimulation/util/example/TestTransientFlow.java index e35ea97184..491798332f 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TestTransientFlow.java +++ b/src/test/java/neqsim/processsimulation/util/example/TestTransientFlow.java @@ -6,13 +6,13 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.controllerdevice.ControllerDeviceBaseClass; -import neqsim.processsimulation.controllerdevice.ControllerDeviceInterface; -import neqsim.processsimulation.measurementdevice.LevelTransmitter; -import neqsim.processsimulation.measurementdevice.PressureTransmitter; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.controllerdevice.ControllerDeviceBaseClass; +import neqsim.process.controllerdevice.ControllerDeviceInterface; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.measurementdevice.LevelTransmitter; +import neqsim.process.measurementdevice.PressureTransmitter; /** *

@@ -94,8 +94,8 @@ public static void main(String args[]) { separatorPressureController.setControllerSetPoint(7.0); separatorPressureController.setControllerParameters(1.0, 300.0, 10.0); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(valve_1); diff --git a/src/test/java/neqsim/processsimulation/util/example/TestTransientFlow2.java b/src/test/java/neqsim/processsimulation/util/example/TestTransientFlow2.java index c1ae0e8441..998312ce84 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TestTransientFlow2.java +++ b/src/test/java/neqsim/processsimulation/util/example/TestTransientFlow2.java @@ -1,11 +1,11 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.controllerdevice.ControllerDeviceBaseClass; -import neqsim.processsimulation.controllerdevice.ControllerDeviceInterface; -import neqsim.processsimulation.measurementdevice.VolumeFlowTransmitter; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.controllerdevice.ControllerDeviceBaseClass; +import neqsim.process.controllerdevice.ControllerDeviceInterface; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.measurementdevice.VolumeFlowTransmitter; /** *

@@ -61,8 +61,8 @@ public static void main(String args[]) { flowController.setControllerSetPoint(1.0); flowController.setControllerParameters(0.7, 300.0, 0.0); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(valve_1); operations.add(separator_1); diff --git a/src/test/java/neqsim/processsimulation/util/example/WellStreamMixer.java b/src/test/java/neqsim/processsimulation/util/example/WellStreamMixer.java index ea9ef40719..92ca50c5df 100644 --- a/src/test/java/neqsim/processsimulation/util/example/WellStreamMixer.java +++ b/src/test/java/neqsim/processsimulation/util/example/WellStreamMixer.java @@ -1,8 +1,8 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.mixer.StaticMixer; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.mixer.StaticMixer; +import neqsim.process.equipment.stream.Stream; import neqsim.thermo.system.SystemSrkEos; /** @@ -70,8 +70,8 @@ public static void main(String[] args) { Stream mixerdStream = new Stream("mixed stream", wellStramMixer.getOutletStream()); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(wellStream_1); operations.add(wellStream_2); operations.add(wellStramMixer); diff --git a/src/test/java/neqsim/processsimulation/util/example/compressorTest.java b/src/test/java/neqsim/processsimulation/util/example/compressorTest.java index f0e1b57fea..e1f42b8bd5 100644 --- a/src/test/java/neqsim/processsimulation/util/example/compressorTest.java +++ b/src/test/java/neqsim/processsimulation/util/example/compressorTest.java @@ -1,11 +1,11 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.mixer.MixerInterface; -import neqsim.processsimulation.processequipment.mixer.StaticMixer; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.mixer.MixerInterface; +import neqsim.process.equipment.mixer.StaticMixer; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; /** @@ -47,8 +47,8 @@ public static void main(String args[]) { mixer.addStream(stream_2); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(stream_2); operations.add(mixer); diff --git a/src/test/java/neqsim/processsimulation/util/example/compressorTest12.java b/src/test/java/neqsim/processsimulation/util/example/compressorTest12.java index 6a07bf4cfc..4f8b753dac 100644 --- a/src/test/java/neqsim/processsimulation/util/example/compressorTest12.java +++ b/src/test/java/neqsim/processsimulation/util/example/compressorTest12.java @@ -1,8 +1,8 @@ package neqsim.processsimulation.util.example; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.stream.Stream; import neqsim.thermo.system.SystemInterface; /** diff --git a/src/test/java/neqsim/processsimulation/util/example/compressorTest_1.java b/src/test/java/neqsim/processsimulation/util/example/compressorTest_1.java index 0cd6633cb4..79ee64d2ac 100644 --- a/src/test/java/neqsim/processsimulation/util/example/compressorTest_1.java +++ b/src/test/java/neqsim/processsimulation/util/example/compressorTest_1.java @@ -2,8 +2,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.stream.Stream; /** *

@@ -39,8 +39,8 @@ public static void main(String args[]) { comp_1.setPolytropicEfficiency(0.74629255); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(comp_1); diff --git a/src/test/java/neqsim/processsimulation/util/example/destillation1.java b/src/test/java/neqsim/processsimulation/util/example/destillation1.java index 5d55d2579e..0502948cd9 100644 --- a/src/test/java/neqsim/processsimulation/util/example/destillation1.java +++ b/src/test/java/neqsim/processsimulation/util/example/destillation1.java @@ -1,9 +1,9 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.distillation.Condenser; -import neqsim.processsimulation.processequipment.distillation.DistillationColumn; -import neqsim.processsimulation.processequipment.distillation.Reboiler; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.distillation.Condenser; +import neqsim.process.equipment.distillation.DistillationColumn; +import neqsim.process.equipment.distillation.Reboiler; +import neqsim.process.equipment.stream.Stream; import neqsim.thermodynamicoperations.ThermodynamicOperations; /** @@ -57,8 +57,8 @@ public static void main(String args[]) { * column2.getCondenser()).setRefluxRatio(0.01); */ - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(column); // operations.add(heater); diff --git a/src/test/java/neqsim/processsimulation/util/example/destillation2.java b/src/test/java/neqsim/processsimulation/util/example/destillation2.java index 6c5ed32194..68ce50cd97 100644 --- a/src/test/java/neqsim/processsimulation/util/example/destillation2.java +++ b/src/test/java/neqsim/processsimulation/util/example/destillation2.java @@ -1,7 +1,7 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.distillation.DistillationColumn; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.distillation.DistillationColumn; +import neqsim.process.equipment.stream.Stream; /** *

@@ -46,8 +46,8 @@ public static void main(String args[]) { column.addFeedStream(feedGas, 0); column.getTray(2).addStream(TEGliq); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(feedGas); operations.add(TEGliq); operations.add(column); diff --git a/src/test/java/neqsim/processsimulation/util/example/expander1.java b/src/test/java/neqsim/processsimulation/util/example/expander1.java index 2ecf9a92b2..6f26892fca 100644 --- a/src/test/java/neqsim/processsimulation/util/example/expander1.java +++ b/src/test/java/neqsim/processsimulation/util/example/expander1.java @@ -1,6 +1,6 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.stream.Stream; /** *

@@ -33,8 +33,8 @@ public static void main(String args[]) { // neqsim.processSimulation.processEquipment.expander.Expander expander = new // neqsim.processSimulation.processEquipment.expander.Expander(stream_1); - neqsim.processsimulation.processequipment.compressor.Compressor expander = - new neqsim.processsimulation.processequipment.compressor.Compressor("expander", + neqsim.process.equipment.compressor.Compressor expander = + new neqsim.process.equipment.compressor.Compressor("expander", stream_1); expander.setOutletPressure(80.0); @@ -42,8 +42,8 @@ public static void main(String args[]) { expander.setIsentropicEfficiency(0.9); expander.setUsePolytropicCalc(true); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(expander); diff --git a/src/test/java/neqsim/processsimulation/util/example/gasPipeline.java b/src/test/java/neqsim/processsimulation/util/example/gasPipeline.java index c3836a9a29..d496cbb958 100644 --- a/src/test/java/neqsim/processsimulation/util/example/gasPipeline.java +++ b/src/test/java/neqsim/processsimulation/util/example/gasPipeline.java @@ -1,9 +1,9 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.pipeline.AdiabaticPipe; -import neqsim.processsimulation.processequipment.pipeline.AdiabaticTwoPhasePipe; -import neqsim.processsimulation.processequipment.pipeline.OnePhasePipeLine; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.pipeline.AdiabaticPipe; +import neqsim.process.equipment.pipeline.AdiabaticTwoPhasePipe; +import neqsim.process.equipment.pipeline.OnePhasePipeLine; +import neqsim.process.equipment.stream.Stream; /** *

gasPipeline class.

@@ -51,8 +51,8 @@ public static void main(String args[]) { simplePipeline2phase.setInletElevation(0.0); simplePipeline2phase.setOutletElevation(-100.0); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(pipeline); // operations.add(simplePipeline); diff --git a/src/test/java/neqsim/processsimulation/util/example/multiThreadTest.java b/src/test/java/neqsim/processsimulation/util/example/multiThreadTest.java index 3b789cddba..3e7c34c5b8 100644 --- a/src/test/java/neqsim/processsimulation/util/example/multiThreadTest.java +++ b/src/test/java/neqsim/processsimulation/util/example/multiThreadTest.java @@ -2,14 +2,14 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.heatexchanger.Cooler; -import neqsim.processsimulation.processequipment.mixer.MixerInterface; -import neqsim.processsimulation.processequipment.mixer.StaticMixer; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processequipment.util.Recycle; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.heatexchanger.Cooler; +import neqsim.process.equipment.mixer.MixerInterface; +import neqsim.process.equipment.mixer.StaticMixer; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.equipment.util.Recycle; import neqsim.thermodynamicoperations.ThermodynamicOperations; /** @@ -57,8 +57,8 @@ public static void main(String args[]) { cooler1.setOutTemperature(283.15 + 30); // mixer.addStream(stream_2); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(stream_2); operations.add(mixer); @@ -104,8 +104,8 @@ public static void main(String args[]) { mixer2.addStream(resyc.getOutletStream()); // mixer2.addStream(stream_222); - neqsim.processsimulation.processsystem.ProcessSystem operations2 = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations2 = + new neqsim.process.processmodel.ProcessSystem(); operations2.add(stream_22); operations2.add(mixer2); operations2.add(stream_32); diff --git a/src/test/java/neqsim/processsimulation/util/example/oxygenRemovalWater.java b/src/test/java/neqsim/processsimulation/util/example/oxygenRemovalWater.java index 7f3281093c..341dcfc0b6 100644 --- a/src/test/java/neqsim/processsimulation/util/example/oxygenRemovalWater.java +++ b/src/test/java/neqsim/processsimulation/util/example/oxygenRemovalWater.java @@ -1,10 +1,10 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.valve.ThrottlingValve; import neqsim.thermo.ThermodynamicConstantsInterface; /** @@ -48,8 +48,8 @@ public static void main(String[] args) { ThrottlingValve LP_valve = new ThrottlingValve("LPventil", heater1.getOutletStream()); LP_valve.setOutletPressure(30.0e-3); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_air); operations.add(stream_water); operations.add(mix); diff --git a/src/test/java/neqsim/processsimulation/util/example/process1.java b/src/test/java/neqsim/processsimulation/util/example/process1.java index 384c132f67..1a55d84c28 100644 --- a/src/test/java/neqsim/processsimulation/util/example/process1.java +++ b/src/test/java/neqsim/processsimulation/util/example/process1.java @@ -1,6 +1,6 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.stream.Stream; import neqsim.thermodynamicoperations.ThermodynamicOperations; /** @@ -49,16 +49,16 @@ public static void main(String args[]) { Stream stream_1 = new Stream("Stream1", testSystem); - neqsim.processsimulation.processequipment.compressor.Compressor compr = - new neqsim.processsimulation.processequipment.compressor.Compressor("compr", + neqsim.process.equipment.compressor.Compressor compr = + new neqsim.process.equipment.compressor.Compressor("compr", stream_1); compr.setOutletPressure(80.0); compr.setOutTemperature(345.0); compr.setUsePolytropicCalc(true); // compr.setNumberOfCompressorCalcSteps(10); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(compr); diff --git a/src/test/java/neqsim/processsimulation/util/example/process1Test.java b/src/test/java/neqsim/processsimulation/util/example/process1Test.java index 29b54c02d7..be3a606034 100644 --- a/src/test/java/neqsim/processsimulation/util/example/process1Test.java +++ b/src/test/java/neqsim/processsimulation/util/example/process1Test.java @@ -2,11 +2,11 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.stream.Stream; class process1Test extends neqsim.NeqSimTest { static neqsim.thermo.system.SystemInterface testSystem; - static neqsim.processsimulation.processsystem.ProcessSystem operations; + static neqsim.process.processmodel.ProcessSystem operations; /** *

@@ -25,14 +25,14 @@ public static void setUp() { Stream stream_1 = new Stream("Stream1", testSystem); - neqsim.processsimulation.processequipment.compressor.Compressor compr = - new neqsim.processsimulation.processequipment.compressor.Compressor("compr", stream_1); + neqsim.process.equipment.compressor.Compressor compr = + new neqsim.process.equipment.compressor.Compressor("compr", stream_1); compr.setOutletPressure(80.0); compr.setPolytropicEfficiency(0.9); compr.setIsentropicEfficiency(0.9); compr.setUsePolytropicCalc(true); - operations = new neqsim.processsimulation.processsystem.ProcessSystem(); + operations = new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(compr); } diff --git a/src/test/java/neqsim/processsimulation/util/example/process2.java b/src/test/java/neqsim/processsimulation/util/example/process2.java index ddc5d3bb53..0f3eee28d2 100644 --- a/src/test/java/neqsim/processsimulation/util/example/process2.java +++ b/src/test/java/neqsim/processsimulation/util/example/process2.java @@ -1,13 +1,13 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.MixerInterface; -import neqsim.processsimulation.processequipment.mixer.StaticMixer; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.splitter.Splitter; -import neqsim.processsimulation.processequipment.splitter.SplitterInterface; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.MixerInterface; +import neqsim.process.equipment.mixer.StaticMixer; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.splitter.Splitter; +import neqsim.process.equipment.splitter.SplitterInterface; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; /** @@ -53,8 +53,8 @@ public static void main(String args[]) { mixer.addStream(stream_5); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(heater); operations.add(mixer); diff --git a/src/test/java/neqsim/processsimulation/util/example/processCO2MDEA.java b/src/test/java/neqsim/processsimulation/util/example/processCO2MDEA.java index d442ce99ad..ff228c0f56 100644 --- a/src/test/java/neqsim/processsimulation/util/example/processCO2MDEA.java +++ b/src/test/java/neqsim/processsimulation/util/example/processCO2MDEA.java @@ -1,10 +1,10 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.pipeline.Pipeline; -import neqsim.processsimulation.processequipment.pipeline.TwoPhasePipeLine; -import neqsim.processsimulation.processequipment.stream.NeqStream; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processsystem.ProcessSystem; +import neqsim.process.equipment.pipeline.Pipeline; +import neqsim.process.equipment.pipeline.TwoPhasePipeLine; +import neqsim.process.equipment.stream.NeqStream; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.system.SystemFurstElectrolyteEos; import neqsim.thermo.system.SystemInterface; diff --git a/src/test/java/neqsim/processsimulation/util/example/propaneCoolingCycle.java b/src/test/java/neqsim/processsimulation/util/example/propaneCoolingCycle.java index ac06f816ee..75383ad3c2 100644 --- a/src/test/java/neqsim/processsimulation/util/example/propaneCoolingCycle.java +++ b/src/test/java/neqsim/processsimulation/util/example/propaneCoolingCycle.java @@ -1,11 +1,11 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.heatexchanger.Cooler; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.util.SetPoint; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.heatexchanger.Cooler; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.util.SetPoint; +import neqsim.process.equipment.valve.ThrottlingValve; /** *

@@ -61,8 +61,8 @@ public static void main(String args[]) { heater.setSpecification("out stream"); heater.setOutletStream(stream_1); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(JTvalve); diff --git a/src/test/java/neqsim/processsimulation/util/example/propaneMultiStageCoolingCycle.java b/src/test/java/neqsim/processsimulation/util/example/propaneMultiStageCoolingCycle.java index 7ebb7e4cd4..1427e715ff 100644 --- a/src/test/java/neqsim/processsimulation/util/example/propaneMultiStageCoolingCycle.java +++ b/src/test/java/neqsim/processsimulation/util/example/propaneMultiStageCoolingCycle.java @@ -1,10 +1,10 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.heatexchanger.HeatExchanger; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.heatexchanger.HeatExchanger; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.equipment.valve.ThrottlingValve; /** *

@@ -112,8 +112,8 @@ public static void main(String args[]) { Stream heatEx22stream = new Stream("heatEx22stream", heatEx22.getOutStream(0)); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_Ethane); operations.add(stream_1); diff --git a/src/test/java/neqsim/processsimulation/util/example/propaneTwoStageCoolingCycle.java b/src/test/java/neqsim/processsimulation/util/example/propaneTwoStageCoolingCycle.java index 0c4035eb3a..2fb097136a 100644 --- a/src/test/java/neqsim/processsimulation/util/example/propaneTwoStageCoolingCycle.java +++ b/src/test/java/neqsim/processsimulation/util/example/propaneTwoStageCoolingCycle.java @@ -1,13 +1,13 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.heatexchanger.Cooler; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.heatexchanger.Cooler; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.equipment.valve.ThrottlingValve; /** *

propaneTwoStageCoolingCycle class.

@@ -68,8 +68,8 @@ public static void main(String args[]) { cooler3.setSpecification("out stream"); cooler3.setOutletStream(stream_1); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(JTvalve1); operations.add(medPresSep); diff --git a/src/test/java/neqsim/processsimulation/util/example/shtokman.java b/src/test/java/neqsim/processsimulation/util/example/shtokman.java index 7dd148e15d..27936cbe60 100644 --- a/src/test/java/neqsim/processsimulation/util/example/shtokman.java +++ b/src/test/java/neqsim/processsimulation/util/example/shtokman.java @@ -1,8 +1,8 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; /** *

@@ -43,12 +43,12 @@ public static void main(String args[]) { Separator separator = new Separator("Separator 1", stream_1); StreamInterface stream_2 = separator.getGasOutStream(); - neqsim.processsimulation.processequipment.heatexchanger.Heater heater = - new neqsim.processsimulation.processequipment.heatexchanger.Heater("heater", stream_2); + neqsim.process.equipment.heatexchanger.Heater heater = + new neqsim.process.equipment.heatexchanger.Heater("heater", stream_2); heater.setOutTemperature(273.15 + 35); heater.setPressureDrop(134); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(separator); operations.add(stream_2); diff --git a/src/test/java/neqsim/processsimulation/util/example/shtokman_MEG.java b/src/test/java/neqsim/processsimulation/util/example/shtokman_MEG.java index 2f049354cb..4442e73e47 100644 --- a/src/test/java/neqsim/processsimulation/util/example/shtokman_MEG.java +++ b/src/test/java/neqsim/processsimulation/util/example/shtokman_MEG.java @@ -2,9 +2,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; /** @@ -40,8 +40,8 @@ public static void main(String args[]) { Separator separator = new Separator("Separator 1", stream_1); StreamInterface stream_2 = separator.getGasOutStream(); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); try { operations.add(separator); diff --git a/src/test/java/neqsim/processsimulation/util/example/simpleGasScrubber.java b/src/test/java/neqsim/processsimulation/util/example/simpleGasScrubber.java index 2ce0e1663c..6d0514c050 100644 --- a/src/test/java/neqsim/processsimulation/util/example/simpleGasScrubber.java +++ b/src/test/java/neqsim/processsimulation/util/example/simpleGasScrubber.java @@ -1,7 +1,7 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.separator.GasScrubberSimple; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.separator.GasScrubberSimple; +import neqsim.process.equipment.stream.Stream; import neqsim.thermodynamicoperations.ThermodynamicOperations; /** @@ -37,8 +37,8 @@ public static void main(String args[]) { Stream stream_2 = new Stream("gas from scrubber", gasScrubber.getGasOutStream()); Stream stream_3 = new Stream("liquid from scrubber", gasScrubber.getLiquidOutStream()); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(gasScrubber); operations.add(stream_2); diff --git a/src/test/java/neqsim/processsimulation/util/example/simpleTopSideProcess.java b/src/test/java/neqsim/processsimulation/util/example/simpleTopSideProcess.java index fdca20170f..20936867bc 100644 --- a/src/test/java/neqsim/processsimulation/util/example/simpleTopSideProcess.java +++ b/src/test/java/neqsim/processsimulation/util/example/simpleTopSideProcess.java @@ -1,12 +1,12 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.separator.GasScrubberSimple; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.separator.GasScrubberSimple; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.valve.ThrottlingValve; /** *

simpleTopSideProcess class.

@@ -34,7 +34,7 @@ public static void main(String args[]) { testSystem.setMixingRule(2); Stream stream_1 = new Stream("Stream1", testSystem); - Mixer mixerHP = new neqsim.processsimulation.processequipment.mixer.StaticMixer("Mixer HP"); + Mixer mixerHP = new neqsim.process.equipment.mixer.StaticMixer("Mixer HP"); mixerHP.addStream(stream_1); Separator separator = new Separator("Separator 1", mixerHP.getOutletStream()); @@ -59,15 +59,15 @@ public static void main(String args[]) { mixerHP.addStream(stream_3); Mixer mixer = - new neqsim.processsimulation.processequipment.mixer.StaticMixer("Mixer export"); + new neqsim.process.equipment.mixer.StaticMixer("Mixer export"); mixer.addStream(separator.getGasOutStream()); mixer.addStream(gasScrubber.getGasOutStream()); Compressor HPcompressor = new Compressor("HPcompressor", mixer.getOutletStream()); HPcompressor.setOutletPressure(200.0); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(mixerHP); operations.add(separator); diff --git a/src/test/java/neqsim/processsimulation/util/example/simpleTopSideProcess2.java b/src/test/java/neqsim/processsimulation/util/example/simpleTopSideProcess2.java index 0405d6b4a4..1cc6da0a96 100644 --- a/src/test/java/neqsim/processsimulation/util/example/simpleTopSideProcess2.java +++ b/src/test/java/neqsim/processsimulation/util/example/simpleTopSideProcess2.java @@ -1,11 +1,11 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.util.Recycle; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.separator.ThreePhaseSeparator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.util.Recycle; /** *

@@ -30,7 +30,7 @@ public static void main(String args[]) { fluid.setPressure(5.0, "bara"); Stream stream_inlet = new Stream("Stream1", fluid); - Mixer mixer_inlet = new neqsim.processsimulation.processequipment.mixer.StaticMixer("Mixer HP"); + Mixer mixer_inlet = new neqsim.process.equipment.mixer.StaticMixer("Mixer HP"); mixer_inlet.addStream(stream_inlet); ThreePhaseSeparator separator_inlet = @@ -47,8 +47,8 @@ public static void main(String args[]) { recyleOp.addStream(scrubber.getLiquidOutStream()); mixer_inlet.addStream(recyleOp.getOutletStream()); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_inlet); operations.add(mixer_inlet); operations.add(separator_inlet); diff --git a/src/test/java/neqsim/processsimulation/util/example/testGasScrubber.java b/src/test/java/neqsim/processsimulation/util/example/testGasScrubber.java index 112f616de6..d7ca8dad13 100644 --- a/src/test/java/neqsim/processsimulation/util/example/testGasScrubber.java +++ b/src/test/java/neqsim/processsimulation/util/example/testGasScrubber.java @@ -2,10 +2,10 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.pipeline.AdiabaticPipe; -import neqsim.processsimulation.processequipment.separator.GasScrubberSimple; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.pipeline.AdiabaticPipe; +import neqsim.process.equipment.separator.GasScrubberSimple; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; /** *

@@ -67,8 +67,8 @@ public static void main(String args[]) { StreamInterface stream_3 = pipe.getOutletStream(); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(scrubber); operations.add(stream_2); diff --git a/src/test/java/neqsim/processsimulation/util/example/threePhaseSeparation.java b/src/test/java/neqsim/processsimulation/util/example/threePhaseSeparation.java index fddb06090f..9a5865f055 100644 --- a/src/test/java/neqsim/processsimulation/util/example/threePhaseSeparation.java +++ b/src/test/java/neqsim/processsimulation/util/example/threePhaseSeparation.java @@ -1,9 +1,9 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.util.MoleFractionControllerUtil; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.separator.ThreePhaseSeparator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.util.MoleFractionControllerUtil; +import neqsim.process.equipment.valve.ThrottlingValve; /** *

@@ -83,8 +83,8 @@ public static void main(String args[]) { // ThreePhaseSeparator separator2 = new ThreePhaseSeparator("Separator LP", // LP_valve.getOutStream()); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(separator); // operations.add(stream_2); diff --git a/src/test/java/neqsim/processsimulation/util/example/threePhaseSeparation_1.java b/src/test/java/neqsim/processsimulation/util/example/threePhaseSeparation_1.java index 4178593f12..f420896eb7 100644 --- a/src/test/java/neqsim/processsimulation/util/example/threePhaseSeparation_1.java +++ b/src/test/java/neqsim/processsimulation/util/example/threePhaseSeparation_1.java @@ -1,7 +1,7 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.separator.ThreePhaseSeparator; +import neqsim.process.equipment.stream.Stream; import neqsim.thermodynamicoperations.ThermodynamicOperations; /** @@ -37,8 +37,8 @@ public static void main(String args[]) { Stream stream_3 = new Stream("oil from separator", separator.getOilOutStream()); Stream stream_4 = new Stream("water from separator", separator.getWaterOutStream()); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(separator); operations.add(stream_2); diff --git a/src/test/java/neqsim/processsimulation/util/monitor/SeparatorResponseTest.java b/src/test/java/neqsim/processsimulation/util/monitor/SeparatorResponseTest.java index 02b378d67c..9174441ddc 100644 --- a/src/test/java/neqsim/processsimulation/util/monitor/SeparatorResponseTest.java +++ b/src/test/java/neqsim/processsimulation/util/monitor/SeparatorResponseTest.java @@ -4,12 +4,12 @@ import org.junit.jupiter.api.Test; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import neqsim.processsimulation.processequipment.heatexchanger.HeatExchanger; -import neqsim.processsimulation.processequipment.pump.Pump; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processsystem.ProcessSystem; +import neqsim.process.equipment.heatexchanger.HeatExchanger; +import neqsim.process.equipment.pump.Pump; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.separator.ThreePhaseSeparator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.system.SystemSrkEos; public class SeparatorResponseTest { diff --git a/src/test/java/neqsim/processsimulation/util/report/ReportTest.java b/src/test/java/neqsim/processsimulation/util/report/ReportTest.java index f7d7593283..38555f39e3 100644 --- a/src/test/java/neqsim/processsimulation/util/report/ReportTest.java +++ b/src/test/java/neqsim/processsimulation/util/report/ReportTest.java @@ -1,12 +1,13 @@ package neqsim.processsimulation.util.report; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; -import neqsim.processsimulation.processsystem.ProcessSystem; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.processmodel.ProcessSystem; +import neqsim.process.util.report.Report; import neqsim.thermo.system.SystemSrkEos; public class ReportTest { diff --git a/src/test/java/neqsim/thermo/util/example/ReadFluidData2.java b/src/test/java/neqsim/thermo/util/example/ReadFluidData2.java index c036fbd702..eec8b13fb1 100644 --- a/src/test/java/neqsim/thermo/util/example/ReadFluidData2.java +++ b/src/test/java/neqsim/thermo/util/example/ReadFluidData2.java @@ -2,9 +2,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.separator.ThreePhaseSeparator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos;