Test-large-combined-model2 (#1219)

* try to solve error * dont run mixer calcs for one single input stream * test update * update * update * update
equinor · Dec 30, 2024 · 67e9fcc · 67e9fcc
1 parent afdbcef
commit 67e9fcc
Show file tree

Hide file tree

Showing 4 changed files with 292 additions and 133 deletions.
diff --git a/src/main/java/neqsim/process/equipment/mixer/Mixer.java b/src/main/java/neqsim/process/equipment/mixer/Mixer.java
@@ -207,7 +207,7 @@ public void run(UUID id) {
     mixedStream.setThermoSystem(thermoSystem2);
     // thermoSystem2.display();
     ThermodynamicOperations testOps = new ThermodynamicOperations(thermoSystem2);
-    if (streams.size() > 0) {
+    if (streams.size() >= 2) {
       mixedStream.getThermoSystem().setNumberOfPhases(2);
       mixedStream.getThermoSystem().init(0);
 
@@ -221,33 +221,37 @@ public void run(UUID id) {
         mixedStream.getThermoSystem().setTemperature(guessTemperature());
       }
       // System.out.println("filan temp " + mixedStream.getTemperature());
-    }
-    if (isSetOutTemperature) {
-      if (!Double.isNaN(getOutTemperature())) {
-        mixedStream.getThermoSystem().setTemperature(getOutTemperature());
-      }
-      testOps.TPflash();
-      mixedStream.getThermoSystem().init(2);
-    } else {
-      try {
-        testOps.PHflash(enthalpy, 0);
-      } catch (Exception ex) {
-        logger.error(ex.getMessage(), ex);
+
+      if (isSetOutTemperature) {
         if (!Double.isNaN(getOutTemperature())) {
           mixedStream.getThermoSystem().setTemperature(getOutTemperature());
         }
         testOps.TPflash();
+        mixedStream.getThermoSystem().init(2);
+      } else {
+        try {
+          testOps.PHflash(enthalpy, 0);
+        } catch (Exception ex) {
+          logger.error(ex.getMessage(), ex);
+          if (!Double.isNaN(getOutTemperature())) {
+            mixedStream.getThermoSystem().setTemperature(getOutTemperature());
+          }
+          testOps.TPflash();
+        }
       }
+    } else {
+      testOps.TPflash();
+      mixedStream.getThermoSystem().init(2);
     }
-    mixedStream.setCalculationIdentifier(id);
+
 
     // System.out.println("enthalpy: " +
-    // mixedStream.getThermoSystem().getEnthalpy());
-    // System.out.println("enthalpy: " + enthalpy);
+    // mixedStream.getThermoSystem().getEnthalpy())
+    // System.out.println("enthalpy: " + en
     // System.out.println("temperature: " +
-    // mixedStream.getThermoSystem().getTemperature());
 
-    // System.out.println("beta " + mixedStream.getThermoSystem().getBeta());
+
+    // System.out.println("beta " + mixedStream.getThermoSystem(
     // outStream.setThermoSystem(mixedStream.getThermoSystem());
     setCalculationIdentifier(id);
   }

diff --git a/src/main/java/neqsim/process/equipment/util/Recycle.java b/src/main/java/neqsim/process/equipment/util/Recycle.java
@@ -321,6 +321,8 @@ public void run(UUID id) {
     if (numberOfInputStreams == 1 && thermoSystem2.getFlowRate("kg/hr") < 1e-100) {
       setErrorCompositon(0.0);
       setErrorFlow(0.0);
+      setErrorTemperature(0.0);
+      setErrorPressure(0.0);
       return;
     }
     mixedStream.setThermoSystem(thermoSystem2);
@@ -598,6 +600,9 @@ public void setPriority(int priority) {
   /** {@inheritDoc} */
   @Override
   public boolean solved() {
+    if (getOutletStream().getFlowRate("kg/hr") < 1e-20 && iterations > 1)
+      return true;
+
     if (Math.abs(this.errorComposition) < compositionTolerance
         && Math.abs(this.errorFlow) < flowTolerance
         && Math.abs(this.errorTemperature) < temperatureTolerance

diff --git a/src/main/java/neqsim/process/equipment/util/RecycleController.java b/src/main/java/neqsim/process/equipment/util/RecycleController.java
@@ -168,7 +168,7 @@ public boolean hasHigherPriorityLevel() {
    */
   public boolean solvedAll() {
     for (Recycle recyc : recycleArray) {
-      logger.info("recycle solved " + recyc.solved());
+      logger.info(recyc.getName() + " solved " + recyc.solved());
       if (!recyc.solved()) {
         return false;
       }