From abfb9322a3f6b2ac258d5f0e6d2bb1476a18a897 Mon Sep 17 00:00:00 2001 From: Even Solbraa <41290109+EvenSol@users.noreply.github.com> Date: Sun, 3 Nov 2024 22:27:02 +0100 Subject: [PATCH] fix bugs (#1166) * fix bugs * update path --- .../equipment/separator/Separator.java | 17 +++----- .../process/equipment/stream/Stream.java | 4 +- .../neqsim/thermo/system/SystemInterface.java | 2 + .../neqsim/thermo/system/SystemThermo.java | 8 +++- .../ControllerDeviceBaseClassTest.java | 2 +- .../absorber/SimpleAbsorberTest.java | 2 +- .../adsorber/SimpleAdsorberTest.java | 2 +- .../compressor/CompressorCalculationTest.java | 2 +- .../compressor/CompressorChartTest.java | 2 +- .../CompressorPropertyProfileTest.java | 2 +- .../equipment}/compressor/CompressorTest.java | 2 +- .../distillation/DistillationColumnTest.java | 2 +- .../heatexchanger/HeatExchangerTest.java | 2 +- .../equipment}/heatexchanger/HeaterTest.java | 2 +- .../equipment}/manifold/ManifoldTest.java | 2 +- .../equipment}/mixer/MixerTest.java | 2 +- .../pipeline/AdiabaticTwoPhasePipeTest.java | 2 +- .../pipeline/BeggsAndBrillsPipeTest.java | 2 +- .../equipment}/pipeline/PipelineTest.java | 2 +- .../powergeneration/GasTurbineTest.java | 2 +- .../equipment}/pump/PumpChartTest.java | 2 +- .../equipment}/pump/PumpTest.java | 2 +- .../reservoir/SimpleReservoirTest.java | 2 +- .../equipment}/reservoir/WellFlowTest.java | 2 +- .../equipment}/separator/SeparatorTest.java | 41 ++++++++++++++++++- .../separator/ThreePhaseSeparatorTest.java | 2 +- .../splitter/ComponentSplitterTest.java | 2 +- .../equipment}/stream/StreamTest.java | 2 +- .../equipment}/stream/VirtualStreamTest.java | 2 +- .../equipment}/util/AdjusterTest.java | 2 +- .../equipment}/util/FlowSetterTest.java | 2 +- .../equipment}/util/GORfitterTest.java | 2 +- .../equipment}/util/MPFMfitterTest.java | 2 +- .../equipment}/util/PressureDropTest.java | 2 +- .../util/StreamSaturatorUtilTest.java | 2 +- .../equipment}/valve/ThrottlingValveTest.java | 2 +- .../CombustionEmissionsCalculatorTest.java | 2 +- .../FLowInducedVibrationTest.java | 2 +- .../MultiPhaseMeterTest.java | 2 +- .../measurementdevice/WellAllocatorTest.java | 2 +- .../measurementdevice/nmVOCTest.java | 2 +- .../measurementdevice/pHProbeTest.java | 2 +- .../simpleflowregime/SevereSlugTest.java | 2 +- .../SystemMechanicalDesignTest.java | 2 +- .../CombinedOilGasFieldTest.java | 2 +- .../processmodel}/CompressorModule.java | 2 +- .../processmodel}/GlycolModulesTest.java | 2 +- .../processmodel}/GlycolRigTest.java | 2 +- .../processmodel}/MLA_bug_test.java | 2 +- .../processmodel}/OilGasProcessTest.java | 2 +- .../processmodel}/OilProcessTest.java | 2 +- .../ProcessSystemControllerTest.java | 2 +- .../ProcessSystemRunTransientTest.java | 2 +- .../ProcessSystemSerializationTest.java | 2 +- .../processmodel}/ProcessSystemTest.java | 2 +- .../processmodel}/ReferenceProcessTest.java | 2 +- .../processmodel}/waterDegasserTest.java | 2 +- .../util/example/LNGfilling.java | 2 +- .../util/example/LNGfilling2.java | 2 +- .../util/example/LNGtankfilling.java | 2 +- .../util/example/MEGinjection.java | 2 +- .../util/example/MasstransferMeOH.java | 2 +- .../util/example/OffshoreProcess.java | 2 +- .../util/example/OffshoreProcess2.java | 2 +- .../util/example/OffshoreProcess3.java | 2 +- .../util/example/OnshoreMEGprocess.java | 2 +- .../util/example/OnshoreProcess1.java | 2 +- .../util/example/TEGAbsorberTest.java | 2 +- .../util/example/TEGdehydrationProcess2.java | 2 +- .../TEGdehydrationProcessDistillation.java | 2 +- .../TEGdehydrationProcessDistillation3.java | 2 +- ...TEGdehydrationProcessDistillationAaHa.java | 2 +- .../TEGdehydrationProcessDistillationGFA.java | 2 +- .../TEGdehydrationProcessDistillationJS.java | 2 +- .../util/example/TEGstripperProcess.java | 2 +- .../util/example/TestMechanicalDesign.java | 2 +- .../util/example/TestNeqsim.java | 2 +- .../util/example/TestOnlineProcess.java | 2 +- .../util/example/TestProcess4.java | 2 +- .../util/example/TestSeparationTrain.java | 2 +- .../util/example/TestSlugcatcher.java | 2 +- .../util/example/TestTransientFlow.java | 2 +- .../util/example/TestTransientFlow2.java | 2 +- .../util/example/WellStreamMixer.java | 2 +- .../util/example/compressorTest.java | 2 +- .../util/example/compressorTest12.java | 2 +- .../util/example/compressorTest_1.java | 2 +- .../util/example/destillation1.java | 2 +- .../util/example/destillation2.java | 2 +- .../util/example/expander1.java | 2 +- .../util/example/gasPipeline.java | 2 +- .../util/example/multiThreadTest.java | 2 +- .../util/example/oxygenRemovalWater.java | 2 +- .../util/example/process1.java | 2 +- .../util/example/process1Test.java | 2 +- .../util/example/process2.java | 2 +- .../util/example/processCO2MDEA.java | 2 +- .../util/example/propaneCoolingCycle.java | 2 +- .../propaneMultiStageCoolingCycle.java | 2 +- .../example/propaneTwoStageCoolingCycle.java | 2 +- .../util/example/shtokman.java | 2 +- .../util/example/shtokman_MEG.java | 2 +- .../util/example/simpleGasScrubber.java | 2 +- .../util/example/simpleTopSideProcess.java | 2 +- .../util/example/simpleTopSideProcess2.java | 2 +- .../util/example/testGasScrubber.java | 2 +- .../util/example/threePhaseSeparation.java | 2 +- .../util/example/threePhaseSeparation_1.java | 2 +- .../util/monitor/SeparatorResponseTest.java | 2 +- .../util/report/FluidCompinentReportTest.java | 2 +- .../util/report/FluidReportTest.java | 2 +- .../util/report/ReportTest.java | 2 +- 112 files changed, 163 insertions(+), 123 deletions(-) rename src/test/java/neqsim/{processsimulation => process}/controllerdevice/ControllerDeviceBaseClassTest.java (98%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/absorber/SimpleAbsorberTest.java (95%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/adsorber/SimpleAdsorberTest.java (95%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/compressor/CompressorCalculationTest.java (99%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/compressor/CompressorChartTest.java (99%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/compressor/CompressorPropertyProfileTest.java (97%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/compressor/CompressorTest.java (99%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/distillation/DistillationColumnTest.java (99%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/heatexchanger/HeatExchangerTest.java (98%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/heatexchanger/HeaterTest.java (96%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/manifold/ManifoldTest.java (98%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/mixer/MixerTest.java (98%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/pipeline/AdiabaticTwoPhasePipeTest.java (97%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/pipeline/BeggsAndBrillsPipeTest.java (99%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/pipeline/PipelineTest.java (97%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/powergeneration/GasTurbineTest.java (97%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/pump/PumpChartTest.java (93%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/pump/PumpTest.java (98%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/reservoir/SimpleReservoirTest.java (98%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/reservoir/WellFlowTest.java (99%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/separator/SeparatorTest.java (59%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/separator/ThreePhaseSeparatorTest.java (99%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/splitter/ComponentSplitterTest.java (99%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/stream/StreamTest.java (97%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/stream/VirtualStreamTest.java (97%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/util/AdjusterTest.java (98%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/util/FlowSetterTest.java (99%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/util/GORfitterTest.java (98%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/util/MPFMfitterTest.java (97%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/util/PressureDropTest.java (95%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/util/StreamSaturatorUtilTest.java (98%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/valve/ThrottlingValveTest.java (97%) rename src/test/java/neqsim/{processsimulation => process}/measurementdevice/CombustionEmissionsCalculatorTest.java (95%) rename src/test/java/neqsim/{processsimulation => process}/measurementdevice/FLowInducedVibrationTest.java (99%) rename src/test/java/neqsim/{processsimulation => process}/measurementdevice/MultiPhaseMeterTest.java (97%) rename src/test/java/neqsim/{processsimulation => process}/measurementdevice/WellAllocatorTest.java (98%) rename src/test/java/neqsim/{processsimulation => process}/measurementdevice/nmVOCTest.java (99%) rename src/test/java/neqsim/{processsimulation => process}/measurementdevice/pHProbeTest.java (97%) rename src/test/java/neqsim/{processsimulation => process}/measurementdevice/simpleflowregime/SevereSlugTest.java (94%) rename src/test/java/neqsim/{processsimulation => process}/mechanicaldesign/SystemMechanicalDesignTest.java (99%) rename src/test/java/neqsim/{processsimulation/processsystem => process/processmodel}/CombinedOilGasFieldTest.java (98%) rename src/test/java/neqsim/{processsimulation/processsystem => process/processmodel}/CompressorModule.java (99%) rename src/test/java/neqsim/{processsimulation/processsystem => process/processmodel}/GlycolModulesTest.java (99%) rename src/test/java/neqsim/{processsimulation/processsystem => process/processmodel}/GlycolRigTest.java (99%) rename src/test/java/neqsim/{processsimulation/processsystem => process/processmodel}/MLA_bug_test.java (99%) rename src/test/java/neqsim/{processsimulation/processsystem => process/processmodel}/OilGasProcessTest.java (99%) rename src/test/java/neqsim/{processsimulation/processsystem => process/processmodel}/OilProcessTest.java (91%) rename src/test/java/neqsim/{processsimulation/processsystem => process/processmodel}/ProcessSystemControllerTest.java (98%) rename src/test/java/neqsim/{processsimulation/processsystem => process/processmodel}/ProcessSystemRunTransientTest.java (99%) rename src/test/java/neqsim/{processsimulation/processsystem => process/processmodel}/ProcessSystemSerializationTest.java (99%) rename src/test/java/neqsim/{processsimulation/processsystem => process/processmodel}/ProcessSystemTest.java (99%) rename src/test/java/neqsim/{processsimulation/processsystem => process/processmodel}/ReferenceProcessTest.java (99%) rename src/test/java/neqsim/{processsimulation/processsystem => process/processmodel}/waterDegasserTest.java (99%) rename src/test/java/neqsim/{processsimulation => process}/util/example/LNGfilling.java (97%) rename src/test/java/neqsim/{processsimulation => process}/util/example/LNGfilling2.java (97%) rename src/test/java/neqsim/{processsimulation => process}/util/example/LNGtankfilling.java (99%) rename src/test/java/neqsim/{processsimulation => process}/util/example/MEGinjection.java (99%) rename src/test/java/neqsim/{processsimulation => process}/util/example/MasstransferMeOH.java (98%) rename src/test/java/neqsim/{processsimulation => process}/util/example/OffshoreProcess.java (99%) rename src/test/java/neqsim/{processsimulation => process}/util/example/OffshoreProcess2.java (98%) rename src/test/java/neqsim/{processsimulation => process}/util/example/OffshoreProcess3.java (99%) rename src/test/java/neqsim/{processsimulation => process}/util/example/OnshoreMEGprocess.java (99%) rename src/test/java/neqsim/{processsimulation => process}/util/example/OnshoreProcess1.java (99%) rename src/test/java/neqsim/{processsimulation => process}/util/example/TEGAbsorberTest.java (99%) rename src/test/java/neqsim/{processsimulation => process}/util/example/TEGdehydrationProcess2.java (99%) rename src/test/java/neqsim/{processsimulation => process}/util/example/TEGdehydrationProcessDistillation.java (99%) rename src/test/java/neqsim/{processsimulation => process}/util/example/TEGdehydrationProcessDistillation3.java (99%) rename src/test/java/neqsim/{processsimulation => process}/util/example/TEGdehydrationProcessDistillationAaHa.java (99%) rename src/test/java/neqsim/{processsimulation => process}/util/example/TEGdehydrationProcessDistillationGFA.java (99%) rename src/test/java/neqsim/{processsimulation => process}/util/example/TEGdehydrationProcessDistillationJS.java (99%) rename src/test/java/neqsim/{processsimulation => process}/util/example/TEGstripperProcess.java (98%) rename src/test/java/neqsim/{processsimulation => process}/util/example/TestMechanicalDesign.java (98%) rename src/test/java/neqsim/{processsimulation => process}/util/example/TestNeqsim.java (99%) rename src/test/java/neqsim/{processsimulation => process}/util/example/TestOnlineProcess.java (97%) rename src/test/java/neqsim/{processsimulation => process}/util/example/TestProcess4.java (97%) rename src/test/java/neqsim/{processsimulation => process}/util/example/TestSeparationTrain.java (99%) rename src/test/java/neqsim/{processsimulation => process}/util/example/TestSlugcatcher.java (98%) rename src/test/java/neqsim/{processsimulation => process}/util/example/TestTransientFlow.java (99%) rename src/test/java/neqsim/{processsimulation => process}/util/example/TestTransientFlow2.java (98%) rename src/test/java/neqsim/{processsimulation => process}/util/example/WellStreamMixer.java (98%) rename src/test/java/neqsim/{processsimulation => process}/util/example/compressorTest.java (97%) rename src/test/java/neqsim/{processsimulation => process}/util/example/compressorTest12.java (98%) rename src/test/java/neqsim/{processsimulation => process}/util/example/compressorTest_1.java (98%) rename src/test/java/neqsim/{processsimulation => process}/util/example/destillation1.java (98%) rename src/test/java/neqsim/{processsimulation => process}/util/example/destillation2.java (97%) rename src/test/java/neqsim/{processsimulation => process}/util/example/expander1.java (97%) rename src/test/java/neqsim/{processsimulation => process}/util/example/gasPipeline.java (98%) rename src/test/java/neqsim/{processsimulation => process}/util/example/multiThreadTest.java (99%) rename src/test/java/neqsim/{processsimulation => process}/util/example/oxygenRemovalWater.java (98%) rename src/test/java/neqsim/{processsimulation => process}/util/example/process1.java (98%) rename src/test/java/neqsim/{processsimulation => process}/util/example/process1Test.java (96%) rename src/test/java/neqsim/{processsimulation => process}/util/example/process2.java (98%) rename src/test/java/neqsim/{processsimulation => process}/util/example/processCO2MDEA.java (97%) rename src/test/java/neqsim/{processsimulation => process}/util/example/propaneCoolingCycle.java (98%) rename src/test/java/neqsim/{processsimulation => process}/util/example/propaneMultiStageCoolingCycle.java (99%) rename src/test/java/neqsim/{processsimulation => process}/util/example/propaneTwoStageCoolingCycle.java (99%) rename src/test/java/neqsim/{processsimulation => process}/util/example/shtokman.java (98%) rename src/test/java/neqsim/{processsimulation => process}/util/example/shtokman_MEG.java (97%) rename src/test/java/neqsim/{processsimulation => process}/util/example/simpleGasScrubber.java (97%) rename src/test/java/neqsim/{processsimulation => process}/util/example/simpleTopSideProcess.java (98%) rename src/test/java/neqsim/{processsimulation => process}/util/example/simpleTopSideProcess2.java (98%) rename src/test/java/neqsim/{processsimulation => process}/util/example/testGasScrubber.java (99%) rename src/test/java/neqsim/{processsimulation => process}/util/example/threePhaseSeparation.java (98%) rename src/test/java/neqsim/{processsimulation => process}/util/example/threePhaseSeparation_1.java (98%) rename src/test/java/neqsim/{processsimulation => process}/util/monitor/SeparatorResponseTest.java (98%) rename src/test/java/neqsim/{processsimulation => process}/util/report/FluidCompinentReportTest.java (92%) rename src/test/java/neqsim/{processsimulation => process}/util/report/FluidReportTest.java (94%) rename src/test/java/neqsim/{processsimulation => process}/util/report/ReportTest.java (97%) diff --git a/src/main/java/neqsim/process/equipment/separator/Separator.java b/src/main/java/neqsim/process/equipment/separator/Separator.java index 6b67b8d0af..c8d35ad657 100644 --- a/src/main/java/neqsim/process/equipment/separator/Separator.java +++ b/src/main/java/neqsim/process/equipment/separator/Separator.java @@ -88,8 +88,7 @@ public Separator(String name) { * Constructor for Separator. * * @param name a {@link java.lang.String} object - * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} - * object + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public Separator(String name, StreamInterface inletStream) { this(name); @@ -114,8 +113,7 @@ public void initMechanicalDesign() { * setInletStream. *

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

* - * @param newStream a {@link neqsim.process.equipment.stream.StreamInterface} - * object + * @param newStream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public void addStream(StreamInterface newStream) { if (numberOfInputStreams == 0) { @@ -651,9 +648,7 @@ public void setSeparatorLength(double separatorLength) { *

* * @param i a int - * @return a - * {@link neqsim.process.equipment.separator.sectiontype.SeparatorSection} - * object + * @return a {@link neqsim.process.equipment.separator.sectiontype.SeparatorSection} object */ public SeparatorSection getSeparatorSection(int i) { return separatorSection.get(i); @@ -665,9 +660,7 @@ public SeparatorSection getSeparatorSection(int i) { *

* * @param name a {@link java.lang.String} object - * @return a - * {@link neqsim.process.equipment.separator.sectiontype.SeparatorSection} - * object + * @return a {@link neqsim.process.equipment.separator.sectiontype.SeparatorSection} object */ public SeparatorSection getSeparatorSection(String name) { for (SeparatorSection sec : separatorSection) { diff --git a/src/main/java/neqsim/process/equipment/stream/Stream.java b/src/main/java/neqsim/process/equipment/stream/Stream.java index 278a4db387..aa2f5d163b 100644 --- a/src/main/java/neqsim/process/equipment/stream/Stream.java +++ b/src/main/java/neqsim/process/equipment/stream/Stream.java @@ -329,7 +329,9 @@ public boolean needRecalculation() { /** {@inheritDoc} */ @Override public void run(UUID id) { - // logger.info("start flashing stream... " + streamNumber); + if (!getFluid().isInitialized()) { + getFluid().init(0); + } thermoSystem = getFluid().clone(); ThermodynamicOperations thermoOps = new ThermodynamicOperations(thermoSystem); diff --git a/src/main/java/neqsim/thermo/system/SystemInterface.java b/src/main/java/neqsim/thermo/system/SystemInterface.java index adb122649c..3d30c7a791 100644 --- a/src/main/java/neqsim/thermo/system/SystemInterface.java +++ b/src/main/java/neqsim/thermo/system/SystemInterface.java @@ -2659,4 +2659,6 @@ public default void setPhysicalPropertyModel(int type) { * @param phasetypename a {@link java.lang.String} object */ public void setForceSinglePhase(String phasetypename); + + public boolean isInitialized(); } diff --git a/src/main/java/neqsim/thermo/system/SystemThermo.java b/src/main/java/neqsim/thermo/system/SystemThermo.java index baed65f4d0..cec181e217 100644 --- a/src/main/java/neqsim/thermo/system/SystemThermo.java +++ b/src/main/java/neqsim/thermo/system/SystemThermo.java @@ -105,6 +105,11 @@ public abstract class SystemThermo implements SystemInterface { // Initialization boolean isInitialized = false; + + public boolean isInitialized() { + return isInitialized; + } + /** Maximum allowed number of phases . */ public int maxNumberOfPhases = 2; private int mixingRule = 1; @@ -5049,8 +5054,7 @@ public double[] getzvector() { /** {@inheritDoc} */ @Override public String toJson() { - return new GsonBuilder().create() - .toJson(new neqsim.process.util.monitor.FluidResponse(this)); + return new GsonBuilder().create().toJson(new neqsim.process.util.monitor.FluidResponse(this)); } /** {@inheritDoc} */ diff --git a/src/test/java/neqsim/processsimulation/controllerdevice/ControllerDeviceBaseClassTest.java b/src/test/java/neqsim/process/controllerdevice/ControllerDeviceBaseClassTest.java similarity index 98% rename from src/test/java/neqsim/processsimulation/controllerdevice/ControllerDeviceBaseClassTest.java rename to src/test/java/neqsim/process/controllerdevice/ControllerDeviceBaseClassTest.java index 43f59bdfc9..07ab52a0d2 100644 --- a/src/test/java/neqsim/processsimulation/controllerdevice/ControllerDeviceBaseClassTest.java +++ b/src/test/java/neqsim/process/controllerdevice/ControllerDeviceBaseClassTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.controllerdevice; +package neqsim.process.controllerdevice; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; diff --git a/src/test/java/neqsim/processsimulation/processequipment/absorber/SimpleAbsorberTest.java b/src/test/java/neqsim/process/equipment/absorber/SimpleAbsorberTest.java similarity index 95% rename from src/test/java/neqsim/processsimulation/processequipment/absorber/SimpleAbsorberTest.java rename to src/test/java/neqsim/process/equipment/absorber/SimpleAbsorberTest.java index b840273e8a..7377051404 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/absorber/SimpleAbsorberTest.java +++ b/src/test/java/neqsim/process/equipment/absorber/SimpleAbsorberTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.absorber; +package neqsim.process.equipment.absorber; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; diff --git a/src/test/java/neqsim/processsimulation/processequipment/adsorber/SimpleAdsorberTest.java b/src/test/java/neqsim/process/equipment/adsorber/SimpleAdsorberTest.java similarity index 95% rename from src/test/java/neqsim/processsimulation/processequipment/adsorber/SimpleAdsorberTest.java rename to src/test/java/neqsim/process/equipment/adsorber/SimpleAdsorberTest.java index 384842cb40..ec6c182c17 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/adsorber/SimpleAdsorberTest.java +++ b/src/test/java/neqsim/process/equipment/adsorber/SimpleAdsorberTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.adsorber; +package neqsim.process.equipment.adsorber; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; diff --git a/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorCalculationTest.java b/src/test/java/neqsim/process/equipment/compressor/CompressorCalculationTest.java similarity index 99% rename from src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorCalculationTest.java rename to src/test/java/neqsim/process/equipment/compressor/CompressorCalculationTest.java index cb078c8bb8..05f977ceb8 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorCalculationTest.java +++ b/src/test/java/neqsim/process/equipment/compressor/CompressorCalculationTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.compressor; +package neqsim.process.equipment.compressor; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorChartTest.java b/src/test/java/neqsim/process/equipment/compressor/CompressorChartTest.java similarity index 99% rename from src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorChartTest.java rename to src/test/java/neqsim/process/equipment/compressor/CompressorChartTest.java index b1a4a5ad19..d8e0229cc1 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorChartTest.java +++ b/src/test/java/neqsim/process/equipment/compressor/CompressorChartTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.compressor; +package neqsim.process.equipment.compressor; import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Assertions; diff --git a/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorPropertyProfileTest.java b/src/test/java/neqsim/process/equipment/compressor/CompressorPropertyProfileTest.java similarity index 97% rename from src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorPropertyProfileTest.java rename to src/test/java/neqsim/process/equipment/compressor/CompressorPropertyProfileTest.java index 1cc9e4a103..e34931b6bc 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorPropertyProfileTest.java +++ b/src/test/java/neqsim/process/equipment/compressor/CompressorPropertyProfileTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.compressor; +package neqsim.process.equipment.compressor; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorTest.java b/src/test/java/neqsim/process/equipment/compressor/CompressorTest.java similarity index 99% rename from src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorTest.java rename to src/test/java/neqsim/process/equipment/compressor/CompressorTest.java index 2ad2b977d2..830504be8b 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorTest.java +++ b/src/test/java/neqsim/process/equipment/compressor/CompressorTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.compressor; +package neqsim.process.equipment.compressor; import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.File; diff --git a/src/test/java/neqsim/processsimulation/processequipment/distillation/DistillationColumnTest.java b/src/test/java/neqsim/process/equipment/distillation/DistillationColumnTest.java similarity index 99% rename from src/test/java/neqsim/processsimulation/processequipment/distillation/DistillationColumnTest.java rename to src/test/java/neqsim/process/equipment/distillation/DistillationColumnTest.java index 706e433b67..5b820bd6af 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/distillation/DistillationColumnTest.java +++ b/src/test/java/neqsim/process/equipment/distillation/DistillationColumnTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.distillation; +package neqsim.process.equipment.distillation; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/processsimulation/processequipment/heatexchanger/HeatExchangerTest.java b/src/test/java/neqsim/process/equipment/heatexchanger/HeatExchangerTest.java similarity index 98% rename from src/test/java/neqsim/processsimulation/processequipment/heatexchanger/HeatExchangerTest.java rename to src/test/java/neqsim/process/equipment/heatexchanger/HeatExchangerTest.java index 171c5077b1..f3a0485779 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/heatexchanger/HeatExchangerTest.java +++ b/src/test/java/neqsim/process/equipment/heatexchanger/HeatExchangerTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.heatexchanger; +package neqsim.process.equipment.heatexchanger; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/neqsim/processsimulation/processequipment/heatexchanger/HeaterTest.java b/src/test/java/neqsim/process/equipment/heatexchanger/HeaterTest.java similarity index 96% rename from src/test/java/neqsim/processsimulation/processequipment/heatexchanger/HeaterTest.java rename to src/test/java/neqsim/process/equipment/heatexchanger/HeaterTest.java index b338878c8a..a18b0aa4b8 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/heatexchanger/HeaterTest.java +++ b/src/test/java/neqsim/process/equipment/heatexchanger/HeaterTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.heatexchanger; +package neqsim.process.equipment.heatexchanger; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/src/test/java/neqsim/processsimulation/processequipment/manifold/ManifoldTest.java b/src/test/java/neqsim/process/equipment/manifold/ManifoldTest.java similarity index 98% rename from src/test/java/neqsim/processsimulation/processequipment/manifold/ManifoldTest.java rename to src/test/java/neqsim/process/equipment/manifold/ManifoldTest.java index de842d04e0..57cf38f562 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/manifold/ManifoldTest.java +++ b/src/test/java/neqsim/process/equipment/manifold/ManifoldTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.manifold; +package neqsim.process.equipment.manifold; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/processsimulation/processequipment/mixer/MixerTest.java b/src/test/java/neqsim/process/equipment/mixer/MixerTest.java similarity index 98% rename from src/test/java/neqsim/processsimulation/processequipment/mixer/MixerTest.java rename to src/test/java/neqsim/process/equipment/mixer/MixerTest.java index 252ea24d1c..4d953c2eca 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/mixer/MixerTest.java +++ b/src/test/java/neqsim/process/equipment/mixer/MixerTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.mixer; +package neqsim.process.equipment.mixer; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/src/test/java/neqsim/processsimulation/processequipment/pipeline/AdiabaticTwoPhasePipeTest.java b/src/test/java/neqsim/process/equipment/pipeline/AdiabaticTwoPhasePipeTest.java similarity index 97% rename from src/test/java/neqsim/processsimulation/processequipment/pipeline/AdiabaticTwoPhasePipeTest.java rename to src/test/java/neqsim/process/equipment/pipeline/AdiabaticTwoPhasePipeTest.java index e254a03e90..02d4e1c90d 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/pipeline/AdiabaticTwoPhasePipeTest.java +++ b/src/test/java/neqsim/process/equipment/pipeline/AdiabaticTwoPhasePipeTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.pipeline; +package neqsim.process.equipment.pipeline; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/processsimulation/processequipment/pipeline/BeggsAndBrillsPipeTest.java b/src/test/java/neqsim/process/equipment/pipeline/BeggsAndBrillsPipeTest.java similarity index 99% rename from src/test/java/neqsim/processsimulation/processequipment/pipeline/BeggsAndBrillsPipeTest.java rename to src/test/java/neqsim/process/equipment/pipeline/BeggsAndBrillsPipeTest.java index f8e80bb45a..a3fe6a5c38 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/pipeline/BeggsAndBrillsPipeTest.java +++ b/src/test/java/neqsim/process/equipment/pipeline/BeggsAndBrillsPipeTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.pipeline; +package neqsim.process.equipment.pipeline; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/processsimulation/processequipment/pipeline/PipelineTest.java b/src/test/java/neqsim/process/equipment/pipeline/PipelineTest.java similarity index 97% rename from src/test/java/neqsim/processsimulation/processequipment/pipeline/PipelineTest.java rename to src/test/java/neqsim/process/equipment/pipeline/PipelineTest.java index 5a40b069bc..74d52947bb 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/pipeline/PipelineTest.java +++ b/src/test/java/neqsim/process/equipment/pipeline/PipelineTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.pipeline; +package neqsim.process.equipment.pipeline; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/processsimulation/processequipment/powergeneration/GasTurbineTest.java b/src/test/java/neqsim/process/equipment/powergeneration/GasTurbineTest.java similarity index 97% rename from src/test/java/neqsim/processsimulation/processequipment/powergeneration/GasTurbineTest.java rename to src/test/java/neqsim/process/equipment/powergeneration/GasTurbineTest.java index 424b66a72f..8133c82c8d 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/powergeneration/GasTurbineTest.java +++ b/src/test/java/neqsim/process/equipment/powergeneration/GasTurbineTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.powergeneration; +package neqsim.process.equipment.powergeneration; import static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.logging.log4j.LogManager; diff --git a/src/test/java/neqsim/processsimulation/processequipment/pump/PumpChartTest.java b/src/test/java/neqsim/process/equipment/pump/PumpChartTest.java similarity index 93% rename from src/test/java/neqsim/processsimulation/processequipment/pump/PumpChartTest.java rename to src/test/java/neqsim/process/equipment/pump/PumpChartTest.java index f13fca6924..d65a42db91 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/pump/PumpChartTest.java +++ b/src/test/java/neqsim/process/equipment/pump/PumpChartTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.pump; +package neqsim.process.equipment.pump; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/processsimulation/processequipment/pump/PumpTest.java b/src/test/java/neqsim/process/equipment/pump/PumpTest.java similarity index 98% rename from src/test/java/neqsim/processsimulation/processequipment/pump/PumpTest.java rename to src/test/java/neqsim/process/equipment/pump/PumpTest.java index e362643d72..4f538aabff 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/pump/PumpTest.java +++ b/src/test/java/neqsim/process/equipment/pump/PumpTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.pump; +package neqsim.process.equipment.pump; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/processsimulation/processequipment/reservoir/SimpleReservoirTest.java b/src/test/java/neqsim/process/equipment/reservoir/SimpleReservoirTest.java similarity index 98% rename from src/test/java/neqsim/processsimulation/processequipment/reservoir/SimpleReservoirTest.java rename to src/test/java/neqsim/process/equipment/reservoir/SimpleReservoirTest.java index 885a62c916..926966e6fa 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/reservoir/SimpleReservoirTest.java +++ b/src/test/java/neqsim/process/equipment/reservoir/SimpleReservoirTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.reservoir; +package neqsim.process.equipment.reservoir; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/test/java/neqsim/processsimulation/processequipment/reservoir/WellFlowTest.java b/src/test/java/neqsim/process/equipment/reservoir/WellFlowTest.java similarity index 99% rename from src/test/java/neqsim/processsimulation/processequipment/reservoir/WellFlowTest.java rename to src/test/java/neqsim/process/equipment/reservoir/WellFlowTest.java index d30eb6791f..0a42388c92 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/reservoir/WellFlowTest.java +++ b/src/test/java/neqsim/process/equipment/reservoir/WellFlowTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.reservoir; +package neqsim.process.equipment.reservoir; import org.junit.jupiter.api.Test; import neqsim.process.equipment.pipeline.PipeBeggsAndBrills; diff --git a/src/test/java/neqsim/processsimulation/processequipment/separator/SeparatorTest.java b/src/test/java/neqsim/process/equipment/separator/SeparatorTest.java similarity index 59% rename from src/test/java/neqsim/processsimulation/processequipment/separator/SeparatorTest.java rename to src/test/java/neqsim/process/equipment/separator/SeparatorTest.java index a45ff3bf1a..9d65fd22bc 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/separator/SeparatorTest.java +++ b/src/test/java/neqsim/process/equipment/separator/SeparatorTest.java @@ -1,5 +1,6 @@ -package neqsim.processsimulation.processequipment.separator; +package neqsim.process.equipment.separator; +import static org.junit.jupiter.api.DynamicTest.stream; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -8,6 +9,7 @@ import neqsim.process.equipment.stream.StreamInterface; import neqsim.process.measurementdevice.LevelTransmitter; import neqsim.process.processmodel.ProcessSystem; +import neqsim.thermo.phase.PhaseType; import neqsim.thermo.system.SystemSrkCPAstatoil; /** @@ -65,4 +67,41 @@ public void testOnePhase() { processOps.run(); } + + @Test + public void testSimpleSeparator() { + neqsim.thermo.system.SystemSrkEos fluid1 = new neqsim.thermo.system.SystemSrkEos(280.0, 10.0); + fluid1.addComponent("water", 2.7); + fluid1.addComponent("nitrogen", 0.7); + fluid1.addComponent("CO2", 2.1); + fluid1.addComponent("methane", 70.0); + fluid1.addComponent("ethane", 10.0); + fluid1.addComponent("propane", 5.0); + fluid1.addComponent("i-butane", 3.0); + fluid1.addComponent("n-butane", 2.0); + fluid1.addComponent("i-pentane", 1.0); + fluid1.addComponent("n-pentane", 1.0); + fluid1.addTBPfraction("C6", 1.49985, 86.3 / 1000.0, 0.7432); + fluid1.addTBPfraction("C7", 0.49985, 103.3 / 1000.0, 0.76432); + fluid1.addTBPfraction("C8", 0.39985, 125.0 / 1000.0, 0.78432); + fluid1.addTBPfraction("C9", 0.49985, 145.0 / 1000.0, 0.79432); + fluid1.addTBPfraction("C10", 0.149985, 165.0 / 1000.0, 0.81); + fluid1.setMixingRule(2); + fluid1.setMultiPhaseCheck(true); + fluid1.setTemperature(55.0, "C"); + fluid1.setPressure(55.0, "bara"); + + + Stream feedStream = new Stream("feed fluid", fluid1); + Separator separator1 = new Separator("sep1", feedStream); + + processOps = new ProcessSystem(); + processOps.add(feedStream); + processOps.add(separator1); + processOps.run(); + + Assertions.assertEquals(0.1598175271755, + separator1.getFluid().getPhase(PhaseType.OIL).getBeta(), 1e-5); + + } } diff --git a/src/test/java/neqsim/processsimulation/processequipment/separator/ThreePhaseSeparatorTest.java b/src/test/java/neqsim/process/equipment/separator/ThreePhaseSeparatorTest.java similarity index 99% rename from src/test/java/neqsim/processsimulation/processequipment/separator/ThreePhaseSeparatorTest.java rename to src/test/java/neqsim/process/equipment/separator/ThreePhaseSeparatorTest.java index da14df8931..8b2e32f928 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/separator/ThreePhaseSeparatorTest.java +++ b/src/test/java/neqsim/process/equipment/separator/ThreePhaseSeparatorTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.separator; +package neqsim.process.equipment.separator; import java.util.ArrayList; import java.util.List; diff --git a/src/test/java/neqsim/processsimulation/processequipment/splitter/ComponentSplitterTest.java b/src/test/java/neqsim/process/equipment/splitter/ComponentSplitterTest.java similarity index 99% rename from src/test/java/neqsim/processsimulation/processequipment/splitter/ComponentSplitterTest.java rename to src/test/java/neqsim/process/equipment/splitter/ComponentSplitterTest.java index 7ca433f301..887aca9090 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/splitter/ComponentSplitterTest.java +++ b/src/test/java/neqsim/process/equipment/splitter/ComponentSplitterTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.splitter; +package neqsim.process.equipment.splitter; import static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.logging.log4j.LogManager; diff --git a/src/test/java/neqsim/processsimulation/processequipment/stream/StreamTest.java b/src/test/java/neqsim/process/equipment/stream/StreamTest.java similarity index 97% rename from src/test/java/neqsim/processsimulation/processequipment/stream/StreamTest.java rename to src/test/java/neqsim/process/equipment/stream/StreamTest.java index bafcc3fa84..2581763165 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/stream/StreamTest.java +++ b/src/test/java/neqsim/process/equipment/stream/StreamTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.stream; +package neqsim.process.equipment.stream; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/src/test/java/neqsim/processsimulation/processequipment/stream/VirtualStreamTest.java b/src/test/java/neqsim/process/equipment/stream/VirtualStreamTest.java similarity index 97% rename from src/test/java/neqsim/processsimulation/processequipment/stream/VirtualStreamTest.java rename to src/test/java/neqsim/process/equipment/stream/VirtualStreamTest.java index 15fc3817aa..588640caeb 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/stream/VirtualStreamTest.java +++ b/src/test/java/neqsim/process/equipment/stream/VirtualStreamTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.stream; +package neqsim.process.equipment.stream; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/neqsim/processsimulation/processequipment/util/AdjusterTest.java b/src/test/java/neqsim/process/equipment/util/AdjusterTest.java similarity index 98% rename from src/test/java/neqsim/processsimulation/processequipment/util/AdjusterTest.java rename to src/test/java/neqsim/process/equipment/util/AdjusterTest.java index 7f6624d003..bc6f69c94c 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/util/AdjusterTest.java +++ b/src/test/java/neqsim/process/equipment/util/AdjusterTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.util; +package neqsim.process.equipment.util; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/processsimulation/processequipment/util/FlowSetterTest.java b/src/test/java/neqsim/process/equipment/util/FlowSetterTest.java similarity index 99% rename from src/test/java/neqsim/processsimulation/processequipment/util/FlowSetterTest.java rename to src/test/java/neqsim/process/equipment/util/FlowSetterTest.java index e26d8650c6..16d4ca8cb8 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/util/FlowSetterTest.java +++ b/src/test/java/neqsim/process/equipment/util/FlowSetterTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.util; +package neqsim.process.equipment.util; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/processsimulation/processequipment/util/GORfitterTest.java b/src/test/java/neqsim/process/equipment/util/GORfitterTest.java similarity index 98% rename from src/test/java/neqsim/processsimulation/processequipment/util/GORfitterTest.java rename to src/test/java/neqsim/process/equipment/util/GORfitterTest.java index ebbc4580ab..d031146228 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/util/GORfitterTest.java +++ b/src/test/java/neqsim/process/equipment/util/GORfitterTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.util; +package neqsim.process.equipment.util; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/processsimulation/processequipment/util/MPFMfitterTest.java b/src/test/java/neqsim/process/equipment/util/MPFMfitterTest.java similarity index 97% rename from src/test/java/neqsim/processsimulation/processequipment/util/MPFMfitterTest.java rename to src/test/java/neqsim/process/equipment/util/MPFMfitterTest.java index 401363c516..f6345d7191 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/util/MPFMfitterTest.java +++ b/src/test/java/neqsim/process/equipment/util/MPFMfitterTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.util; +package neqsim.process.equipment.util; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/processsimulation/processequipment/util/PressureDropTest.java b/src/test/java/neqsim/process/equipment/util/PressureDropTest.java similarity index 95% rename from src/test/java/neqsim/processsimulation/processequipment/util/PressureDropTest.java rename to src/test/java/neqsim/process/equipment/util/PressureDropTest.java index 97e1c18d50..909bb61368 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/util/PressureDropTest.java +++ b/src/test/java/neqsim/process/equipment/util/PressureDropTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.util; +package neqsim.process.equipment.util; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/processsimulation/processequipment/util/StreamSaturatorUtilTest.java b/src/test/java/neqsim/process/equipment/util/StreamSaturatorUtilTest.java similarity index 98% rename from src/test/java/neqsim/processsimulation/processequipment/util/StreamSaturatorUtilTest.java rename to src/test/java/neqsim/process/equipment/util/StreamSaturatorUtilTest.java index 947966c4cf..b77a19297f 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/util/StreamSaturatorUtilTest.java +++ b/src/test/java/neqsim/process/equipment/util/StreamSaturatorUtilTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.util; +package neqsim.process.equipment.util; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/src/test/java/neqsim/processsimulation/processequipment/valve/ThrottlingValveTest.java b/src/test/java/neqsim/process/equipment/valve/ThrottlingValveTest.java similarity index 97% rename from src/test/java/neqsim/processsimulation/processequipment/valve/ThrottlingValveTest.java rename to src/test/java/neqsim/process/equipment/valve/ThrottlingValveTest.java index f4c94a24ce..c66214278e 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/valve/ThrottlingValveTest.java +++ b/src/test/java/neqsim/process/equipment/valve/ThrottlingValveTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.valve; +package neqsim.process.equipment.valve; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/processsimulation/measurementdevice/CombustionEmissionsCalculatorTest.java b/src/test/java/neqsim/process/measurementdevice/CombustionEmissionsCalculatorTest.java similarity index 95% rename from src/test/java/neqsim/processsimulation/measurementdevice/CombustionEmissionsCalculatorTest.java rename to src/test/java/neqsim/process/measurementdevice/CombustionEmissionsCalculatorTest.java index b97d456557..1e0633767c 100644 --- a/src/test/java/neqsim/processsimulation/measurementdevice/CombustionEmissionsCalculatorTest.java +++ b/src/test/java/neqsim/process/measurementdevice/CombustionEmissionsCalculatorTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/processsimulation/measurementdevice/FLowInducedVibrationTest.java b/src/test/java/neqsim/process/measurementdevice/FLowInducedVibrationTest.java similarity index 99% rename from src/test/java/neqsim/processsimulation/measurementdevice/FLowInducedVibrationTest.java rename to src/test/java/neqsim/process/measurementdevice/FLowInducedVibrationTest.java index 1f9ae0e167..030ddd2d7b 100644 --- a/src/test/java/neqsim/processsimulation/measurementdevice/FLowInducedVibrationTest.java +++ b/src/test/java/neqsim/process/measurementdevice/FLowInducedVibrationTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/processsimulation/measurementdevice/MultiPhaseMeterTest.java b/src/test/java/neqsim/process/measurementdevice/MultiPhaseMeterTest.java similarity index 97% rename from src/test/java/neqsim/processsimulation/measurementdevice/MultiPhaseMeterTest.java rename to src/test/java/neqsim/process/measurementdevice/MultiPhaseMeterTest.java index d54a261a35..933b136721 100644 --- a/src/test/java/neqsim/processsimulation/measurementdevice/MultiPhaseMeterTest.java +++ b/src/test/java/neqsim/process/measurementdevice/MultiPhaseMeterTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/processsimulation/measurementdevice/WellAllocatorTest.java b/src/test/java/neqsim/process/measurementdevice/WellAllocatorTest.java similarity index 98% rename from src/test/java/neqsim/processsimulation/measurementdevice/WellAllocatorTest.java rename to src/test/java/neqsim/process/measurementdevice/WellAllocatorTest.java index 68ad4e6268..6fa8cd6295 100644 --- a/src/test/java/neqsim/processsimulation/measurementdevice/WellAllocatorTest.java +++ b/src/test/java/neqsim/process/measurementdevice/WellAllocatorTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/test/java/neqsim/processsimulation/measurementdevice/nmVOCTest.java b/src/test/java/neqsim/process/measurementdevice/nmVOCTest.java similarity index 99% rename from src/test/java/neqsim/processsimulation/measurementdevice/nmVOCTest.java rename to src/test/java/neqsim/process/measurementdevice/nmVOCTest.java index b5d7935627..f18bab4eda 100644 --- a/src/test/java/neqsim/processsimulation/measurementdevice/nmVOCTest.java +++ b/src/test/java/neqsim/process/measurementdevice/nmVOCTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; diff --git a/src/test/java/neqsim/processsimulation/measurementdevice/pHProbeTest.java b/src/test/java/neqsim/process/measurementdevice/pHProbeTest.java similarity index 97% rename from src/test/java/neqsim/processsimulation/measurementdevice/pHProbeTest.java rename to src/test/java/neqsim/process/measurementdevice/pHProbeTest.java index 07a9ce7016..c25c625a7c 100644 --- a/src/test/java/neqsim/processsimulation/measurementdevice/pHProbeTest.java +++ b/src/test/java/neqsim/process/measurementdevice/pHProbeTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; import static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.logging.log4j.LogManager; diff --git a/src/test/java/neqsim/processsimulation/measurementdevice/simpleflowregime/SevereSlugTest.java b/src/test/java/neqsim/process/measurementdevice/simpleflowregime/SevereSlugTest.java similarity index 94% rename from src/test/java/neqsim/processsimulation/measurementdevice/simpleflowregime/SevereSlugTest.java rename to src/test/java/neqsim/process/measurementdevice/simpleflowregime/SevereSlugTest.java index a354980416..f6450ef490 100644 --- a/src/test/java/neqsim/processsimulation/measurementdevice/simpleflowregime/SevereSlugTest.java +++ b/src/test/java/neqsim/process/measurementdevice/simpleflowregime/SevereSlugTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.measurementdevice.simpleflowregime; +package neqsim.process.measurementdevice.simpleflowregime; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/processsimulation/mechanicaldesign/SystemMechanicalDesignTest.java b/src/test/java/neqsim/process/mechanicaldesign/SystemMechanicalDesignTest.java similarity index 99% rename from src/test/java/neqsim/processsimulation/mechanicaldesign/SystemMechanicalDesignTest.java rename to src/test/java/neqsim/process/mechanicaldesign/SystemMechanicalDesignTest.java index 36e1745b39..df3ac23a36 100644 --- a/src/test/java/neqsim/processsimulation/mechanicaldesign/SystemMechanicalDesignTest.java +++ b/src/test/java/neqsim/process/mechanicaldesign/SystemMechanicalDesignTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.mechanicaldesign; +package neqsim.process.mechanicaldesign; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/processsimulation/processsystem/CombinedOilGasFieldTest.java b/src/test/java/neqsim/process/processmodel/CombinedOilGasFieldTest.java similarity index 98% rename from src/test/java/neqsim/processsimulation/processsystem/CombinedOilGasFieldTest.java rename to src/test/java/neqsim/process/processmodel/CombinedOilGasFieldTest.java index 48e6a98414..722eba776d 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/CombinedOilGasFieldTest.java +++ b/src/test/java/neqsim/process/processmodel/CombinedOilGasFieldTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processsystem; +package neqsim.process.processmodel; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/processsimulation/processsystem/CompressorModule.java b/src/test/java/neqsim/process/processmodel/CompressorModule.java similarity index 99% rename from src/test/java/neqsim/processsimulation/processsystem/CompressorModule.java rename to src/test/java/neqsim/process/processmodel/CompressorModule.java index 2509fb3867..38991ce729 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/CompressorModule.java +++ b/src/test/java/neqsim/process/processmodel/CompressorModule.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processsystem; +package neqsim.process.processmodel; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/src/test/java/neqsim/processsimulation/processsystem/GlycolModulesTest.java b/src/test/java/neqsim/process/processmodel/GlycolModulesTest.java similarity index 99% rename from src/test/java/neqsim/processsimulation/processsystem/GlycolModulesTest.java rename to src/test/java/neqsim/process/processmodel/GlycolModulesTest.java index 027dda98fa..2e8ba2e02b 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/GlycolModulesTest.java +++ b/src/test/java/neqsim/process/processmodel/GlycolModulesTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processsystem; +package neqsim.process.processmodel; import org.junit.jupiter.api.Test; import neqsim.process.equipment.absorber.SimpleTEGAbsorber; diff --git a/src/test/java/neqsim/processsimulation/processsystem/GlycolRigTest.java b/src/test/java/neqsim/process/processmodel/GlycolRigTest.java similarity index 99% rename from src/test/java/neqsim/processsimulation/processsystem/GlycolRigTest.java rename to src/test/java/neqsim/process/processmodel/GlycolRigTest.java index 439fb59766..06c77e5711 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/GlycolRigTest.java +++ b/src/test/java/neqsim/process/processmodel/GlycolRigTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processsystem; +package neqsim.process.processmodel; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/test/java/neqsim/processsimulation/processsystem/MLA_bug_test.java b/src/test/java/neqsim/process/processmodel/MLA_bug_test.java similarity index 99% rename from src/test/java/neqsim/processsimulation/processsystem/MLA_bug_test.java rename to src/test/java/neqsim/process/processmodel/MLA_bug_test.java index 8099763e69..723009d943 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/MLA_bug_test.java +++ b/src/test/java/neqsim/process/processmodel/MLA_bug_test.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processsystem; +package neqsim.process.processmodel; import static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.logging.log4j.LogManager; diff --git a/src/test/java/neqsim/processsimulation/processsystem/OilGasProcessTest.java b/src/test/java/neqsim/process/processmodel/OilGasProcessTest.java similarity index 99% rename from src/test/java/neqsim/processsimulation/processsystem/OilGasProcessTest.java rename to src/test/java/neqsim/process/processmodel/OilGasProcessTest.java index 6de2aa2eee..b528ae93e3 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/OilGasProcessTest.java +++ b/src/test/java/neqsim/process/processmodel/OilGasProcessTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processsystem; +package neqsim.process.processmodel; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/processsimulation/processsystem/OilProcessTest.java b/src/test/java/neqsim/process/processmodel/OilProcessTest.java similarity index 91% rename from src/test/java/neqsim/processsimulation/processsystem/OilProcessTest.java rename to src/test/java/neqsim/process/processmodel/OilProcessTest.java index f3c63ae65f..bb871a1f16 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/OilProcessTest.java +++ b/src/test/java/neqsim/process/processmodel/OilProcessTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processsystem; +package neqsim.process.processmodel; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemControllerTest.java b/src/test/java/neqsim/process/processmodel/ProcessSystemControllerTest.java similarity index 98% rename from src/test/java/neqsim/processsimulation/processsystem/ProcessSystemControllerTest.java rename to src/test/java/neqsim/process/processmodel/ProcessSystemControllerTest.java index 12a86affe6..0ec1457890 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemControllerTest.java +++ b/src/test/java/neqsim/process/processmodel/ProcessSystemControllerTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processsystem; +package neqsim.process.processmodel; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemRunTransientTest.java b/src/test/java/neqsim/process/processmodel/ProcessSystemRunTransientTest.java similarity index 99% rename from src/test/java/neqsim/processsimulation/processsystem/ProcessSystemRunTransientTest.java rename to src/test/java/neqsim/process/processmodel/ProcessSystemRunTransientTest.java index a253ca6ccb..cf4cc2394b 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemRunTransientTest.java +++ b/src/test/java/neqsim/process/processmodel/ProcessSystemRunTransientTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processsystem; +package neqsim.process.processmodel; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Assertions; diff --git a/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemSerializationTest.java b/src/test/java/neqsim/process/processmodel/ProcessSystemSerializationTest.java similarity index 99% rename from src/test/java/neqsim/processsimulation/processsystem/ProcessSystemSerializationTest.java rename to src/test/java/neqsim/process/processmodel/ProcessSystemSerializationTest.java index dcbf60d2dc..5922cfb6c3 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemSerializationTest.java +++ b/src/test/java/neqsim/process/processmodel/ProcessSystemSerializationTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processsystem; +package neqsim.process.processmodel; import org.junit.jupiter.api.Test; import com.thoughtworks.xstream.XStream; diff --git a/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemTest.java b/src/test/java/neqsim/process/processmodel/ProcessSystemTest.java similarity index 99% rename from src/test/java/neqsim/processsimulation/processsystem/ProcessSystemTest.java rename to src/test/java/neqsim/process/processmodel/ProcessSystemTest.java index 8016f3c8a4..947563d3d2 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemTest.java +++ b/src/test/java/neqsim/process/processmodel/ProcessSystemTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processsystem; +package neqsim.process.processmodel; import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.ArrayList; diff --git a/src/test/java/neqsim/processsimulation/processsystem/ReferenceProcessTest.java b/src/test/java/neqsim/process/processmodel/ReferenceProcessTest.java similarity index 99% rename from src/test/java/neqsim/processsimulation/processsystem/ReferenceProcessTest.java rename to src/test/java/neqsim/process/processmodel/ReferenceProcessTest.java index f80a98d82c..62c2e161e9 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/ReferenceProcessTest.java +++ b/src/test/java/neqsim/process/processmodel/ReferenceProcessTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processsystem; +package neqsim.process.processmodel; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/processsimulation/processsystem/waterDegasserTest.java b/src/test/java/neqsim/process/processmodel/waterDegasserTest.java similarity index 99% rename from src/test/java/neqsim/processsimulation/processsystem/waterDegasserTest.java rename to src/test/java/neqsim/process/processmodel/waterDegasserTest.java index eacc3d9f21..9d0e545209 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/waterDegasserTest.java +++ b/src/test/java/neqsim/process/processmodel/waterDegasserTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processsystem; +package neqsim.process.processmodel; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/test/java/neqsim/processsimulation/util/example/LNGfilling.java b/src/test/java/neqsim/process/util/example/LNGfilling.java similarity index 97% rename from src/test/java/neqsim/processsimulation/util/example/LNGfilling.java rename to src/test/java/neqsim/process/util/example/LNGfilling.java index c5f5ce3cf1..3496aea927 100644 --- a/src/test/java/neqsim/processsimulation/util/example/LNGfilling.java +++ b/src/test/java/neqsim/process/util/example/LNGfilling.java @@ -4,7 +4,7 @@ * Created on 6. september 2006, 14:46 */ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.mixer.Mixer; import neqsim.process.equipment.stream.Stream; diff --git a/src/test/java/neqsim/processsimulation/util/example/LNGfilling2.java b/src/test/java/neqsim/process/util/example/LNGfilling2.java similarity index 97% rename from src/test/java/neqsim/processsimulation/util/example/LNGfilling2.java rename to src/test/java/neqsim/process/util/example/LNGfilling2.java index 4900c94882..8383eed6e0 100644 --- a/src/test/java/neqsim/processsimulation/util/example/LNGfilling2.java +++ b/src/test/java/neqsim/process/util/example/LNGfilling2.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.stream.Stream; import neqsim.process.equipment.stream.StreamInterface; diff --git a/src/test/java/neqsim/processsimulation/util/example/LNGtankfilling.java b/src/test/java/neqsim/process/util/example/LNGtankfilling.java similarity index 99% rename from src/test/java/neqsim/processsimulation/util/example/LNGtankfilling.java rename to src/test/java/neqsim/process/util/example/LNGtankfilling.java index e141658fd7..5b0d42ad61 100644 --- a/src/test/java/neqsim/processsimulation/util/example/LNGtankfilling.java +++ b/src/test/java/neqsim/process/util/example/LNGtankfilling.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.stream.Stream; import neqsim.process.equipment.tank.Tank; diff --git a/src/test/java/neqsim/processsimulation/util/example/MEGinjection.java b/src/test/java/neqsim/process/util/example/MEGinjection.java similarity index 99% rename from src/test/java/neqsim/processsimulation/util/example/MEGinjection.java rename to src/test/java/neqsim/process/util/example/MEGinjection.java index 406488f9d6..ac751d3bad 100644 --- a/src/test/java/neqsim/processsimulation/util/example/MEGinjection.java +++ b/src/test/java/neqsim/process/util/example/MEGinjection.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.heatexchanger.Heater; import neqsim.process.equipment.mixer.StaticMixer; diff --git a/src/test/java/neqsim/processsimulation/util/example/MasstransferMeOH.java b/src/test/java/neqsim/process/util/example/MasstransferMeOH.java similarity index 98% rename from src/test/java/neqsim/processsimulation/util/example/MasstransferMeOH.java rename to src/test/java/neqsim/process/util/example/MasstransferMeOH.java index 66e2ccd65c..9f2283f592 100644 --- a/src/test/java/neqsim/processsimulation/util/example/MasstransferMeOH.java +++ b/src/test/java/neqsim/process/util/example/MasstransferMeOH.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.mixer.StaticMixer; import neqsim.process.equipment.mixer.StaticPhaseMixer; diff --git a/src/test/java/neqsim/processsimulation/util/example/OffshoreProcess.java b/src/test/java/neqsim/process/util/example/OffshoreProcess.java similarity index 99% rename from src/test/java/neqsim/processsimulation/util/example/OffshoreProcess.java rename to src/test/java/neqsim/process/util/example/OffshoreProcess.java index 93decf4912..1cfe3db17f 100644 --- a/src/test/java/neqsim/processsimulation/util/example/OffshoreProcess.java +++ b/src/test/java/neqsim/process/util/example/OffshoreProcess.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.compressor.Compressor; import neqsim.process.equipment.mixer.Mixer; diff --git a/src/test/java/neqsim/processsimulation/util/example/OffshoreProcess2.java b/src/test/java/neqsim/process/util/example/OffshoreProcess2.java similarity index 98% rename from src/test/java/neqsim/processsimulation/util/example/OffshoreProcess2.java rename to src/test/java/neqsim/process/util/example/OffshoreProcess2.java index e8df49e303..fe6194d590 100644 --- a/src/test/java/neqsim/processsimulation/util/example/OffshoreProcess2.java +++ b/src/test/java/neqsim/process/util/example/OffshoreProcess2.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.mixer.Mixer; import neqsim.process.equipment.mixer.StaticPhaseMixer; diff --git a/src/test/java/neqsim/processsimulation/util/example/OffshoreProcess3.java b/src/test/java/neqsim/process/util/example/OffshoreProcess3.java similarity index 99% rename from src/test/java/neqsim/processsimulation/util/example/OffshoreProcess3.java rename to src/test/java/neqsim/process/util/example/OffshoreProcess3.java index 1d9c37fae7..f9380ccf0f 100644 --- a/src/test/java/neqsim/processsimulation/util/example/OffshoreProcess3.java +++ b/src/test/java/neqsim/process/util/example/OffshoreProcess3.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.compressor.Compressor; import neqsim.process.equipment.heatexchanger.Cooler; diff --git a/src/test/java/neqsim/processsimulation/util/example/OnshoreMEGprocess.java b/src/test/java/neqsim/process/util/example/OnshoreMEGprocess.java similarity index 99% rename from src/test/java/neqsim/processsimulation/util/example/OnshoreMEGprocess.java rename to src/test/java/neqsim/process/util/example/OnshoreMEGprocess.java index a195ed1d9b..ab76b002c5 100644 --- a/src/test/java/neqsim/processsimulation/util/example/OnshoreMEGprocess.java +++ b/src/test/java/neqsim/process/util/example/OnshoreMEGprocess.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.compressor.Compressor; import neqsim.process.equipment.distillation.Condenser; diff --git a/src/test/java/neqsim/processsimulation/util/example/OnshoreProcess1.java b/src/test/java/neqsim/process/util/example/OnshoreProcess1.java similarity index 99% rename from src/test/java/neqsim/processsimulation/util/example/OnshoreProcess1.java rename to src/test/java/neqsim/process/util/example/OnshoreProcess1.java index 615b274576..b20a8f009e 100644 --- a/src/test/java/neqsim/processsimulation/util/example/OnshoreProcess1.java +++ b/src/test/java/neqsim/process/util/example/OnshoreProcess1.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/test/java/neqsim/processsimulation/util/example/TEGAbsorberTest.java b/src/test/java/neqsim/process/util/example/TEGAbsorberTest.java similarity index 99% rename from src/test/java/neqsim/processsimulation/util/example/TEGAbsorberTest.java rename to src/test/java/neqsim/process/util/example/TEGAbsorberTest.java index 8793e9e24f..648fe7566d 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TEGAbsorberTest.java +++ b/src/test/java/neqsim/process/util/example/TEGAbsorberTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.absorber.SimpleTEGAbsorber; import neqsim.process.equipment.heatexchanger.ReBoiler; diff --git a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcess2.java b/src/test/java/neqsim/process/util/example/TEGdehydrationProcess2.java similarity index 99% rename from src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcess2.java rename to src/test/java/neqsim/process/util/example/TEGdehydrationProcess2.java index 094a28b439..839b1b28d1 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcess2.java +++ b/src/test/java/neqsim/process/util/example/TEGdehydrationProcess2.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.absorber.SimpleTEGAbsorber; import neqsim.process.equipment.absorber.WaterStripperColumn; diff --git a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillation.java b/src/test/java/neqsim/process/util/example/TEGdehydrationProcessDistillation.java similarity index 99% rename from src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillation.java rename to src/test/java/neqsim/process/util/example/TEGdehydrationProcessDistillation.java index b943a60dac..35b3ad947b 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillation.java +++ b/src/test/java/neqsim/process/util/example/TEGdehydrationProcessDistillation.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.absorber.SimpleTEGAbsorber; import neqsim.process.equipment.absorber.WaterStripperColumn; diff --git a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillation3.java b/src/test/java/neqsim/process/util/example/TEGdehydrationProcessDistillation3.java similarity index 99% rename from src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillation3.java rename to src/test/java/neqsim/process/util/example/TEGdehydrationProcessDistillation3.java index 861036a19b..db417d9e96 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillation3.java +++ b/src/test/java/neqsim/process/util/example/TEGdehydrationProcessDistillation3.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.absorber.SimpleTEGAbsorber; import neqsim.process.equipment.absorber.WaterStripperColumn; diff --git a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillationAaHa.java b/src/test/java/neqsim/process/util/example/TEGdehydrationProcessDistillationAaHa.java similarity index 99% rename from src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillationAaHa.java rename to src/test/java/neqsim/process/util/example/TEGdehydrationProcessDistillationAaHa.java index 3d490efd33..8e299aa208 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillationAaHa.java +++ b/src/test/java/neqsim/process/util/example/TEGdehydrationProcessDistillationAaHa.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.conditionmonitor.ConditionMonitor; import neqsim.process.equipment.absorber.SimpleTEGAbsorber; diff --git a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillationGFA.java b/src/test/java/neqsim/process/util/example/TEGdehydrationProcessDistillationGFA.java similarity index 99% rename from src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillationGFA.java rename to src/test/java/neqsim/process/util/example/TEGdehydrationProcessDistillationGFA.java index 5057796aad..15c91e3f0e 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillationGFA.java +++ b/src/test/java/neqsim/process/util/example/TEGdehydrationProcessDistillationGFA.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.conditionmonitor.ConditionMonitor; import neqsim.process.equipment.absorber.SimpleTEGAbsorber; diff --git a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillationJS.java b/src/test/java/neqsim/process/util/example/TEGdehydrationProcessDistillationJS.java similarity index 99% rename from src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillationJS.java rename to src/test/java/neqsim/process/util/example/TEGdehydrationProcessDistillationJS.java index 836b2562f8..1b6c180cfa 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillationJS.java +++ b/src/test/java/neqsim/process/util/example/TEGdehydrationProcessDistillationJS.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.absorber.SimpleTEGAbsorber; import neqsim.process.equipment.absorber.WaterStripperColumn; diff --git a/src/test/java/neqsim/processsimulation/util/example/TEGstripperProcess.java b/src/test/java/neqsim/process/util/example/TEGstripperProcess.java similarity index 98% rename from src/test/java/neqsim/processsimulation/util/example/TEGstripperProcess.java rename to src/test/java/neqsim/process/util/example/TEGstripperProcess.java index 7be5af4fee..d6cc4f79d2 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TEGstripperProcess.java +++ b/src/test/java/neqsim/process/util/example/TEGstripperProcess.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.absorber.WaterStripperColumn; import neqsim.process.equipment.stream.Stream; diff --git a/src/test/java/neqsim/processsimulation/util/example/TestMechanicalDesign.java b/src/test/java/neqsim/process/util/example/TestMechanicalDesign.java similarity index 98% rename from src/test/java/neqsim/processsimulation/util/example/TestMechanicalDesign.java rename to src/test/java/neqsim/process/util/example/TestMechanicalDesign.java index 34d0d05e9c..a30b548b70 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TestMechanicalDesign.java +++ b/src/test/java/neqsim/process/util/example/TestMechanicalDesign.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.separator.Separator; import neqsim.process.equipment.stream.Stream; diff --git a/src/test/java/neqsim/processsimulation/util/example/TestNeqsim.java b/src/test/java/neqsim/process/util/example/TestNeqsim.java similarity index 99% rename from src/test/java/neqsim/processsimulation/util/example/TestNeqsim.java rename to src/test/java/neqsim/process/util/example/TestNeqsim.java index c82a5ba398..398cda41c5 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TestNeqsim.java +++ b/src/test/java/neqsim/process/util/example/TestNeqsim.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.compressor.Compressor; import neqsim.process.equipment.stream.Stream; diff --git a/src/test/java/neqsim/processsimulation/util/example/TestOnlineProcess.java b/src/test/java/neqsim/process/util/example/TestOnlineProcess.java similarity index 97% rename from src/test/java/neqsim/processsimulation/util/example/TestOnlineProcess.java rename to src/test/java/neqsim/process/util/example/TestOnlineProcess.java index e9ce96110a..b70ce8a872 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TestOnlineProcess.java +++ b/src/test/java/neqsim/process/util/example/TestOnlineProcess.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.stream.Stream; import neqsim.process.equipment.valve.ThrottlingValve; diff --git a/src/test/java/neqsim/processsimulation/util/example/TestProcess4.java b/src/test/java/neqsim/process/util/example/TestProcess4.java similarity index 97% rename from src/test/java/neqsim/processsimulation/util/example/TestProcess4.java rename to src/test/java/neqsim/process/util/example/TestProcess4.java index 69a34c9933..c0f6bb7e4c 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TestProcess4.java +++ b/src/test/java/neqsim/process/util/example/TestProcess4.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.separator.Separator; import neqsim.process.equipment.stream.Stream; diff --git a/src/test/java/neqsim/processsimulation/util/example/TestSeparationTrain.java b/src/test/java/neqsim/process/util/example/TestSeparationTrain.java similarity index 99% rename from src/test/java/neqsim/processsimulation/util/example/TestSeparationTrain.java rename to src/test/java/neqsim/process/util/example/TestSeparationTrain.java index 7464b64d94..fee88080ad 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TestSeparationTrain.java +++ b/src/test/java/neqsim/process/util/example/TestSeparationTrain.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.compressor.Compressor; import neqsim.process.equipment.heatexchanger.Cooler; diff --git a/src/test/java/neqsim/processsimulation/util/example/TestSlugcatcher.java b/src/test/java/neqsim/process/util/example/TestSlugcatcher.java similarity index 98% rename from src/test/java/neqsim/processsimulation/util/example/TestSlugcatcher.java rename to src/test/java/neqsim/process/util/example/TestSlugcatcher.java index 13bc7a241a..534fca263e 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TestSlugcatcher.java +++ b/src/test/java/neqsim/process/util/example/TestSlugcatcher.java @@ -4,7 +4,7 @@ * Created on 30. juli 2007, 18:49 */ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.separator.ThreePhaseSeparator; import neqsim.process.equipment.stream.Stream; diff --git a/src/test/java/neqsim/processsimulation/util/example/TestTransientFlow.java b/src/test/java/neqsim/process/util/example/TestTransientFlow.java similarity index 99% rename from src/test/java/neqsim/processsimulation/util/example/TestTransientFlow.java rename to src/test/java/neqsim/process/util/example/TestTransientFlow.java index 491798332f..1ab2c09d86 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TestTransientFlow.java +++ b/src/test/java/neqsim/process/util/example/TestTransientFlow.java @@ -4,7 +4,7 @@ * Created on 8. oktober 2006, 13:13 */ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.controllerdevice.ControllerDeviceBaseClass; import neqsim.process.controllerdevice.ControllerDeviceInterface; diff --git a/src/test/java/neqsim/processsimulation/util/example/TestTransientFlow2.java b/src/test/java/neqsim/process/util/example/TestTransientFlow2.java similarity index 98% rename from src/test/java/neqsim/processsimulation/util/example/TestTransientFlow2.java rename to src/test/java/neqsim/process/util/example/TestTransientFlow2.java index 998312ce84..981978cbe8 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TestTransientFlow2.java +++ b/src/test/java/neqsim/process/util/example/TestTransientFlow2.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.controllerdevice.ControllerDeviceBaseClass; import neqsim.process.controllerdevice.ControllerDeviceInterface; diff --git a/src/test/java/neqsim/processsimulation/util/example/WellStreamMixer.java b/src/test/java/neqsim/process/util/example/WellStreamMixer.java similarity index 98% rename from src/test/java/neqsim/processsimulation/util/example/WellStreamMixer.java rename to src/test/java/neqsim/process/util/example/WellStreamMixer.java index 92ca50c5df..6c72be05ea 100644 --- a/src/test/java/neqsim/processsimulation/util/example/WellStreamMixer.java +++ b/src/test/java/neqsim/process/util/example/WellStreamMixer.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.mixer.Mixer; import neqsim.process.equipment.mixer.StaticMixer; diff --git a/src/test/java/neqsim/processsimulation/util/example/compressorTest.java b/src/test/java/neqsim/process/util/example/compressorTest.java similarity index 97% rename from src/test/java/neqsim/processsimulation/util/example/compressorTest.java rename to src/test/java/neqsim/process/util/example/compressorTest.java index e1f42b8bd5..a611f5da6f 100644 --- a/src/test/java/neqsim/processsimulation/util/example/compressorTest.java +++ b/src/test/java/neqsim/process/util/example/compressorTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.compressor.Compressor; import neqsim.process.equipment.mixer.MixerInterface; diff --git a/src/test/java/neqsim/processsimulation/util/example/compressorTest12.java b/src/test/java/neqsim/process/util/example/compressorTest12.java similarity index 98% rename from src/test/java/neqsim/processsimulation/util/example/compressorTest12.java rename to src/test/java/neqsim/process/util/example/compressorTest12.java index 4f8b753dac..aa1abb0526 100644 --- a/src/test/java/neqsim/processsimulation/util/example/compressorTest12.java +++ b/src/test/java/neqsim/process/util/example/compressorTest12.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import org.junit.jupiter.api.Test; import neqsim.process.equipment.compressor.Compressor; diff --git a/src/test/java/neqsim/processsimulation/util/example/compressorTest_1.java b/src/test/java/neqsim/process/util/example/compressorTest_1.java similarity index 98% rename from src/test/java/neqsim/processsimulation/util/example/compressorTest_1.java rename to src/test/java/neqsim/process/util/example/compressorTest_1.java index 79ee64d2ac..27ec72e168 100644 --- a/src/test/java/neqsim/processsimulation/util/example/compressorTest_1.java +++ b/src/test/java/neqsim/process/util/example/compressorTest_1.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/test/java/neqsim/processsimulation/util/example/destillation1.java b/src/test/java/neqsim/process/util/example/destillation1.java similarity index 98% rename from src/test/java/neqsim/processsimulation/util/example/destillation1.java rename to src/test/java/neqsim/process/util/example/destillation1.java index 0502948cd9..066b383441 100644 --- a/src/test/java/neqsim/processsimulation/util/example/destillation1.java +++ b/src/test/java/neqsim/process/util/example/destillation1.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.distillation.Condenser; import neqsim.process.equipment.distillation.DistillationColumn; diff --git a/src/test/java/neqsim/processsimulation/util/example/destillation2.java b/src/test/java/neqsim/process/util/example/destillation2.java similarity index 97% rename from src/test/java/neqsim/processsimulation/util/example/destillation2.java rename to src/test/java/neqsim/process/util/example/destillation2.java index 68ce50cd97..fee00bb7b6 100644 --- a/src/test/java/neqsim/processsimulation/util/example/destillation2.java +++ b/src/test/java/neqsim/process/util/example/destillation2.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.distillation.DistillationColumn; import neqsim.process.equipment.stream.Stream; diff --git a/src/test/java/neqsim/processsimulation/util/example/expander1.java b/src/test/java/neqsim/process/util/example/expander1.java similarity index 97% rename from src/test/java/neqsim/processsimulation/util/example/expander1.java rename to src/test/java/neqsim/process/util/example/expander1.java index 6f26892fca..cf7400e461 100644 --- a/src/test/java/neqsim/processsimulation/util/example/expander1.java +++ b/src/test/java/neqsim/process/util/example/expander1.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.stream.Stream; diff --git a/src/test/java/neqsim/processsimulation/util/example/gasPipeline.java b/src/test/java/neqsim/process/util/example/gasPipeline.java similarity index 98% rename from src/test/java/neqsim/processsimulation/util/example/gasPipeline.java rename to src/test/java/neqsim/process/util/example/gasPipeline.java index d496cbb958..9af1e49559 100644 --- a/src/test/java/neqsim/processsimulation/util/example/gasPipeline.java +++ b/src/test/java/neqsim/process/util/example/gasPipeline.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.pipeline.AdiabaticPipe; import neqsim.process.equipment.pipeline.AdiabaticTwoPhasePipe; diff --git a/src/test/java/neqsim/processsimulation/util/example/multiThreadTest.java b/src/test/java/neqsim/process/util/example/multiThreadTest.java similarity index 99% rename from src/test/java/neqsim/processsimulation/util/example/multiThreadTest.java rename to src/test/java/neqsim/process/util/example/multiThreadTest.java index 3e7c34c5b8..3b6d6c28a1 100644 --- a/src/test/java/neqsim/processsimulation/util/example/multiThreadTest.java +++ b/src/test/java/neqsim/process/util/example/multiThreadTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/test/java/neqsim/processsimulation/util/example/oxygenRemovalWater.java b/src/test/java/neqsim/process/util/example/oxygenRemovalWater.java similarity index 98% rename from src/test/java/neqsim/processsimulation/util/example/oxygenRemovalWater.java rename to src/test/java/neqsim/process/util/example/oxygenRemovalWater.java index 341dcfc0b6..0a99de0730 100644 --- a/src/test/java/neqsim/processsimulation/util/example/oxygenRemovalWater.java +++ b/src/test/java/neqsim/process/util/example/oxygenRemovalWater.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.heatexchanger.Heater; import neqsim.process.equipment.mixer.Mixer; diff --git a/src/test/java/neqsim/processsimulation/util/example/process1.java b/src/test/java/neqsim/process/util/example/process1.java similarity index 98% rename from src/test/java/neqsim/processsimulation/util/example/process1.java rename to src/test/java/neqsim/process/util/example/process1.java index 1a55d84c28..bab899f5ee 100644 --- a/src/test/java/neqsim/processsimulation/util/example/process1.java +++ b/src/test/java/neqsim/process/util/example/process1.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.stream.Stream; import neqsim.thermodynamicoperations.ThermodynamicOperations; diff --git a/src/test/java/neqsim/processsimulation/util/example/process1Test.java b/src/test/java/neqsim/process/util/example/process1Test.java similarity index 96% rename from src/test/java/neqsim/processsimulation/util/example/process1Test.java rename to src/test/java/neqsim/process/util/example/process1Test.java index be3a606034..6691cd102d 100644 --- a/src/test/java/neqsim/processsimulation/util/example/process1Test.java +++ b/src/test/java/neqsim/process/util/example/process1Test.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/processsimulation/util/example/process2.java b/src/test/java/neqsim/process/util/example/process2.java similarity index 98% rename from src/test/java/neqsim/processsimulation/util/example/process2.java rename to src/test/java/neqsim/process/util/example/process2.java index 0f3eee28d2..ccd869cdbb 100644 --- a/src/test/java/neqsim/processsimulation/util/example/process2.java +++ b/src/test/java/neqsim/process/util/example/process2.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.heatexchanger.Heater; import neqsim.process.equipment.mixer.MixerInterface; diff --git a/src/test/java/neqsim/processsimulation/util/example/processCO2MDEA.java b/src/test/java/neqsim/process/util/example/processCO2MDEA.java similarity index 97% rename from src/test/java/neqsim/processsimulation/util/example/processCO2MDEA.java rename to src/test/java/neqsim/process/util/example/processCO2MDEA.java index ff228c0f56..cc0dff2ee8 100644 --- a/src/test/java/neqsim/processsimulation/util/example/processCO2MDEA.java +++ b/src/test/java/neqsim/process/util/example/processCO2MDEA.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.pipeline.Pipeline; import neqsim.process.equipment.pipeline.TwoPhasePipeLine; diff --git a/src/test/java/neqsim/processsimulation/util/example/propaneCoolingCycle.java b/src/test/java/neqsim/process/util/example/propaneCoolingCycle.java similarity index 98% rename from src/test/java/neqsim/processsimulation/util/example/propaneCoolingCycle.java rename to src/test/java/neqsim/process/util/example/propaneCoolingCycle.java index 75383ad3c2..ed3da47669 100644 --- a/src/test/java/neqsim/processsimulation/util/example/propaneCoolingCycle.java +++ b/src/test/java/neqsim/process/util/example/propaneCoolingCycle.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.compressor.Compressor; import neqsim.process.equipment.heatexchanger.Cooler; diff --git a/src/test/java/neqsim/processsimulation/util/example/propaneMultiStageCoolingCycle.java b/src/test/java/neqsim/process/util/example/propaneMultiStageCoolingCycle.java similarity index 99% rename from src/test/java/neqsim/processsimulation/util/example/propaneMultiStageCoolingCycle.java rename to src/test/java/neqsim/process/util/example/propaneMultiStageCoolingCycle.java index 1427e715ff..6aad038b9f 100644 --- a/src/test/java/neqsim/processsimulation/util/example/propaneMultiStageCoolingCycle.java +++ b/src/test/java/neqsim/process/util/example/propaneMultiStageCoolingCycle.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.heatexchanger.HeatExchanger; import neqsim.process.equipment.separator.Separator; diff --git a/src/test/java/neqsim/processsimulation/util/example/propaneTwoStageCoolingCycle.java b/src/test/java/neqsim/process/util/example/propaneTwoStageCoolingCycle.java similarity index 99% rename from src/test/java/neqsim/processsimulation/util/example/propaneTwoStageCoolingCycle.java rename to src/test/java/neqsim/process/util/example/propaneTwoStageCoolingCycle.java index 2fb097136a..f214f2e94c 100644 --- a/src/test/java/neqsim/processsimulation/util/example/propaneTwoStageCoolingCycle.java +++ b/src/test/java/neqsim/process/util/example/propaneTwoStageCoolingCycle.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.compressor.Compressor; import neqsim.process.equipment.heatexchanger.Cooler; diff --git a/src/test/java/neqsim/processsimulation/util/example/shtokman.java b/src/test/java/neqsim/process/util/example/shtokman.java similarity index 98% rename from src/test/java/neqsim/processsimulation/util/example/shtokman.java rename to src/test/java/neqsim/process/util/example/shtokman.java index 27936cbe60..bbb3cbd9d7 100644 --- a/src/test/java/neqsim/processsimulation/util/example/shtokman.java +++ b/src/test/java/neqsim/process/util/example/shtokman.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.separator.Separator; import neqsim.process.equipment.stream.Stream; diff --git a/src/test/java/neqsim/processsimulation/util/example/shtokman_MEG.java b/src/test/java/neqsim/process/util/example/shtokman_MEG.java similarity index 97% rename from src/test/java/neqsim/processsimulation/util/example/shtokman_MEG.java rename to src/test/java/neqsim/process/util/example/shtokman_MEG.java index 4442e73e47..8df9870eec 100644 --- a/src/test/java/neqsim/processsimulation/util/example/shtokman_MEG.java +++ b/src/test/java/neqsim/process/util/example/shtokman_MEG.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/test/java/neqsim/processsimulation/util/example/simpleGasScrubber.java b/src/test/java/neqsim/process/util/example/simpleGasScrubber.java similarity index 97% rename from src/test/java/neqsim/processsimulation/util/example/simpleGasScrubber.java rename to src/test/java/neqsim/process/util/example/simpleGasScrubber.java index 6d0514c050..009530c56e 100644 --- a/src/test/java/neqsim/processsimulation/util/example/simpleGasScrubber.java +++ b/src/test/java/neqsim/process/util/example/simpleGasScrubber.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.separator.GasScrubberSimple; import neqsim.process.equipment.stream.Stream; diff --git a/src/test/java/neqsim/processsimulation/util/example/simpleTopSideProcess.java b/src/test/java/neqsim/process/util/example/simpleTopSideProcess.java similarity index 98% rename from src/test/java/neqsim/processsimulation/util/example/simpleTopSideProcess.java rename to src/test/java/neqsim/process/util/example/simpleTopSideProcess.java index 20936867bc..e38238411f 100644 --- a/src/test/java/neqsim/processsimulation/util/example/simpleTopSideProcess.java +++ b/src/test/java/neqsim/process/util/example/simpleTopSideProcess.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.compressor.Compressor; import neqsim.process.equipment.heatexchanger.Heater; diff --git a/src/test/java/neqsim/processsimulation/util/example/simpleTopSideProcess2.java b/src/test/java/neqsim/process/util/example/simpleTopSideProcess2.java similarity index 98% rename from src/test/java/neqsim/processsimulation/util/example/simpleTopSideProcess2.java rename to src/test/java/neqsim/process/util/example/simpleTopSideProcess2.java index 1cc6da0a96..4caa2899b1 100644 --- a/src/test/java/neqsim/processsimulation/util/example/simpleTopSideProcess2.java +++ b/src/test/java/neqsim/process/util/example/simpleTopSideProcess2.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.heatexchanger.Heater; import neqsim.process.equipment.mixer.Mixer; diff --git a/src/test/java/neqsim/processsimulation/util/example/testGasScrubber.java b/src/test/java/neqsim/process/util/example/testGasScrubber.java similarity index 99% rename from src/test/java/neqsim/processsimulation/util/example/testGasScrubber.java rename to src/test/java/neqsim/process/util/example/testGasScrubber.java index d7ca8dad13..bf53cbebb3 100644 --- a/src/test/java/neqsim/processsimulation/util/example/testGasScrubber.java +++ b/src/test/java/neqsim/process/util/example/testGasScrubber.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/test/java/neqsim/processsimulation/util/example/threePhaseSeparation.java b/src/test/java/neqsim/process/util/example/threePhaseSeparation.java similarity index 98% rename from src/test/java/neqsim/processsimulation/util/example/threePhaseSeparation.java rename to src/test/java/neqsim/process/util/example/threePhaseSeparation.java index 9a5865f055..8a39dd97dc 100644 --- a/src/test/java/neqsim/processsimulation/util/example/threePhaseSeparation.java +++ b/src/test/java/neqsim/process/util/example/threePhaseSeparation.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.separator.ThreePhaseSeparator; import neqsim.process.equipment.stream.Stream; diff --git a/src/test/java/neqsim/processsimulation/util/example/threePhaseSeparation_1.java b/src/test/java/neqsim/process/util/example/threePhaseSeparation_1.java similarity index 98% rename from src/test/java/neqsim/processsimulation/util/example/threePhaseSeparation_1.java rename to src/test/java/neqsim/process/util/example/threePhaseSeparation_1.java index f420896eb7..8c4b3d5449 100644 --- a/src/test/java/neqsim/processsimulation/util/example/threePhaseSeparation_1.java +++ b/src/test/java/neqsim/process/util/example/threePhaseSeparation_1.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.separator.ThreePhaseSeparator; import neqsim.process.equipment.stream.Stream; diff --git a/src/test/java/neqsim/processsimulation/util/monitor/SeparatorResponseTest.java b/src/test/java/neqsim/process/util/monitor/SeparatorResponseTest.java similarity index 98% rename from src/test/java/neqsim/processsimulation/util/monitor/SeparatorResponseTest.java rename to src/test/java/neqsim/process/util/monitor/SeparatorResponseTest.java index 9174441ddc..a25423446b 100644 --- a/src/test/java/neqsim/processsimulation/util/monitor/SeparatorResponseTest.java +++ b/src/test/java/neqsim/process/util/monitor/SeparatorResponseTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.monitor; +package neqsim.process.util.monitor; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/processsimulation/util/report/FluidCompinentReportTest.java b/src/test/java/neqsim/process/util/report/FluidCompinentReportTest.java similarity index 92% rename from src/test/java/neqsim/processsimulation/util/report/FluidCompinentReportTest.java rename to src/test/java/neqsim/process/util/report/FluidCompinentReportTest.java index 2b30323dcf..12f0ba5197 100644 --- a/src/test/java/neqsim/processsimulation/util/report/FluidCompinentReportTest.java +++ b/src/test/java/neqsim/process/util/report/FluidCompinentReportTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.report; +package neqsim.process.util.report; import org.junit.jupiter.api.Test; import neqsim.thermo.system.SystemSrkEos; diff --git a/src/test/java/neqsim/processsimulation/util/report/FluidReportTest.java b/src/test/java/neqsim/process/util/report/FluidReportTest.java similarity index 94% rename from src/test/java/neqsim/processsimulation/util/report/FluidReportTest.java rename to src/test/java/neqsim/process/util/report/FluidReportTest.java index 10d199e19b..df85974467 100644 --- a/src/test/java/neqsim/processsimulation/util/report/FluidReportTest.java +++ b/src/test/java/neqsim/process/util/report/FluidReportTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.report; +package neqsim.process.util.report; import org.junit.jupiter.api.Test; import neqsim.thermo.system.SystemSrkEos; diff --git a/src/test/java/neqsim/processsimulation/util/report/ReportTest.java b/src/test/java/neqsim/process/util/report/ReportTest.java similarity index 97% rename from src/test/java/neqsim/processsimulation/util/report/ReportTest.java rename to src/test/java/neqsim/process/util/report/ReportTest.java index 38555f39e3..01a8dc43e2 100644 --- a/src/test/java/neqsim/processsimulation/util/report/ReportTest.java +++ b/src/test/java/neqsim/process/util/report/ReportTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.report; +package neqsim.process.util.report; import org.junit.jupiter.api.Test; import neqsim.process.equipment.compressor.Compressor;