add test (#855)

equinor · Nov 21, 2023 · 2acb28a · 2acb28a
1 parent 6737353
commit 2acb28a
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 2 deletions.
diff --git a/src/main/java/neqsim/util/unit/PressureUnit.java b/src/main/java/neqsim/util/unit/PressureUnit.java
@@ -39,10 +39,15 @@ public double getValue(String tounit) {
     if (tounit.equals("barg")) {
       return (getConversionFactor(inunit) / getConversionFactor("bara")) * invalue
           - ThermodynamicConstantsInterface.referencePressure;
-    }
-    if (inunit.equals("barg")) {
+    } else if (inunit.equals("barg")) {
       return (getConversionFactor(inunit) / getConversionFactor("bara")) * invalue
           + ThermodynamicConstantsInterface.referencePressure;
+    } else if (tounit.equals("atm")) {
+      return (getConversionFactor(inunit) / getConversionFactor("bara")) * invalue
+          / ThermodynamicConstantsInterface.referencePressure;
+    } else if (inunit.equals("atm")) {
+      return (getConversionFactor(inunit) / getConversionFactor("bara")) * invalue
+          * ThermodynamicConstantsInterface.referencePressure;
     } else {
       return getConversionFactor(inunit) / getConversionFactor(tounit) * invalue;
     }
@@ -74,9 +79,15 @@ public double getConversionFactor(String name) {
       case "Pa":
         conversionFactor = 1.0e-5;
         break;
+      case "kPa":
+        conversionFactor = 1.0e-2;
+        break;
       case "MPa":
         conversionFactor = 10.0;
         break;
+      case "atm":
+        conversionFactor = 1.0;
+        break;
       default:
         throw new RuntimeException(
             new InvalidInputException(this, "getConversionFactor", name, "unit not supproted"));

diff --git a/src/test/java/neqsim/util/unit/PressureUnitTest.java b/src/test/java/neqsim/util/unit/PressureUnitTest.java
@@ -0,0 +1,45 @@
+package neqsim.util.unit;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
+import neqsim.thermo.ThermodynamicConstantsInterface;
+import neqsim.thermodynamicOperations.ThermodynamicOperations;
+
+class PressureUnitTest extends neqsim.NeqSimTest {
+
+  /**
+   * <p>
+   * testSetPressure
+   * </p>
+   */
+  @Test
+  public void testSetPressure() {
+    neqsim.thermo.system.SystemPrEos fluid = new neqsim.thermo.system.SystemPrEos(298.0, 10.0);
+    fluid.addComponent("nitrogen", 1.0);
+    fluid.addComponent("water", 1.0);
+    fluid.setPressure(0.0, "barg");
+
+    ThermodynamicOperations testOps = new ThermodynamicOperations(fluid);
+    testOps.TPflash();
+    fluid.initProperties();
+
+    assertEquals(ThermodynamicConstantsInterface.referencePressure, fluid.getPressure("bara"),
+        1e-4);
+    assertEquals(0.0, fluid.getPressure("barg"), 1e-4);
+    assertEquals(1.01325, fluid.getPressure("bara"), 1e-4);
+    assertEquals(101325.0, fluid.getPressure("Pa"), 1e-4);
+    assertEquals(101.3250, fluid.getPressure("kPa"), 1e-4);
+    assertEquals(1.0, fluid.getPressure("atm"), 1e-4);
+
+    fluid.setPressure(11.0, "bara");
+    testOps.TPflash();
+
+    assertEquals(11.0, fluid.getPressure(), 1e-4);
+    assertEquals(11.0 - 1.01325, fluid.getPressure("barg"), 1e-4);
+    assertEquals(11.0, fluid.getPressure("bara"), 1e-4);
+    assertEquals(11.0e5, fluid.getPressure("Pa"), 1e-4);
+    assertEquals(11e2, fluid.getPressure("kPa"), 1e-4);
+    assertEquals(1.0, fluid.getPressure("atm"), 1e-4);
+  }
+}
+