added test for pump curve calculations

equinor · Sep 3, 2023 · 9d7c6b4 · 9d7c6b4
1 parent 17a96fd
commit 9d7c6b4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/main/java/neqsim/processSimulation/processEquipment/pump/Pump.java b/src/main/java/neqsim/processSimulation/processEquipment/pump/Pump.java
@@ -169,7 +169,7 @@ public void run(UUID id) {
       thermoOps.TPflash();
       thermoSystem.init(3);
     } else {
-      if (calculateAsCompressor) {
+      if (!pumpChart.isUsePumpChart() && calculateAsCompressor) {
         thermoSystem = inStream.getThermoSystem().clone();
         thermoSystem.setPressure(pressure, pressureUnit);
         // System.out.println("entropy inn.." + entropy);

diff --git a/src/test/java/neqsim/processSimulation/processEquipment/pump/PumpTest.java b/src/test/java/neqsim/processSimulation/processEquipment/pump/PumpTest.java
@@ -1,5 +1,6 @@
 package neqsim.processSimulation.processEquipment.pump;
 
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import neqsim.processSimulation.processEquipment.stream.Stream;
 
@@ -92,17 +93,12 @@ void testSimplePumpCurve() {
         80.5229826589649, 79.2210931638144, 75.4719133864634, 69.6034181197298, 58.7322388482707}};
 
     Pump pump1 = new Pump("pump1", feedC10Stream);
-    pump1.setOutletPressure(10);
-    // pump1.run();
     pump1.getPumpChart().setCurves(chartConditions, speed, flow, head, polyEff);
     pump1.getPumpChart().setHeadUnit("meter");
     pump1.setSpeed(500);
-    pump1.calculateAsCompressor(false);
-    // pump1.setusePumpChart()
     pump1.run();
 
-    pump1.getFluid().prettyPrint();
-
+    Assertions.assertEquals(7.274237081101, pump1.getOutletPressure(), 1e-5);
 
   }