Merge pull request #141 from equinor/develop

Develop
equinor · Apr 17, 2020 · 76f7d40 · 76f7d40
2 parents 8a379f0 + 608a93b
commit 76f7d40
Show file tree

Hide file tree

Showing 70 changed files with 6,473 additions and 3,789 deletions.
diff --git a/.flattened-pom.xml b/.flattened-pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.equinor</groupId>
   <artifactId>neqsim</artifactId>
-  <version>1.2.0</version>
+  <version>2.2.0</version>
   <dependencies>
     <dependency>
       <groupId>colt</groupId>
@@ -45,49 +45,49 @@
     <dependency>
       <groupId>org.ejml</groupId>
       <artifactId>ejml-cdense</artifactId>
-      <version>0.38</version>
+      <version>0.39</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.ejml</groupId>
       <artifactId>ejml-core</artifactId>
-      <version>0.38</version>
+      <version>0.39</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.ejml</groupId>
       <artifactId>ejml-ddense</artifactId>
-      <version>0.38</version>
+      <version>0.39</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.ejml</groupId>
       <artifactId>ejml-dsparse</artifactId>
-      <version>0.38</version>
+      <version>0.39</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.ejml</groupId>
       <artifactId>ejml-experimental</artifactId>
-      <version>0.38</version>
+      <version>0.39</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.ejml</groupId>
       <artifactId>ejml-fdense</artifactId>
-      <version>0.38</version>
+      <version>0.39</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.ejml</groupId>
       <artifactId>ejml-simple</artifactId>
-      <version>0.38</version>
+      <version>0.39</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.ejml</groupId>
       <artifactId>ejml-zdense</artifactId>
-      <version>0.38</version>
+      <version>0.39</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -134,7 +134,7 @@
     </dependency>
     <dependency>
       <groupId>edu.ucar</groupId>
-      <artifactId>netcdfAll</artifactId>
+      <artifactId>netcdf4</artifactId>
       <version>4.6.14</version>
       <scope>compile</scope>
     </dependency>
@@ -178,5 +178,10 @@
       <id>boundless</id>
       <url>https://repo.boundlessgeo.com/main/</url>
     </repository>
+    <repository>
+      <id>unidata-all</id>
+      <name>Unidata All</name>
+      <url>https://artifacts.unidata.ucar.edu/repository/unidata-all/</url>
+    </repository>
   </repositories>
 </project>
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,15 @@
+Version 2.2 (17/4/2020)
+- Huron Vidal parameter oxygen-water updated
+- CPA-binary interaction paramter kij updated for N2-water and o2-water
+- Peneloux volume correction paramters water, MEG, TEG
+- Volume correction parameters for water, MEG and TEG updated (temperature dependent volume correction)
+- UMR-PRU model updated with parameters for c-C7 and c-C8, c-C9
+- various bug fixes and new feautures for process calculations (changes for compressors, mixers, etc.)
+- Short-cut class for creating new fluids implemented (neqsim.thermo.Fluid class)
+
+Version 2.1
+- improved stability of TPflash calculations
+
 Version 2.0 (10/12/2019)
 - verson name changed from 2018.X to 2.X
 - improved speed and stability of algorithms (TPflash, phase envelopes)

diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
     <version>${revision}${sha1}${changelist}</version>
 
     <properties>
-      <revision>1.2.0</revision>
+      <revision>2.2.0</revision>
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
       <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
       <sha1/>
@@ -26,8 +26,13 @@
             <id>boundless</id>
             <url>https://repo.boundlessgeo.com/main/</url>
         </repository>
+      <repository>
+        <id>unidata-all</id>
+        <name>Unidata All</name>
+        <url>https://artifacts.unidata.ucar.edu/repository/unidata-all/</url>
+      </repository>
     </repositories>
-
+ 
     <dependencies>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -68,42 +73,42 @@
         <dependency>
             <groupId>org.ejml</groupId>
             <artifactId>ejml-cdense</artifactId>
-            <version>0.38</version>
+            <version>0.39</version>
         </dependency>
         <dependency>
             <groupId>org.ejml</groupId>
             <artifactId>ejml-core</artifactId>
-            <version>0.38</version>
+            <version>0.39</version>
         </dependency>
         <dependency>
             <groupId>org.ejml</groupId>
             <artifactId>ejml-ddense</artifactId>
-            <version>0.38</version>
+            <version>0.39</version>
         </dependency>
         <dependency>
             <groupId>org.ejml</groupId>
             <artifactId>ejml-dsparse</artifactId>
-            <version>0.38</version>
+            <version>0.39</version>
         </dependency>
         <dependency>
             <groupId>org.ejml</groupId>
             <artifactId>ejml-experimental</artifactId>
-            <version>0.38</version>
+            <version>0.39</version>
         </dependency>
         <dependency>
             <groupId>org.ejml</groupId>
             <artifactId>ejml-fdense</artifactId>
-            <version>0.38</version>
+            <version>0.39</version>
         </dependency>
         <dependency>
             <groupId>org.ejml</groupId>
             <artifactId>ejml-simple</artifactId>
-            <version>0.38</version>
+            <version>0.39</version>
         </dependency>
         <dependency>
             <groupId>org.ejml</groupId>
             <artifactId>ejml-zdense</artifactId>
-            <version>0.38</version>
+            <version>0.39</version>
         </dependency>
         <dependency>
             <groupId>com.lowagie</groupId>
@@ -140,12 +145,12 @@
             <artifactId>mysql-connector-java</artifactId>
             <version>8.0.11</version>
         </dependency>
-        <dependency>
-            <groupId>edu.ucar</groupId>
-            <artifactId>netcdfAll</artifactId>
-            <version>4.6.14</version>
-        </dependency>
-        <dependency>
+      <dependency>
+        <groupId>edu.ucar</groupId>
+        <artifactId>netcdf4</artifactId>
+        <version>4.6.14</version>
+      </dependency>
+      <dependency>
             <groupId>org.ojalgo</groupId>
             <artifactId>ojalgo</artifactId>
             <version>44.0.0</version>