subscript 1.14.1__tar.gz → 1.14.2__tar.gz

{subscript-1.14.1 → subscript-1.14.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: subscript
-Version: 1.14.1
+Version: 1.14.2
 Summary: Equinor's collection of subsurface reservoir modelling scripts
 Author-email: Equinor <rnyb@equinor.com>
 License:                     GNU GENERAL PUBLIC LICENSE

{subscript-1.14.1 → subscript-1.14.2}/src/subscript/prtvol2csv/prtvol2csv.py

@@ -211,6 +211,8 @@ def currently_in_place_from_prt(
             if date_matcher_ecl.search(line) is not None:
                 line_split = line.split("*")
                 initial_date_string = line_split[0].rstrip().split("  ")[-1]
+                # Handle Eclipse dumping out July as JLY instead of JUL
+                initial_date_string = initial_date_string.replace("JLY", "JUL")
                 initial_date_object = datetime.strptime(
                     initial_date_string, "%d %b %Y"
                 ).date()

{subscript-1.14.1 → subscript-1.14.2}/src/subscript/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.14.1'
-__version_tuple__ = version_tuple = (1, 14, 1)
+__version__ = version = '1.14.2'
+__version_tuple__ = version_tuple = (1, 14, 2)
 
-__commit_id__ = commit_id = 'g809fd41cb'
+__commit_id__ = commit_id = 'g872742c2d'

{subscript-1.14.1 → subscript-1.14.2}/src/subscript.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: subscript
-Version: 1.14.1
+Version: 1.14.2
 Summary: Equinor's collection of subsurface reservoir modelling scripts
 Author-email: Equinor <rnyb@equinor.com>
 License:                     GNU GENERAL PUBLIC LICENSE

{subscript-1.14.1 → subscript-1.14.2}/tests/test_prtvol2csv.py

@@ -183,6 +183,24 @@ def test_prtvol2csv(tmp_path, mocker):
     pd.testing.assert_frame_equal(dframe, expected)
 
 
+def test_correct_parsing_date(tmp_path):
+    shutil.copy(TEST_PRT_DATADIR / "DROGON_FIPNUM.PRT", tmp_path / "DROGON_FIPNUM.PRT")
+    os.chdir(tmp_path)
+    # Replace "REPORT   0     1 JAN 2018" with "REPORT   0     5 JLY 2018"
+    report_string = "REPORT   0     1 JLY 2018"
+    prt_path = tmp_path / "DROGON_FIPNUM.PRT"
+    prt_text = prt_path.read_text(encoding="utf8")
+    prt_text = prt_text.replace("REPORT   0     1 JAN 2018", report_string)
+    assert report_string in prt_text
+
+    prt_path.write_text(prt_text, encoding="utf8")
+
+    df_inplace = prtvol2csv.currently_in_place_from_prt(prt_path)
+    expected_stoiip_oil = [1885827, 7179776, 2366384, 213993, 986924]
+
+    assert df_inplace["STOIIP_OIL"].head().to_list() == expected_stoiip_oil
+
+
 def test_rename_fip_column(tmp_path, mocker):
     """Test renaming of the region column to FIPNUM"""
     prtfile = TEST_PRT_DATADIR / "DROGON_FIPZON.PRT"