update

pom.xml

@@ -13,7 +13,7 @@
 	<version>${revision}${sha1}${changelist}</version>
 
 	<properties>
-		<revision>3.0.2</revision>
+		<revision>3.0.5</revision>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<sha1/>
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>com.thoughtworks.xstream</groupId>
 			<artifactId>xstream</artifactId>
-			<version>1.4.20</version>
+			<version>1.4.21</version>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>

pomJava21.xml

@@ -13,7 +13,7 @@
 	<version>${revision}${sha1}${changelist}</version>
 
 	<properties>
-		<revision>3.0.2</revision>
+		<revision>3.0.5</revision>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<sha1/>
@@ -52,7 +52,7 @@
 		<dependency>
 			<groupId>com.thoughtworks.xstream</groupId>
 			<artifactId>xstream</artifactId>
-			<version>1.4.20</version>
+			<version>1.4.21</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>

pomJava8.xml

@@ -13,7 +13,7 @@
 	<version>${revision}${sha1}${changelist}-Java8</version>
 
 	<properties>
-		<revision>3.0.2</revision>
+		<revision>3.0.5</revision>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<sha1 />
@@ -62,7 +62,7 @@
 		<dependency>
 			<groupId>com.thoughtworks.xstream</groupId>
 			<artifactId>xstream</artifactId>
-			<version>1.4.20</version>
+			<version>1.4.21</version>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>

src/main/java/neqsim/mathlib/nonlinearsolver/NewtonRhapson.java

@@ -153,8 +153,8 @@ public double solve(double xin) {
         xNew2 = xNew;
       }
 
