added RVP and TVP methods (#992)

equinor · Apr 29, 2024 · 96a62f0 · 96a62f0
1 parent 87f5c4a
commit 96a62f0
Show file tree

Hide file tree

Showing 5 changed files with 105 additions and 9 deletions.
diff --git a/src/main/java/neqsim/processSimulation/processEquipment/stream/Stream.java b/src/main/java/neqsim/processSimulation/processEquipment/stream/Stream.java
@@ -15,6 +15,7 @@
 import neqsim.processSimulation.processEquipment.ProcessEquipmentBaseClass;
 import neqsim.processSimulation.util.monitor.StreamResponse;
 import neqsim.standards.gasQuality.Standard_ISO6976;
+import neqsim.standards.oilQuality.Standard_ASTM_D6377;
 import neqsim.thermo.system.SystemInterface;
 import neqsim.thermodynamicOperations.ThermodynamicOperations;
 
@@ -443,8 +444,6 @@ public String[][] getResultTable() {
     return getFluid().calcResultTable();
   }
 
-
-
   /** {@inheritDoc} */
   @Override
   public void runTransient(double dt, UUID id) {
@@ -550,6 +549,29 @@ public double TVP(double temperature, String unit) {
     return localSyst.getPressure();
   }
 
+  /** {@inheritDoc} */
+  @Override
+  public double getTVP(double referenceTemperature, String unit, String returnUnit) {
+    SystemInterface localSyst = getFluid().clone();
+    localSyst.setTemperature(referenceTemperature, unit);
+    ThermodynamicOperations ops = new ThermodynamicOperations(localSyst);
+    try {
+      ops.bubblePointPressureFlash(false);
+    } catch (Exception ex) {
+    }
+    return localSyst.getPressure(returnUnit);
+  }
+
+  /** {@inheritDoc} */
+  @Override
+  public double getRVP(double referenceTemperature, String unit, String returnUnit) {
+    SystemInterface localSyst = getFluid().clone();
+    Standard_ASTM_D6377 standard = new Standard_ASTM_D6377(localSyst);
+    standard.setReferenceTemperature(referenceTemperature, unit);
+    standard.calculate();
+    return standard.getValue("RVP", returnUnit);
+  }
+
   /** {@inheritDoc} */
   @Override
   public String[][] reportResults() {

diff --git a/src/main/java/neqsim/processSimulation/processEquipment/stream/StreamInterface.java b/src/main/java/neqsim/processSimulation/processEquipment/stream/StreamInterface.java
@@ -129,6 +129,30 @@ public default double getFlowRate(String unit) {
    */
   public double TVP(double temperature, String unit);
 
+  /**
+   * <p>
+   * TVP.
+   * </p>
+   *
+   * @param referenceTemperature a double
+   * @param unit a {@link java.lang.String} object
+   * @param returnUnit a {@link java.lang.String} object
+   * @return a double
+   */
+  public double getTVP(double referenceTemperature, String unit, String returnUnit);
+
+  /**
+   * <p>
+   * TVP.
+   * </p>
+   *
+   * @param referenceTemperature a double
+   * @param unit a {@link java.lang.String} object
+   * @param returnUnit a {@link java.lang.String} object
+   * @return a double
+   */
+  public double getRVP(double referenceTemperature, String unit, String returnUnit);
+
   /**
    * <p>
    * setFluid.

diff --git a/src/main/java/neqsim/standards/Standard.java b/src/main/java/neqsim/standards/Standard.java
@@ -41,7 +41,7 @@ public abstract class Standard extends NamedBaseClass implements StandardInterfa
   /**
    * Constructor for Standard.
    *
-   * @param name name of standard
+   * @param name        name of standard
    * @param description description
    */
   public Standard(String name, String description) {
@@ -52,8 +52,8 @@ public Standard(String name, String description) {
   /**
    * Constructor for Standard.
    *
-   * @param name name of standard
-   * @param thermoSyst input fluid
+   * @param name        name of standard
+   * @param thermoSyst  input fluid
    * @param description description of standard
    */
   public Standard(String name, String description, SystemInterface thermoSyst) {
@@ -161,7 +161,7 @@ public void display(String name) {
     Container dialogContentPane = dialog.getContentPane();
     dialogContentPane.setLayout(new BorderLayout());
 
-    String[] names = {"", "Phase 1", "Phase 2", "Phase 3", "Unit"};
+    String[] names = { "", "Phase 1", "Phase 2", "Phase 3", "Unit" };
     String[][] table = createTable(name);
     JTable Jtab = new JTable(table, names);
     JScrollPane scrollpane = new JScrollPane(Jtab);

diff --git a/src/main/java/neqsim/standards/oilQuality/Standard_ASTM_D6377.java b/src/main/java/neqsim/standards/oilQuality/Standard_ASTM_D6377.java
@@ -21,6 +21,9 @@ public class Standard_ASTM_D6377 extends neqsim.standards.Standard {
 
   String unit = "bara";
   double RVP = 1.0;
+  double TVP = 1.0;
+  double referenceTemperature = 37.8;
+  String referenceTemperatureUnit = "C";
 
   /**
    * <p>
@@ -36,7 +39,7 @@ public Standard_ASTM_D6377(SystemInterface thermoSystem) {
   /** {@inheritDoc} */
   @Override
   public void calculate() {
-    this.thermoSystem.setTemperature(273.15 + 37.8);
+    this.thermoSystem.setTemperature(referenceTemperature, "C");
     this.thermoSystem.setPressure(ThermodynamicConstantsInterface.referencePressure);
     this.thermoOps = new ThermodynamicOperations(thermoSystem);
     try {
@@ -45,7 +48,7 @@ public void calculate() {
       logger.error(ex.getMessage(), ex);
     }
 
-    // double TVP = this.thermoSystem.getPressure();
+    TVP = this.thermoSystem.getPressure();
     double liquidVolume = thermoSystem.getVolume();
 
     this.thermoSystem.setPressure(0.9);
@@ -73,7 +76,16 @@ public String getUnit(String returnParameter) {
   /** {@inheritDoc} */
   @Override
   public double getValue(String returnParameter, java.lang.String returnUnit) {
-    return RVP;
+    if (returnParameter == "RVP") {
+      neqsim.util.unit.PressureUnit presConversion = new neqsim.util.unit.PressureUnit(RVP, "bara");
+      return presConversion.getValue(returnUnit);
+    }
+    if (returnParameter == "TVP") {
+      neqsim.util.unit.PressureUnit presConversion = new neqsim.util.unit.PressureUnit(TVP, "bara");
+      return presConversion.getValue(returnUnit);
+    } else {
+      return RVP;
+    }
   }
 
   /** {@inheritDoc} */
@@ -82,6 +94,20 @@ public double getValue(String returnParameter) {
     return RVP;
   }
 
+  /**
+   * <p>
+   * setReferenceTemperature.
+   * </p>
+   *
+   * @param refTemp a double
+   * @param refTempUnit a {@link java.lang.String} object
+   */
+  public void setReferenceTemperature(double refTemp, String refTempUnit) {
+    neqsim.util.unit.TemperatureUnit tempConversion =
+        new neqsim.util.unit.TemperatureUnit(refTemp, refTempUnit);
+    referenceTemperature = tempConversion.getValue(refTemp, refTempUnit, "C");
+  }
+
   /**
    * <p>
    * main.

diff --git a/src/test/java/neqsim/standards/oilQuality/Standard_ASTM_D6377Test.java b/src/test/java/neqsim/standards/oilQuality/Standard_ASTM_D6377Test.java
@@ -0,0 +1,24 @@
+package neqsim.standards.oilQuality;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import neqsim.thermo.system.SystemInterface;
+import neqsim.thermo.system.SystemSrkEos;
+
+public class Standard_ASTM_D6377Test {
+  @Test
+  void testCalculate() {
+    SystemInterface testSystem = new SystemSrkEos(273.15 + 2.0, 1.0);
+    testSystem.addComponent("methane", 0.0006538);
+    testSystem.addComponent("ethane", 0.006538);
+    testSystem.addComponent("propane", 0.006538);
+    testSystem.addComponent("n-pentane", 0.545);
+    testSystem.setMixingRule(2);
+    testSystem.init(0);
+    Standard_ASTM_D6377 standard = new Standard_ASTM_D6377(testSystem);
+    standard.setReferenceTemperature(37.8, "C");
+    standard.calculate();
+    Assertions.assertEquals(0.7298246193, standard.getValue("RVP", "bara"), 1e-3);
+    Assertions.assertEquals(1.8710732396722, standard.getValue("TVP", "bara"), 1e-3);
+  }
+}