From 9d7c6b4d6218dcfa1be69c01073163de277910a7 Mon Sep 17 00:00:00 2001 From: Even Solbraa <41290109+EvenSol@users.noreply.github.com> Date: Sun, 3 Sep 2023 20:45:24 +0000 Subject: [PATCH] added test for pump curve calculations --- .../processSimulation/processEquipment/pump/Pump.java | 2 +- .../processSimulation/processEquipment/pump/PumpTest.java | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/java/neqsim/processSimulation/processEquipment/pump/Pump.java b/src/main/java/neqsim/processSimulation/processEquipment/pump/Pump.java index 464b82fbb..8163cff91 100644 --- 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 index a9c005a02..24a8688a4 100644 --- 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); }