-      if (xNew < 0) {
-        xNew = 0;
+      if (xNew < -0.99) {
+        xNew = -0.99;
         // System.out.println("x++...........");
       }
       if (xNew > 1.5) {

src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/PFCTViscosityMethodMod86.java

@@ -182,8 +182,8 @@ public double getRefComponentViscosity(double temp, double pres) {
     visRefG = (1.0 - HTAN) / 2.0;
     double viscRef3 = visRefG * Math.exp(viscRefK[0] + viscRefK[3] / temp) * (temp6 - 1.0);
 
-    System.out.println("ref visc2 " + viscRef2);
-    System.out.println("ref visc3 " + viscRef3);
+    // System.out.println("ref visc2 " + viscRef2);
+    // System.out.println("ref visc3 " + viscRef3);
     double refVisc = (viscRefO + viscRef1 + viscRef2 + viscRef3) / 1.0e7;
     // System.out.println("ref visc " + refVisc);
     return refVisc;

src/main/java/neqsim/processsimulation/SimulationBaseClass.java → src/main/java/neqsim/process/SimulationBaseClass.java

@@ -1,4 +1,4 @@
-package neqsim.processsimulation;
+package neqsim.process;
 
 import java.util.UUID;
 import neqsim.util.NamedBaseClass;

src/main/java/neqsim/processsimulation/SimulationInterface.java → src/main/java/neqsim/process/SimulationInterface.java

@@ -1,4 +1,4 @@
-package neqsim.processsimulation;
+package neqsim.process;
 
 import java.io.Serializable;
 import java.util.UUID;

src/main/java/neqsim/processsimulation/conditionmonitor/ConditionMonitor.java → src/main/java/neqsim/process/conditionmonitor/ConditionMonitor.java

@@ -1,7 +1,7 @@
-package neqsim.processsimulation.conditionmonitor;
+package neqsim.process.conditionmonitor;
 
 import java.util.ArrayList;
-import neqsim.processsimulation.processsystem.ProcessSystem;
+import neqsim.process.processmodel.ProcessSystem;
 
 /**
  * <p>
@@ -29,7 +29,7 @@ public ConditionMonitor() {}
    * Constructor for ConditionMonitor.
    * </p>
    *
-   * @param refprocess a {@link neqsim.processsimulation.processsystem.ProcessSystem} object
+   * @param refprocess a {@link neqsim.process.processmodel.ProcessSystem} object
    */
   public ConditionMonitor(ProcessSystem refprocess) {
     this.refprocess = refprocess;
@@ -44,12 +44,12 @@ public ConditionMonitor(ProcessSystem refprocess) {
    * @param unitName a {@link java.lang.String} object
    */
   public void conditionAnalysis(String unitName) {
-    neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass refUn =
-        (neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass) refprocess
+    neqsim.process.equipment.ProcessEquipmentBaseClass refUn =
+        (neqsim.process.equipment.ProcessEquipmentBaseClass) refprocess
             .getUnit(unitName);
-    ((neqsim.processsimulation.processequipment.ProcessEquipmentInterface) process
+    ((neqsim.process.equipment.ProcessEquipmentInterface) process
         .getUnit(unitName)).runConditionAnalysis(refUn);
-    report += ((neqsim.processsimulation.processequipment.ProcessEquipmentInterface) process
+    report += ((neqsim.process.equipment.ProcessEquipmentInterface) process
         .getUnit(unitName)).getConditionAnalysisMessage();
   }
 
@@ -81,7 +81,7 @@ public String getReport() {
    * Getter for the field <code>process</code>.
    * </p>
    *
-   * @return a {@link neqsim.processsimulation.processsystem.ProcessSystem} object
+   * @return a {@link neqsim.process.processmodel.ProcessSystem} object
    */
   public ProcessSystem getProcess() {
     return process;

src/main/java/neqsim/processsimulation/conditionmonitor/ConditionMonitorSpecifications.java → src/main/java/neqsim/process/conditionmonitor/ConditionMonitorSpecifications.java

@@ -1,4 +1,4 @@
-package neqsim.processsimulation.conditionmonitor;
+package neqsim.process.conditionmonitor;
 
 /**
  * <p>

src/main/java/neqsim/processsimulation/controllerdevice/ControllerDeviceBaseClass.java → src/main/java/neqsim/process/controllerdevice/ControllerDeviceBaseClass.java

@@ -4,12 +4,12 @@
  * Created on 10. oktober 2006, 19:59
  */
 
-package neqsim.processsimulation.controllerdevice;
+package neqsim.process.controllerdevice;
 
 import java.util.UUID;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import neqsim.processsimulation.measurementdevice.MeasurementDeviceInterface;
+import neqsim.process.measurementdevice.MeasurementDeviceInterface;
 import neqsim.util.NamedBaseClass;
 
 /**

src/main/java/neqsim/processsimulation/controllerdevice/ControllerDeviceInterface.java → src/main/java/neqsim/process/controllerdevice/ControllerDeviceInterface.java

@@ -1,7 +1,7 @@
-package neqsim.processsimulation.controllerdevice;
+package neqsim.process.controllerdevice;
 
 import java.util.UUID;
-import neqsim.processsimulation.measurementdevice.MeasurementDeviceInterface;
+import neqsim.process.measurementdevice.MeasurementDeviceInterface;
 
 /**
  * <p>
@@ -53,7 +53,7 @@ public interface ControllerDeviceInterface extends java.io.Serializable {
    * setTransmitter.
    * </p>
    *
-   * @param device a {@link neqsim.processsimulation.measurementdevice.MeasurementDeviceInterface}
+   * @param device a {@link neqsim.process.measurementdevice.MeasurementDeviceInterface}
    *        object
    */
   public void setTransmitter(MeasurementDeviceInterface device);

src/main/java/neqsim/processsimulation/costestimation/CostEstimateBaseClass.java → src/main/java/neqsim/process/costestimation/CostEstimateBaseClass.java

@@ -1,11 +1,11 @@
-package neqsim.processsimulation.costestimation;
+package neqsim.process.costestimation;
 
 import java.util.ArrayList;
 import java.util.Objects;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import neqsim.processsimulation.mechanicaldesign.SystemMechanicalDesign;
-import neqsim.processsimulation.processequipment.ProcessEquipmentInterface;
+import neqsim.process.equipment.ProcessEquipmentInterface;
+import neqsim.process.mechanicaldesign.SystemMechanicalDesign;
 
 /**
  * <p>
@@ -27,7 +27,7 @@ public class CostEstimateBaseClass implements java.io.Serializable {
    * Constructor for CostEstimateBaseClass.
    * </p>
    *
-   * @param processdesign a {@link neqsim.processsimulation.mechanicaldesign.SystemMechanicalDesign}
+   * @param processdesign a {@link neqsim.process.mechanicaldesign.SystemMechanicalDesign}
    *        object
    */
   public CostEstimateBaseClass(SystemMechanicalDesign processdesign) {
@@ -39,7 +39,7 @@ public CostEstimateBaseClass(SystemMechanicalDesign processdesign) {
    * Constructor for CostEstimateBaseClass.
    * </p>
    *
-   * @param processdesign a {@link neqsim.processsimulation.mechanicaldesign.SystemMechanicalDesign}
+   * @param processdesign a {@link neqsim.process.mechanicaldesign.SystemMechanicalDesign}
    * @param costFactor cost factor
    */
   public CostEstimateBaseClass(SystemMechanicalDesign processdesign, double costFactor) {

src/main/java/neqsim/processsimulation/costestimation/UnitCostEstimateBaseClass.java → src/main/java/neqsim/process/costestimation/UnitCostEstimateBaseClass.java

@@ -1,7 +1,7 @@
-package neqsim.processsimulation.costestimation;
+package neqsim.process.costestimation;
 
 import java.util.Objects;
-import neqsim.processsimulation.mechanicaldesign.MechanicalDesign;
+import neqsim.process.mechanicaldesign.MechanicalDesign;
 
 /**
  * <p>
@@ -29,7 +29,7 @@ public UnitCostEstimateBaseClass() {}
    * Constructor for UnitCostEstimateBaseClass.
    * </p>
    *
-   * @param mechanicalEquipment a {@link neqsim.processsimulation.mechanicaldesign.MechanicalDesign}
+   * @param mechanicalEquipment a {@link neqsim.process.mechanicaldesign.MechanicalDesign}
    *        object
    */
   public UnitCostEstimateBaseClass(MechanicalDesign mechanicalEquipment) {

src/main/java/neqsim/processsimulation/costestimation/compressor/CompressorCostEstimate.java → src/main/java/neqsim/process/costestimation/compressor/CompressorCostEstimate.java

@@ -1,7 +1,7 @@
-package neqsim.processsimulation.costestimation.compressor;
+package neqsim.process.costestimation.compressor;
 
-import neqsim.processsimulation.costestimation.UnitCostEstimateBaseClass;
-import neqsim.processsimulation.mechanicaldesign.compressor.CompressorMechanicalDesign;
+import neqsim.process.costestimation.UnitCostEstimateBaseClass;
+import neqsim.process.mechanicaldesign.compressor.CompressorMechanicalDesign;
 
 /**
  * <p>
@@ -20,7 +20,7 @@ public class CompressorCostEstimate extends UnitCostEstimateBaseClass {
    * </p>
    *
    * @param mechanicalEquipment a
-   *        {@link neqsim.processsimulation.mechanicaldesign.compressor.CompressorMechanicalDesign}
+   *        {@link neqsim.process.mechanicaldesign.compressor.CompressorMechanicalDesign}
    *        object
    */
   public CompressorCostEstimate(CompressorMechanicalDesign mechanicalEquipment) {

src/main/java/neqsim/processsimulation/costestimation/separator/SeparatorCostEstimate.java → src/main/java/neqsim/process/costestimation/separator/SeparatorCostEstimate.java

@@ -1,7 +1,7 @@
-package neqsim.processsimulation.costestimation.separator;
+package neqsim.process.costestimation.separator;
 
-import neqsim.processsimulation.costestimation.UnitCostEstimateBaseClass;
-import neqsim.processsimulation.mechanicaldesign.separator.SeparatorMechanicalDesign;
+import neqsim.process.costestimation.UnitCostEstimateBaseClass;
+import neqsim.process.mechanicaldesign.separator.SeparatorMechanicalDesign;
 
 /**
  * <p>
@@ -20,7 +20,7 @@ public class SeparatorCostEstimate extends UnitCostEstimateBaseClass {
    * </p>
    *
    * @param mechanicalEquipment a
-   *        {@link neqsim.processsimulation.mechanicaldesign.separator.SeparatorMechanicalDesign}
+   *        {@link neqsim.process.mechanicaldesign.separator.SeparatorMechanicalDesign}
    *        object
    */
   public SeparatorCostEstimate(SeparatorMechanicalDesign mechanicalEquipment) {

src/main/java/neqsim/processsimulation/costestimation/valve/ValveCostEstimate.java → src/main/java/neqsim/process/costestimation/valve/ValveCostEstimate.java

@@ -1,7 +1,7 @@
-package neqsim.processsimulation.costestimation.valve;
+package neqsim.process.costestimation.valve;
 
-import neqsim.processsimulation.costestimation.UnitCostEstimateBaseClass;
-import neqsim.processsimulation.mechanicaldesign.valve.ValveMechanicalDesign;
+import neqsim.process.costestimation.UnitCostEstimateBaseClass;
+import neqsim.process.mechanicaldesign.valve.ValveMechanicalDesign;
 
 /**
  * <p>
@@ -20,7 +20,7 @@ public class ValveCostEstimate extends UnitCostEstimateBaseClass {
    * </p>
    *
    * @param mechanicalEquipment a
-   *        {@link neqsim.processsimulation.mechanicaldesign.valve.ValveMechanicalDesign} object
+   *        {@link neqsim.process.mechanicaldesign.valve.ValveMechanicalDesign} object
    */
   public ValveCostEstimate(ValveMechanicalDesign mechanicalEquipment) {
     super(mechanicalEquipment);

src/main/java/neqsim/processsimulation/processequipment/ProcessEquipmentBaseClass.java → src/main/java/neqsim/process/equipment/ProcessEquipmentBaseClass.java

@@ -4,18 +4,18 @@
  * Created on 6. juni 2006, 15:12
  */
 
-package neqsim.processsimulation.processequipment;
+package neqsim.process.equipment;
 
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Objects;
 import java.util.UUID;
 import org.apache.commons.lang.SerializationUtils;
-import neqsim.processsimulation.SimulationBaseClass;
-import neqsim.processsimulation.controllerdevice.ControllerDeviceInterface;
-import neqsim.processsimulation.mechanicaldesign.MechanicalDesign;
-import neqsim.processsimulation.processequipment.stream.EnergyStream;
-import neqsim.processsimulation.util.report.Report;
+import neqsim.process.SimulationBaseClass;
+import neqsim.process.controllerdevice.ControllerDeviceInterface;
+import neqsim.process.equipment.stream.EnergyStream;
+import neqsim.process.mechanicaldesign.MechanicalDesign;
+import neqsim.process.util.report.Report;
 import neqsim.thermo.system.SystemInterface;
 
 /**
@@ -102,7 +102,7 @@ public void setController(ControllerDeviceInterface controller) {
    * Setter for the field <code>flowValveController</code>.
    * </p>
    *
-   * @param controller a {@link neqsim.processsimulation.controllerdevice.ControllerDeviceInterface}
+   * @param controller a {@link neqsim.process.controllerdevice.ControllerDeviceInterface}
    *        object
    */
   public void setFlowValveController(ControllerDeviceInterface controller) {
@@ -154,7 +154,7 @@ public boolean solved() {
    * Getter for the field <code>energyStream</code>.
    * </p>
    *
-   * @return a {@link neqsim.processsimulation.processequipment.stream.EnergyStream} object
+   * @return a {@link neqsim.process.equipment.stream.EnergyStream} object
    */
   public EnergyStream getEnergyStream() {
     return energyStream;
@@ -165,7 +165,7 @@ public EnergyStream getEnergyStream() {
    * Setter for the field <code>energyStream</code>.
    * </p>
    *
-   * @param energyStream a {@link neqsim.processsimulation.processequipment.stream.EnergyStream}
+   * @param energyStream a {@link neqsim.process.equipment.stream.EnergyStream}
    *        object
    */
   public void setEnergyStream(EnergyStream energyStream) {

src/main/java/neqsim/processsimulation/processequipment/ProcessEquipmentInterface.java → src/main/java/neqsim/process/equipment/ProcessEquipmentInterface.java

@@ -1,8 +1,8 @@
-package neqsim.processsimulation.processequipment;
+package neqsim.process.equipment;
 
-import neqsim.processsimulation.SimulationInterface;
-import neqsim.processsimulation.controllerdevice.ControllerDeviceInterface;
-import neqsim.processsimulation.mechanicaldesign.MechanicalDesign;
+import neqsim.process.SimulationInterface;
+import neqsim.process.controllerdevice.ControllerDeviceInterface;
+import neqsim.process.mechanicaldesign.MechanicalDesign;
 import neqsim.thermo.system.SystemInterface;
 
 /**
@@ -35,7 +35,7 @@ default void initMechanicalDesign() {}
    * Get a <code>mechanicalDesign</code> for the equipment.
    * </p>
    *
-   * @return a {@link neqsim.processsimulation.mechanicaldesign.MechanicalDesign} object
+   * @return a {@link neqsim.process.mechanicaldesign.MechanicalDesign} object
    */
   public MechanicalDesign getMechanicalDesign();
 
@@ -89,7 +89,7 @@ public default boolean needRecalculation() {
    * setController.
    * </p>
    *
-   * @param controller a {@link neqsim.processsimulation.controllerdevice.ControllerDeviceInterface}
+   * @param controller a {@link neqsim.process.controllerdevice.ControllerDeviceInterface}
    *        object
    */
   public void setController(ControllerDeviceInterface controller);
@@ -99,7 +99,7 @@ public default boolean needRecalculation() {
    * getController.
    * </p>
    *
-   * @return a {@link neqsim.processsimulation.controllerdevice.ControllerDeviceInterface} object
+   * @return a {@link neqsim.process.controllerdevice.ControllerDeviceInterface} object
    */
   public ControllerDeviceInterface getController();
 
@@ -167,7 +167,7 @@ public default SystemInterface getFluid() {
    * </p>
    *
    * @param refExchanger a
-   *        {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} object
+   *        {@link neqsim.process.equipment.ProcessEquipmentInterface} object
    */
   public void runConditionAnalysis(ProcessEquipmentInterface refExchanger);
 

src/main/java/neqsim/processsimulation/processequipment/TwoPortEquipment.java → src/main/java/neqsim/process/equipment/TwoPortEquipment.java

@@ -1,6 +1,6 @@
-package neqsim.processsimulation.processequipment;
+package neqsim.process.equipment;
 
-import neqsim.processsimulation.processequipment.stream.StreamInterface;
+import neqsim.process.equipment.stream.StreamInterface;
 
 /**
  * Abstract class defining ProcessEquipment with one inlet and one outlet.