wip

equinor · Oct 25, 2024 · 02ebee9 · 02ebee9
1 parent 4b8010d
commit 02ebee9
Show file tree

Hide file tree

Showing 49 changed files with 194 additions and 287 deletions.
diff --git a/...oundary/heatmasstransfercalc/nonequilibriumfluidboundary/NonEquilibriumFluidBoundary.java b/...oundary/heatmasstransfercalc/nonequilibriumfluidboundary/NonEquilibriumFluidBoundary.java
@@ -1,12 +1,9 @@
 package neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.nonequilibriumfluidboundary;
 
+import Jama.Matrix;
 import neqsim.fluidmechanics.flownode.FlowNodeInterface;
 import neqsim.thermo.system.SystemInterface;
 
-import Jama.Matrix;
-
-
-
 /**
  * <p>
  * Abstract NonEquilibriumFluidBoundary class.

diff --git a/...luidboundary/filmmodelboundary/reactivefilmmodel/enhancementfactor/EnhancementFactor.java b/...luidboundary/filmmodelboundary/reactivefilmmodel/enhancementfactor/EnhancementFactor.java
@@ -116,7 +116,6 @@ public void setOnesVec(int phase) {
     }
   }
 
-
   /**
    * Getter for property hattaNumber.
    *

diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/MultiPhaseMeter.java b/src/main/java/neqsim/processsimulation/measurementdevice/MultiPhaseMeter.java
@@ -126,7 +126,7 @@ public double getMeasuredValue(String measurement, String unit) {
       try {
         thermoOps.TPflash();
       } catch (Exception ex) {
-        logger.error(ex.getMessage(), ex);
+        logger.error(ex.getMessage());
         return Double.NaN;
       }
       // tempFluid.display();
@@ -148,7 +148,7 @@ public double getMeasuredValue(String measurement, String unit) {
       try {
         thermoOps.TPflash();
       } catch (Exception ex) {
-        logger.error(ex.getMessage(), ex);
+        logger.error(ex.getMessage());
         return Double.NaN;
       }
       // tempFluid.display();
@@ -166,7 +166,7 @@ public double getMeasuredValue(String measurement, String unit) {
       try {
         thermoOps.TPflash();
       } catch (Exception ex) {
-        logger.error(ex.getMessage(), ex);
+        logger.error(ex.getMessage());
         return Double.NaN;
       }
       // tempFluid.display();
@@ -184,7 +184,7 @@ public double getMeasuredValue(String measurement, String unit) {
       try {
         thermoOps.TPflash();
       } catch (Exception ex) {
-        logger.error(ex.getMessage(), ex);
+        logger.error(ex.getMessage());
         return Double.NaN;
       }
       // tempFluid.display();
@@ -203,7 +203,7 @@ public double getMeasuredValue(String measurement, String unit) {
       try {
         thermoOps.TPflash();
       } catch (Exception ex) {
-        logger.error(ex.getMessage(), ex);
+        logger.error(ex.getMessage());
         return Double.NaN;
       }
       tempFluid.initPhysicalProperties();
@@ -237,7 +237,7 @@ public double getMeasuredValue(String measurement, String unit) {
       try {
         thermoOps.TPflash();
       } catch (Exception ex) {
-        logger.error(ex.getMessage(), ex);
+        logger.error(ex.getMessage());
         return Double.NaN;
       }
       if (!tempFluid.hasPhaseType("gas")) {

diff --git a/...im/processsimulation/processequipment/compressor/CompressorChartAlternativeMapLookup.java b/...im/processsimulation/processequipment/compressor/CompressorChartAlternativeMapLookup.java
@@ -191,10 +191,8 @@ public CompressorCurve getCurveAtRefSpeed(double refSpeed) {
       }
     }
     String msg = "Does not match any speed in the chart.";
-    neqsim.util.exception.InvalidInputException ex =
-        new neqsim.util.exception.InvalidInputException(this, "getCurveAtRefSpeed", "refSpeed",
-            msg);
-    throw new RuntimeException(ex);
+    throw new RuntimeException(new neqsim.util.exception.InvalidInputException(this,
+        "getCurveAtRefSpeed", "refSpeed", msg));
   }
 
   /**

diff --git a/src/main/java/neqsim/processsimulation/processequipment/stream/StreamInterface.java b/src/main/java/neqsim/processsimulation/processequipment/stream/StreamInterface.java
@@ -191,7 +191,6 @@ public default double getFlowRate(String unit) {
    */
   public StreamInterface clone(String name);
 
