fix bugs (#1166)

* fix bugs

* update path

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.
    * </p>
    *
-   * @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.
    * </p>
    *
-   * @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) {
    * </p>
    *
    * @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) {
    * </p>
    *
    * @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) {

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);

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();
 }

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} */

src/test/java/neqsim/processsimulation/controllerdevice/ControllerDeviceBaseClassTest.java → 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;

src/test/java/neqsim/processsimulation/processequipment/absorber/SimpleAbsorberTest.java → 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;

src/test/java/neqsim/processsimulation/processequipment/adsorber/SimpleAdsorberTest.java → 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;

src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorCalculationTest.java → 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;

src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorChartTest.java → 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;

src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorPropertyProfileTest.java → 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;

src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorTest.java → 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;

src/test/java/neqsim/processsimulation/processequipment/distillation/DistillationColumnTest.java → 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;

src/test/java/neqsim/processsimulation/processequipment/heatexchanger/HeatExchangerTest.java → 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;

src/test/java/neqsim/processsimulation/processequipment/heatexchanger/HeaterTest.java → 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;

src/test/java/neqsim/processsimulation/processequipment/manifold/ManifoldTest.java → 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;

src/test/java/neqsim/processsimulation/processequipment/mixer/MixerTest.java → 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;

src/test/java/neqsim/processsimulation/processequipment/pipeline/AdiabaticTwoPhasePipeTest.java → 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;

src/test/java/neqsim/processsimulation/processequipment/pipeline/BeggsAndBrillsPipeTest.java → 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;

src/test/java/neqsim/processsimulation/processequipment/pipeline/PipelineTest.java → 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;

src/test/java/neqsim/processsimulation/processequipment/powergeneration/GasTurbineTest.java → 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;

src/test/java/neqsim/processsimulation/processequipment/pump/PumpChartTest.java → 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;

src/test/java/neqsim/processsimulation/processequipment/pump/PumpTest.java → 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;

src/test/java/neqsim/processsimulation/processequipment/reservoir/SimpleReservoirTest.java → 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;

src/test/java/neqsim/processsimulation/processequipment/reservoir/WellFlowTest.java → 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;

src/test/java/neqsim/processsimulation/processequipment/separator/SeparatorTest.java → 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);
+
+  }
 }

src/test/java/neqsim/processsimulation/processequipment/separator/ThreePhaseSeparatorTest.java → 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;

src/test/java/neqsim/processsimulation/processequipment/splitter/ComponentSplitterTest.java → 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;

src/test/java/neqsim/processsimulation/processequipment/stream/StreamTest.java → 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;

src/test/java/neqsim/processsimulation/processequipment/stream/VirtualStreamTest.java → 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;

src/test/java/neqsim/processsimulation/processequipment/util/AdjusterTest.java → 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;

src/test/java/neqsim/processsimulation/processequipment/util/FlowSetterTest.java → 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;

src/test/java/neqsim/processsimulation/processequipment/util/GORfitterTest.java → 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;

src/test/java/neqsim/processsimulation/processequipment/util/MPFMfitterTest.java → 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;

src/test/java/neqsim/processsimulation/processequipment/util/PressureDropTest.java → 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;

src/test/java/neqsim/processsimulation/processequipment/util/StreamSaturatorUtilTest.java → 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;

src/test/java/neqsim/processsimulation/processequipment/valve/ThrottlingValveTest.java → 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;

src/test/java/neqsim/processsimulation/measurementdevice/CombustionEmissionsCalculatorTest.java → 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;

src/test/java/neqsim/processsimulation/measurementdevice/FLowInducedVibrationTest.java → 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;

src/test/java/neqsim/processsimulation/measurementdevice/MultiPhaseMeterTest.java → 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;

src/test/java/neqsim/processsimulation/measurementdevice/WellAllocatorTest.java → 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;

src/test/java/neqsim/processsimulation/measurementdevice/nmVOCTest.java → 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;

src/test/java/neqsim/processsimulation/measurementdevice/pHProbeTest.java → 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;

src/test/java/neqsim/processsimulation/measurementdevice/simpleflowregime/SevereSlugTest.java → 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;

src/test/java/neqsim/processsimulation/mechanicaldesign/SystemMechanicalDesignTest.java → 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;

src/test/java/neqsim/processsimulation/processsystem/CombinedOilGasFieldTest.java → 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;

src/test/java/neqsim/processsimulation/processsystem/CompressorModule.java → 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;