wip

equinor · Nov 25, 2024 · e19c010 · e19c010
1 parent 0d3aea7
commit e19c010
Show file tree

Hide file tree

Showing 143 changed files with 2,291 additions and 1,948 deletions.
diff --git a/src/main/java/neqsim/pvtsimulation/simulation/SaturationPressure.java b/src/main/java/neqsim/pvtsimulation/simulation/SaturationPressure.java
@@ -2,6 +2,7 @@
 
 import neqsim.thermo.system.SystemInterface;
 import neqsim.thermo.system.SystemSrkEos;
+import neqsim.util.ExcludeFromJacocoGeneratedReport;
 
 /**
  * <p>
@@ -91,6 +92,7 @@ public void run() {
    *
    * @param args an array of {@link java.lang.String} objects
    */
+  @ExcludeFromJacocoGeneratedReport
   public static void main(String[] args) {
     // SystemInterface tempSystem = new SystemSrkCPAstatoil(273.15 + 120, 100.0);
     SystemInterface tempSystem = new SystemSrkEos(273.15 + 120, 100.0);

diff --git a/src/main/java/neqsim/pvtsimulation/simulation/SaturationTemperature.java b/src/main/java/neqsim/pvtsimulation/simulation/SaturationTemperature.java
@@ -2,6 +2,7 @@
 
 import neqsim.thermo.system.SystemInterface;
 import neqsim.thermo.system.SystemSrkEos;
+import neqsim.util.ExcludeFromJacocoGeneratedReport;
 
 /**
  * <p>
@@ -81,6 +82,7 @@ public void run() {
    *
    * @param args an array of {@link java.lang.String} objects
    */
+  @ExcludeFromJacocoGeneratedReport
   public static void main(String[] args) {
     SystemInterface tempSystem = new SystemSrkEos(273.15 + 20, 60.0);
     tempSystem.addComponent("nitrogen", 0.34);

diff --git a/src/main/java/neqsim/pvtsimulation/simulation/SeparatorTest.java b/src/main/java/neqsim/pvtsimulation/simulation/SeparatorTest.java
@@ -6,6 +6,7 @@
 import neqsim.thermo.phase.PhaseType;
 import neqsim.thermo.system.SystemInterface;
 import neqsim.thermo.system.SystemSrkEos;
+import neqsim.util.ExcludeFromJacocoGeneratedReport;
 
 /**
  * <p>
@@ -100,6 +101,7 @@ && getThermoSystem().getPhase(0).getType() == PhaseType.GAS) {
    *
    * @param args an array of {@link java.lang.String} objects
    */
+  @ExcludeFromJacocoGeneratedReport
   public static void main(String[] args) {
     SystemInterface tempSystem = new SystemSrkEos(298.0, 300.0);
     tempSystem.addComponent("nitrogen", 0.64);

diff --git a/src/main/java/neqsim/thermo/util/benchmark/TPflash_benchmark.java b/src/main/java/neqsim/thermo/util/benchmark/TPflash_benchmark.java
@@ -5,6 +5,7 @@
 import neqsim.thermo.system.SystemInterface;
 import neqsim.thermo.system.SystemSrkEos;
 import neqsim.thermodynamicoperations.ThermodynamicOperations;
+import neqsim.util.ExcludeFromJacocoGeneratedReport;
 
 /**
  * <p>
@@ -22,6 +23,7 @@ public class TPflash_benchmark {
    *
    * @param args an array of {@link java.lang.String} objects
    */
+  @ExcludeFromJacocoGeneratedReport
   public static void main(String args[]) {
     SystemInterface testSystem = new SystemSrkEos(303.15, 35.01325);
     // SystemInterface testSystem = new SystemSrkCPAstatoil(303.15, 10.0);

diff --git a/src/main/java/neqsim/thermo/util/benchmark/TPflash_benchmark_UMR.java b/src/main/java/neqsim/thermo/util/benchmark/TPflash_benchmark_UMR.java
@@ -5,6 +5,7 @@
 import neqsim.thermo.system.SystemInterface;
 import neqsim.thermo.system.SystemUMRPRUMCEos;
 import neqsim.thermodynamicoperations.ThermodynamicOperations;
+import neqsim.util.ExcludeFromJacocoGeneratedReport;
 
 /**
  * <p>
@@ -23,6 +24,7 @@ public class TPflash_benchmark_UMR {
    * @param args an array of {@link java.lang.String} objects
    */
   @SuppressWarnings("unused")
+  @ExcludeFromJacocoGeneratedReport
   public static void main(String args[]) {
     double[][] points;
 

diff --git a/src/main/java/neqsim/thermo/util/empiric/BukacekWaterInGas.java b/src/main/java/neqsim/thermo/util/empiric/BukacekWaterInGas.java
@@ -1,6 +1,7 @@
 package neqsim.thermo.util.empiric;
 
 import neqsim.thermo.ThermodynamicConstantsInterface;
+import neqsim.util.ExcludeFromJacocoGeneratedReport;
 
 /**
  * <p>
@@ -76,6 +77,7 @@ public static double waterDewPointTemperature(double moleFractionWaterInGas, dou
    *
    * @param args an array of {@link java.lang.String} objects
    */
+  @ExcludeFromJacocoGeneratedReport
   public static void main(String[] args) {
     System.out.println("water in gas " + BukacekWaterInGas.getWaterInGas(273.15 - 18.0, 70.0));
 

diff --git a/...operations/phaseenvelopeops/multicomponentenvelopeops/SysNewtonRhapsonPhaseEnvelope2.java b/...operations/phaseenvelopeops/multicomponentenvelopeops/SysNewtonRhapsonPhaseEnvelope2.java
@@ -8,6 +8,7 @@
 import org.apache.logging.log4j.Logger;
 import neqsim.mathlib.nonlinearsolver.NewtonRhapson;
 import neqsim.thermo.system.SystemInterface;
+import neqsim.util.ExcludeFromJacocoGeneratedReport;
 
 /**
  * <p>
@@ -502,6 +503,7 @@ public void solve(int np) {
    *
    * @param args an array of {@link java.lang.String} objects
    */
+  @ExcludeFromJacocoGeneratedReport
   public static void main(String[] args) {
     /*
      * sysNewtonRhapson test=new sysNewtonRhapson(); double[] constants = new double[]{0.4,0.4};

diff --git a/src/test/java/neqsim/chemicalreactions/util/example/NaturalGasCombustion.java b/src/test/java/neqsim/chemicalreactions/util/example/NaturalGasCombustion.java
@@ -3,38 +3,44 @@
 import neqsim.thermo.system.SystemInterface;
 import neqsim.thermo.system.SystemSrkEos;
 import neqsim.thermodynamicoperations.ThermodynamicOperations;
+import neqsim.util.ExcludeFromJacocoGeneratedReport;
 
 /**
- * <p>NaturalGasCombustion class.</p>
+ * <p>
+ * NaturalGasCombustion class.
+ * </p>
  *
  * @author asmund
  * @version $Id: $Id
  * @since 2.2.3
  */
-public class NaturalGasCombustion  extends neqsim.NeqSimTest{
-    /**
-     * <p>main.</p>
-     *
-     * @param args an array of {@link java.lang.String} objects
-     */
-    @SuppressWarnings("unused")
-    public static void main(String[] args) {
-        SystemInterface testSystem = new SystemSrkEos(303.3, 2.8);
+public class NaturalGasCombustion extends neqsim.NeqSimTest {
+  /**
+   * <p>
+   * main.
+   * </p>
+   *
+   * @param args an array of {@link java.lang.String} objects
+   */
+  @SuppressWarnings("unused")
+  @ExcludeFromJacocoGeneratedReport
+  public static void main(String[] args) {
+    SystemInterface testSystem = new SystemSrkEos(303.3, 2.8);
 
-        testSystem.addComponent("methane", 5.0, "kg/sec");
-        // testSystem.addComponent("nitrogen", 100.0, "kg/sec");
-        testSystem.addComponent("oxygen", 40.0, "kg/sec");
-        testSystem.chemicalReactionInit();
+    testSystem.addComponent("methane", 5.0, "kg/sec");
+    // testSystem.addComponent("nitrogen", 100.0, "kg/sec");
+    testSystem.addComponent("oxygen", 40.0, "kg/sec");
+    testSystem.chemicalReactionInit();
 
-        testSystem.createDatabase(true);
-        testSystem.setMixingRule(2);
-        testSystem.init(0);
-        testSystem.setMaxNumberOfPhases(1);
-        testSystem.setNumberOfPhases(1);
-        testSystem.getChemicalReactionOperations().solveChemEq(0, 0);
-        // testSystem.getChemicalReactionOperations().solveChemEq(0,1);
-        testSystem.display();
-        ThermodynamicOperations ops = new ThermodynamicOperations(testSystem);
-        // ops.compustionCalc();
-    }
+    testSystem.createDatabase(true);
+    testSystem.setMixingRule(2);
+    testSystem.init(0);
+    testSystem.setMaxNumberOfPhases(1);
+    testSystem.setNumberOfPhases(1);
+    testSystem.getChemicalReactionOperations().solveChemEq(0, 0);
+    // testSystem.getChemicalReactionOperations().solveChemEq(0,1);
+    testSystem.display();
+    ThermodynamicOperations ops = new ThermodynamicOperations(testSystem);
+    // ops.compustionCalc();
+  }
 }
diff --git a/src/test/java/neqsim/fluidmechanics/util/example/WettedWall_CO2_water.java b/src/test/java/neqsim/fluidmechanics/util/example/WettedWall_CO2_water.java
@@ -7,6 +7,7 @@
 import neqsim.process.processmodel.ProcessSystem;
 import neqsim.thermo.system.SystemInterface;
 import neqsim.thermo.system.SystemSrkEos;
+import neqsim.util.ExcludeFromJacocoGeneratedReport;
 
 /**
  * <p>
@@ -23,6 +24,7 @@ public class WettedWall_CO2_water extends neqsim.NeqSimTest {
    *
    * @param args an array of {@link java.lang.String} objects
    */
+  @ExcludeFromJacocoGeneratedReport
   public static void main(String args[]) {
     SystemInterface testSystem = new SystemSrkEos((273.15 + 5.0), 45.00);
     testSystem.addComponent("methane", 0.15, 0);

diff --git a/src/test/java/neqsim/physicalproperties/util/examples/TPflashTest.java b/src/test/java/neqsim/physicalproperties/util/examples/TPflashTest.java
@@ -5,6 +5,7 @@
 import neqsim.thermo.system.SystemInterface;
 import neqsim.thermo.system.SystemSrkCPAstatoil;
 import neqsim.thermodynamicoperations.ThermodynamicOperations;
+import neqsim.util.ExcludeFromJacocoGeneratedReport;
 
 /**
  * <p>
@@ -26,6 +27,7 @@ public class TPflashTest {
    * @param args an array of {@link java.lang.String} objects
    */
   @SuppressWarnings("unused")
+  @ExcludeFromJacocoGeneratedReport
   public static void main(String args[]) {
     SystemInterface testSystem = new SystemSrkCPAstatoil(273.15 + 20, 30.0);
     // SystemInterface testSystem = new SystemSrkCPAstatoil(273.15+20, 1.0);

diff --git a/src/test/java/neqsim/physicalproperties/util/examples/TPflashWater.java b/src/test/java/neqsim/physicalproperties/util/examples/TPflashWater.java
@@ -5,6 +5,7 @@
 import neqsim.thermo.system.SystemInterface;
 import neqsim.thermo.system.SystemSrkCPAstatoil;
 import neqsim.thermodynamicoperations.ThermodynamicOperations;
+import neqsim.util.ExcludeFromJacocoGeneratedReport;
 
 /**
  * <p>
@@ -25,6 +26,7 @@ public class TPflashWater {
    *
    * @param args an array of {@link java.lang.String} objects
    */
+  @ExcludeFromJacocoGeneratedReport
   public static void main(String args[]) {
     SystemInterface testSystem = new SystemSrkCPAstatoil(273.15 + 40.0, 100.01325);
     ThermodynamicOperations testOps = new ThermodynamicOperations(testSystem);

diff --git a/src/test/java/neqsim/physicalproperties/util/examples/TPflash_1.java b/src/test/java/neqsim/physicalproperties/util/examples/TPflash_1.java
@@ -5,6 +5,7 @@
 import neqsim.thermo.system.SystemInterface;
 import neqsim.thermo.system.SystemSrkEos;
 import neqsim.thermodynamicoperations.ThermodynamicOperations;
+import neqsim.util.ExcludeFromJacocoGeneratedReport;
 
 /**
  * <p>
@@ -25,6 +26,7 @@ public class TPflash_1 {
    *
    * @param args an array of {@link java.lang.String} objects
    */
+  @ExcludeFromJacocoGeneratedReport
   public static void main(String args[]) {
     SystemInterface testSystem = new SystemSrkEos(273.15 + 55, 100.0);
     ThermodynamicOperations testOps = new ThermodynamicOperations(testSystem);

diff --git a/src/test/java/neqsim/physicalproperties/util/examples/TestCondensate.java b/src/test/java/neqsim/physicalproperties/util/examples/TestCondensate.java
@@ -7,6 +7,7 @@
 import neqsim.thermo.system.SystemInterface;
 import neqsim.thermo.system.SystemPrEos;
 import neqsim.thermodynamicoperations.ThermodynamicOperations;
+import neqsim.util.ExcludeFromJacocoGeneratedReport;
 
 /**
  * <p>
@@ -27,6 +28,7 @@ public class TestCondensate {
    *
    * @param args an array of {@link java.lang.String} objects
    */
+  @ExcludeFromJacocoGeneratedReport
   public static void main(String args[]) {
     // SystemInterface testSystem = new SystemSrkEos(273.15 + 15.0,
     // ThermodynamicConstantsInterface.referencePressure);

diff --git a/src/test/java/neqsim/physicalproperties/util/examples/TestDiffusionCoefficient.java b/src/test/java/neqsim/physicalproperties/util/examples/TestDiffusionCoefficient.java
@@ -5,6 +5,7 @@
 import neqsim.thermo.system.SystemInterface;
 import neqsim.thermo.system.SystemSrkEos;
 import neqsim.thermodynamicoperations.ThermodynamicOperations;
+import neqsim.util.ExcludeFromJacocoGeneratedReport;
 
 /**
  * <p>
@@ -25,6 +26,7 @@ public class TestDiffusionCoefficient {
    *
    * @param args an array of {@link java.lang.String} objects
    */
+  @ExcludeFromJacocoGeneratedReport
   public static void main(String args[]) {
     SystemInterface testSystem = new SystemSrkEos(273.15 + 28.66, 12.2);
     testSystem.addComponent("nitrogen", 0.037);

diff --git a/src/test/java/neqsim/physicalproperties/util/examples/TestSolidAdsorption.java b/src/test/java/neqsim/physicalproperties/util/examples/TestSolidAdsorption.java
@@ -5,6 +5,7 @@
 import neqsim.thermo.system.SystemInterface;
 import neqsim.thermo.system.SystemSrkEos;
 import neqsim.thermodynamicoperations.ThermodynamicOperations;
+import neqsim.util.ExcludeFromJacocoGeneratedReport;
 
 /**
  * <p>
@@ -25,6 +26,7 @@ public class TestSolidAdsorption {
    *
    * @param args an array of {@link java.lang.String} objects
    */
+  @ExcludeFromJacocoGeneratedReport
   public static void main(String args[]) {
     SystemInterface testSystem = new SystemSrkEos(288.15, 1.4);
     testSystem.addComponent("methane", 1.0);

diff --git a/src/test/java/neqsim/physicalproperties/util/examples/TestSurfaceTenison.java b/src/test/java/neqsim/physicalproperties/util/examples/TestSurfaceTenison.java
@@ -5,6 +5,7 @@
 import neqsim.thermo.system.SystemInterface;
 import neqsim.thermo.system.SystemSrkEos;
 import neqsim.thermodynamicoperations.ThermodynamicOperations;
+import neqsim.util.ExcludeFromJacocoGeneratedReport;
 
 /**
  * <p>
@@ -25,6 +26,7 @@ public class TestSurfaceTenison {
    *
    * @param args an array of {@link java.lang.String} objects
    */
+  @ExcludeFromJacocoGeneratedReport
   public static void main(String args[]) {
     SystemInterface testSystem = new SystemSrkEos(273.15 + 28.66, 12.2);
     // SystemInterface testSystem = new SystemPrEos(273.15 + 10.0, 50.0);