added getPressure() setPressure() (#543)

* added getPressure() setPressure() * update * added setPressure * update
equinor · May 22, 2023 · bd1d502 · bd1d502
1 parent a74a7dc
commit bd1d502
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 6 deletions.
diff --git a/src/main/java/neqsim/processSimulation/processEquipment/ProcessEquipmentBaseClass.java b/src/main/java/neqsim/processSimulation/processEquipment/ProcessEquipmentBaseClass.java
@@ -191,12 +191,21 @@ public boolean isSetEnergyStream() {
   /** {@inheritDoc} */
   @Override
   public double getPressure() {
-    return 1.0;
+    return getFluid().getPressure();
   }
 
   /** {@inheritDoc} */
   @Override
-  public void setPressure(double pressure) {}
+  public double getPressure(String unit) {
+    return getFluid().getPressure(unit);
+  }
+
+
+   /** {@inheritDoc} */
+   @Override
+   public void setPressure(double pressure) {
+     getFluid().setPressure(pressure);
+   }
 
   /** {@inheritDoc} */
   @Override
@@ -253,12 +262,15 @@ public int hashCode() {
   /** {@inheritDoc} */
   @Override
   public boolean equals(Object obj) {
-    if (this == obj)
+    if (this == obj) {
       return true;
-    if (obj == null)
+    }
+    if (obj == null) {
       return false;
-    if (getClass() != obj.getClass())
+    }
+    if (getClass() != obj.getClass()) {
       return false;
+    }
     ProcessEquipmentBaseClass other = (ProcessEquipmentBaseClass) obj;
     return Objects.equals(conditionAnalysisMessage, other.conditionAnalysisMessage)
         && Objects.equals(controller, other.controller)

diff --git a/src/main/java/neqsim/processSimulation/processEquipment/ProcessEquipmentInterface.java b/src/main/java/neqsim/processSimulation/processEquipment/ProcessEquipmentInterface.java
@@ -93,7 +93,7 @@ public interface ProcessEquipmentInterface extends SimulationInterface, java.io.
    *
    * @return a {@link neqsim.thermo.system.SystemInterface} object
    */
-  default public SystemInterface getFluid() {
+  public default SystemInterface getFluid() {
     return getThermoSystem();
   }
 
@@ -134,6 +134,16 @@ default public SystemInterface getFluid() {
    */
   public void setPressure(double pressure);
 
+  /**
+   * <p>
+   * getPressure.
+   * </p>
+   * 
+   * @param unit a {@link java.lang.String} object
+   * 
+   **/
+  public double getPressure(String unit);
+
   /**
    * <p>
    * runConditionAnalysis.

diff --git a/src/main/java/neqsim/processSimulation/processSystem/ProcessModuleBaseClass.java b/src/main/java/neqsim/processSimulation/processSystem/ProcessModuleBaseClass.java
@@ -223,4 +223,16 @@ public String getConditionAnalysisMessage() {
   public String[][] getResultTable() {
     return null;
   }
+
+  /**
+   * <p>
+   * getPressure.
+   * </p>
+   * 
+   * @param unit a {@link java.lang.String} object
+   * 
+   **/
+  public double getPressure(String unit) {
+    return 1.0;
+  }
 }