-
   /**
    * <p>
    * flashStream.

diff --git a/src/main/java/neqsim/processsimulation/processequipment/valve/ThrottlingValve.java b/src/main/java/neqsim/processsimulation/processequipment/valve/ThrottlingValve.java
@@ -508,8 +508,8 @@ public void run(UUID id) {
     try {
       inStream.getThermoSystem().setTotalNumberOfMoles(molarFlow);
       inStream.getThermoSystem().init(3);
-    } catch (Exception e) {
-      logger.error(e.getMessage(), e);
+    } catch (Exception ex) {
+      logger.error(ex.getMessage());
     }
     // inletStream.run(id);
 
@@ -572,15 +572,15 @@ public void runTransient(double dt, UUID id) {
       inStream.getThermoSystem().setTotalNumberOfMoles(molarFlow);
       inStream.getThermoSystem().init(1);
       inStream.run(id);
-    } catch (Exception e) {
-      logger.error(e.getMessage(), e);
+    } catch (Exception ex) {
+      logger.error(ex.getMessage());
     }
     try {
       outStream.getThermoSystem().setTotalNumberOfMoles(molarFlow);
       outStream.getThermoSystem().init(1);
       outStream.run(id);
-    } catch (Exception e) {
-      logger.error(e.getMessage(), e);
+    } catch (Exception ex) {
+      logger.error(ex.getMessage());
     }
     setCalculationIdentifier(id);
   }

diff --git a/src/main/java/neqsim/processsimulation/util/monitor/StreamResponse.java b/src/main/java/neqsim/processsimulation/util/monitor/StreamResponse.java
@@ -208,8 +208,8 @@ public StreamResponse(StreamInterface inputStream) {
                   Double.toString(
                       inputStream.getTVP(37.8, "C", neqsim.util.unit.Units.getSymbol("pressure"))),
                   neqsim.util.unit.Units.getSymbol("pressure")));
-        } catch (Exception e) {
-          logger.error(e.getMessage(), e);
+        } catch (Exception ex) {
+          logger.error(ex.getMessage());
         }
         try {
           newdata.put("RVP",
@@ -220,8 +220,8 @@ public StreamResponse(StreamInterface inputStream) {
           newdata.put("relative density", new Value(
               Double.toString(inputStream.getFluid().getPhase(name).getDensity("kg/m3") / 1000.0),
               "-"));
-        } catch (Exception e) {
-          logger.error(e.getMessage(), e);
+        } catch (Exception ex) {
+          logger.error(ex.getMessage());
         }
       } else if (name.equals("gas")) {
         Standard_ISO6976 standard = inputStream.getISO6976("volume", 15.0, 15.0);

diff --git a/src/main/java/neqsim/standards/gasquality/Standard_ISO15403.java b/src/main/java/neqsim/standards/gasquality/Standard_ISO15403.java
@@ -54,10 +54,8 @@ public double getValue(String returnParameter) {
     } else if (returnParameter.equals("NM")) {
       return NM;
     } else {
-      neqsim.util.exception.InvalidInputException ex =
-          new neqsim.util.exception.InvalidInputException(this, "getValue", "returnParameter",
-              "parameter not supported");
-      throw new RuntimeException(ex);
+      throw new RuntimeException(new neqsim.util.exception.InvalidInputException(this, "getValue",
+          "returnParameter", "parameter not supported"));
     }
   }
 

diff --git a/src/main/java/neqsim/thermo/atomelement/Element.java b/src/main/java/neqsim/thermo/atomelement/Element.java
@@ -89,10 +89,8 @@ public String[] getElementNames() {
    */
   public double getNumberOfElements(String elementName) {
     if (nameArray == null) {
-      neqsim.util.exception.InvalidInputException ex =
-          new neqsim.util.exception.InvalidInputException(this, "getNumberOfElements", elementName,
-              "component not in element database..");
-      throw new RuntimeException(ex);
+      throw new RuntimeException(new neqsim.util.exception.InvalidInputException(this,
+          "getNumberOfElements", elementName, "component not in element database.."));
     }
     for (int i = 0; i < nameArray.length; i++) {
       if (nameArray[i].equals(elementName)) {

diff --git a/src/main/java/neqsim/thermo/characterization/LumpingModel.java b/src/main/java/neqsim/thermo/characterization/LumpingModel.java
@@ -196,11 +196,9 @@ public void generateLumpedComposition(Characterise charac) {
     @Override
     public double getFractionOfHeavyEnd(int i) {
       if (fractionOfHeavyEnd == null) {
-        neqsim.util.exception.ThermoException ex =
+        throw new RuntimeException(
             new neqsim.util.exception.NotInitializedException(this, "getFractionOfHeavyEnd",
-                "fractionOfHeavyEnd", "characterisePlusFraction or generateLumpedComposition");
-        logger.error(ex.getMessage(), ex);
-        throw new RuntimeException(ex);
+                "fractionOfHeavyEnd", "characterisePlusFraction or generateLumpedComposition"));
       }
       return fractionOfHeavyEnd[i];
     }
@@ -312,11 +310,9 @@ public void generateLumpedComposition(Characterise charac) {
     @Override
     public double getFractionOfHeavyEnd(int i) {
       if (fractionOfHeavyEnd == null) {
-        neqsim.util.exception.ThermoException ex =
+        throw new RuntimeException(
             new neqsim.util.exception.NotInitializedException(this, "getFractionOfHeavyEnd",
-                "fractionOfHeavyEnd", "characterisePlusFraction or generateLumpedComposition");
-        logger.error(ex.getMessage(), ex);
-        throw new RuntimeException(ex);
+                "fractionOfHeavyEnd", "characterisePlusFraction or generateLumpedComposition"));
       }
       return fractionOfHeavyEnd[i];
     }
@@ -399,7 +395,7 @@ public void generateLumpedComposition(Characterise charac) {
         pseudoNumber++;
         String addName = "C" + Integer.toString(starti) + "-" + Integer.toString(i);
         getLumpedComponentNames()[k] = addName;
-        //System.out.println("adding " + addName);
+        // System.out.println("adding " + addName);
         fractionOfHeavyEnd[k] = zPlus[k] / molFracTot;
         system.addTBPfraction(addName, totalNumberOfMoles * zPlus[k], Maverage / zPlus[k],
             denstemp1 / denstemp2);
@@ -416,11 +412,9 @@ public void generateLumpedComposition(Characterise charac) {
     @Override
     public double getFractionOfHeavyEnd(int i) {
       if (fractionOfHeavyEnd == null) {
-        neqsim.util.exception.ThermoException ex =
+        throw new RuntimeException(
             new neqsim.util.exception.NotInitializedException(this, "getFractionOfHeavyEnd",
-                "fractionOfHeavyEnd", "characterisePlusFraction or generateLumpedComposition");
-        logger.error(ex.getMessage(), ex);
-        throw new RuntimeException(ex);
+                "fractionOfHeavyEnd", "characterisePlusFraction or generateLumpedComposition"));
       }
       return fractionOfHeavyEnd[i];
     }

diff --git a/src/main/java/neqsim/thermo/phase/PhaseGE.java b/src/main/java/neqsim/thermo/phase/PhaseGE.java
@@ -56,8 +56,11 @@ public PhaseGE() {
   public void init(double temperature, double pressure, double totalNumberOfMoles, double beta,
       int numberOfComponents, PhaseType pt, int phase) {
     if (totalNumberOfMoles <= 0) {
-      new neqsim.util.exception.InvalidInputException(this, "init", "totalNumberOfMoles",
-          "must be larger than zero.");
+      // todo: throw this exception?
+      /*
+       * new neqsim.util.exception.InvalidInputException(this, "init", "totalNumberOfMoles",
+       * "must be larger than zero.");
+       */
     }
     for (int i = 0; i < numberOfComponents; i++) {
       // todo: Conflating init type and phase type?

diff --git a/src/main/java/neqsim/thermo/phase/PhaseSrkCPA.java b/src/main/java/neqsim/thermo/phase/PhaseSrkCPA.java
@@ -956,7 +956,6 @@ public boolean solveX2(int maxIter) {
     }
   }
 
-
   /**
    * <p>
    * Getter for the field <code>dFdNtemp</code>.

diff --git a/src/main/java/neqsim/thermo/system/SystemThermo.java b/src/main/java/neqsim/thermo/system/SystemThermo.java
@@ -161,17 +161,13 @@ public SystemThermo() {
   public SystemThermo(double T, double P, boolean checkForSolids) {
     this();
     if (T < 0.0) {
-      neqsim.util.exception.InvalidInputException ex =
-          new neqsim.util.exception.InvalidInputException(this.getClass().getSimpleName(),
-              "SystemThermo", "T", "is negative");
-      throw new RuntimeException(ex);
+      throw new RuntimeException(new neqsim.util.exception.InvalidInputException(this,
+          "SystemThermo", "T", "is negative"));
     }
 
     if (P < 0.0) {
-      neqsim.util.exception.InvalidInputException ex =
-          new neqsim.util.exception.InvalidInputException(this.getClass().getSimpleName(),
-              "SystemThermo", "P", "is negative");
-      throw new RuntimeException(ex);
+      throw new RuntimeException(new neqsim.util.exception.InvalidInputException(this,
+          "SystemThermo", "P", "is negative"));
     }
 
     this.solidPhaseCheck = checkForSolids;
@@ -379,9 +375,8 @@ public void addComponent(String componentName, double moles, int phaseNumber) {
     // Add new component
     if (moles < 0.0) {
       String msg = "Negative input number of moles.";
-      neqsim.util.exception.InvalidInputException ex =
-          new neqsim.util.exception.InvalidInputException(this, "addComponent", "moles", msg);
-      throw new RuntimeException(ex);
+      throw new RuntimeException(
+          new neqsim.util.exception.InvalidInputException(this, "addComponent", "moles", msg));
     }
 
     componentNames.add(componentName);
@@ -4918,7 +4913,7 @@ public void setTotalFlowRate(double flowRate, String flowunit) {
     try {
       init(1);
     } catch (Exception ex) {
-      logger.error(ex.getMessage(), ex);
+      logger.error(ex.getMessage());
     }
     double density = 0.0;
     if (flowunit.equals("Am3/hr") || flowunit.equals("Am3/min") || flowunit.equals("gallons/min")