Merge pull request #77 from keurfonluu/devel

Fix TOUGH3 history file reader
keurfonluu · Sep 19, 2020 · 4c6fe52 · 4c6fe52
2 parents 6ca7ff4 + 0a13123
commit 4c6fe52
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 7 deletions.
diff --git a/test/support_files/outputs/FOFT_A1912.csv b/test/support_files/outputs/FOFT_A1912.csv
diff --git a/test/support_files/outputs/FOFT_A1912_T2.csv b/test/support_files/outputs/FOFT_A1912_T2.csv
diff --git a/test/support_files/outputs/GOFT_A1162.csv b/test/support_files/outputs/GOFT_A1162.csv
diff --git a/test/support_files/outputs/GOFT_A1162_T2.csv b/test/support_files/outputs/GOFT_A1162_T2.csv
diff --git a/test/test_output.py b/test/test_output.py
@@ -21,6 +21,16 @@
     [
         (
             "FOFT_A1912.csv",
+            {
+                "TIME": 4.393722000e9,
+                "PRES": 1.8740899675005e8,
+                "TEMP": 720.0,
+                "SAT_G": 0.0,
+                "SAT_L": 24.0,
+            },
+        ),
+        (
+            "FOFT_A1912_T2.csv",
             {
                 "TIME": 3.06639400e9,
                 "PRES": 1.83000721e8,
@@ -31,6 +41,10 @@
         ),
         (
             "GOFT_A1162.csv",
+            {"TIME": 4.393722000e9, "GEN": -30.0, "ENTG": 1.528048035348e7, "PWB": 0.0},
+        ),
+        (
+            "GOFT_A1162_T2.csv",
             {"TIME": 3.06639400e9, "GEN": -27.5, "ENTG": 1.40141971e7, "PWB": 0.0},
         ),
     ],

diff --git a/toughio/__about__.py b/toughio/__about__.py
@@ -1,4 +1,4 @@
-__version__ = "1.4.1"
+__version__ = "1.4.2"
 __author__ = "Keurfon Luu"
 __author_email__ = "[email protected]"
 __website__ = "https://github.com/keurfonluu/toughio"

diff --git a/toughio/_io/output/_helpers.py b/toughio/_io/output/_helpers.py
@@ -151,12 +151,18 @@ def read_history(filename):
 
     with open(filename, "r") as f:
         line = f.readline().strip()
-        headers = line.split()[1:]
+
+        if line.startswith('"'):
+            sep = ","
+            line = line.replace('"', "")
+        else:
+            sep = None
+        headers = [x.strip() for x in line.split(sep)[1:]]
 
         data = []
         line = f.readline().strip()
         while line:
-            data += [[float(x) for x in line.split()]]
+            data += [[float(x) for x in line.split(sep)]]
             line = f.readline().strip()
         data = numpy.transpose(data)