add eclipse with water (#1281)

* add eclipse with water

* update

* update test

* update

Author: EvenSol

src/main/java/neqsim/thermo/util/readwrite/EclipseFluidReadWrite.java

@@ -336,6 +336,9 @@ public static SystemInterface read(String inputFile) {
         } else if (name.equals("CO2") || TC.get(counter) < 00.0) {
           name = "CO2";
           fluid.addComponent(name, ZI.get(counter));
+        } else if (name.strip().equals("H2O") || TC.get(counter) < 00.0) {
+          name = "water";
+          fluid.addComponent(name, ZI.get(counter));
         } else if (TC.get(counter) >= 00.0) {
           name = names.get(counter);
           Double stddensity = 0.5046 * MW.get(counter) / 1000.0 + 0.668468;
@@ -389,8 +392,6 @@ public static SystemInterface read(String inputFile) {
     return fluid;
   }
 
-
-
   /**
    * <p>
    * read.
@@ -569,7 +570,6 @@ public static SystemInterface read(String inputFile, String[] fluidNames) {
         }
       }
 
-
       for (String fluidName : fluidNames) {
         for (int counter = 0; counter < names.size(); counter++) {
           String name = names.get(counter);
@@ -603,6 +603,9 @@ public static SystemInterface read(String inputFile, String[] fluidNames) {
           } else if (name.equals("CO2") || TC.get(counter) < 00.0) {
             name = "CO2";
             fluid.addComponent(name, ZI.get(counter));
+          } else if (name.strip().equals("H2O") || TC.get(counter) < 00.0) {
+            name = "water";
+            fluid.addComponent(name, ZI.get(counter));
           } else if (TC.get(counter) >= 0.0) {
             name = names.get(counter);
             Double stddensity = 0.5046 * MW.get(counter) / 1000.0 + 0.668468;
@@ -660,7 +663,8 @@ public static SystemInterface read(String inputFile, String[] fluidNames) {
           // Then, to replicate the original kij,
           // we just pick the old kij[baseIndexI][baseIndexJ].
           // System.out.println("i: " + i + " j: " + j);
-          // System.out.println("baseIndexI: " + baseIndexI + " baseIndexJ: " + baseIndexJ);
+          // System.out.println("baseIndexI: " + baseIndexI + " baseIndexJ: " +
+          // baseIndexJ);
           double kijVal = kij[baseIndexI][baseIndexJ];
 
           // Finally set it in the fluid

src/test/java/neqsim/thermo/util/readwrite/EclipseFluidReadWriteTest.java

@@ -3,6 +3,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import java.io.File;
 import java.io.IOException;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import neqsim.thermo.phase.PhaseEos;
 import neqsim.thermodynamicoperations.ThermodynamicOperations;
@@ -20,6 +21,7 @@ class EclipseFluidReadWriteTest extends neqsim.NeqSimTest {
   String fileA17 = file.getAbsolutePath() + "/A-17.E300";
   String fileA19 = file.getAbsolutePath() + "/A-19.E300";
   String filer = file.getAbsolutePath() + "/fluid-r.E300";
+  String fluid_water = file.getAbsolutePath() + "/fluid_water.E300";
 
   /**
    * Test method for
@@ -161,4 +163,33 @@ void testReadFluidR() throws IOException {
     // testSystem.prettyPrint();
     // Assertions.assertEquals(0.9270363530, testSystem.getBeta(0), 1e-6);
   }
+
+  @Test
+  void testFluidWater() throws IOException {
+    testSystem = EclipseFluidReadWrite.read(fluid_water);
+    testSystem.setMultiPhaseCheck(true);
+    ThermodynamicOperations testOps = new ThermodynamicOperations(testSystem);
+    testSystem.setPressure(60.0, "bara");
+    testSystem.setTemperature(65.0, "C");
+    testOps.TPflash();
+
+    // testSystem.prettyPrint();
+
+    neqsim.thermo.util.readwrite.TablePrinter.printTable(
+        (((PhaseEos) testSystem.getPhase(0)).getMixingRule().getBinaryInteractionParameters()));
+    double[][] paramsPhase0 =
+        ((PhaseEos) testSystem.getPhase(0)).getMixingRule().getBinaryInteractionParameters();
+    double[][] paramsPhase1 =
+        ((PhaseEos) testSystem.getPhase(2)).getMixingRule().getBinaryInteractionParameters();
+
+    // Check that both 2D arrays have the same dimensions first.
+    Assertions.assertEquals(paramsPhase0.length, paramsPhase1.length);
+
+    // CHeck that kij are equal of phase gas and water
+    for (int i = 0; i < paramsPhase0.length; i++) {
+      for (int j = 0; j < paramsPhase0.length; j++) {
+        Assertions.assertEquals(paramsPhase0[i][j], paramsPhase1[i][j]);
+      }
+    }
+  }
 }