res2df 1.3.2__tar.gz → 1.3.3__tar.gz

{res2df-1.3.2 → res2df-1.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: res2df
-Version: 1.3.2
+Version: 1.3.3
 Summary: Convert reservoir simulator input and output to DataFrames
 Home-page: http://github.com/equinor/res2df
 Author: Håvard Berland

{res2df-1.3.2 → res2df-1.3.3}/res2df/fipreports.py

@@ -135,9 +135,6 @@ def df(prtfile: Union[str, ResdataFiles], fipname: str = "FIPNUM") -> pd.DataFra
         ".+" + fipname + r"\s+REPORT\s+REGION\s+(\d+)", re.IGNORECASE
     )
 
-    # Flag for whether we are supposedly parsing a PRT file made by OPM Flow:
-    opm = False
-
     with open(prtfile, encoding="utf-8") as prt_fh:
         logger.info(
             "Parsing file %s for blocks starting with %s REPORT REGION",
@@ -148,8 +145,6 @@ def df(prtfile: Union[str, ResdataFiles], fipname: str = "FIPNUM") -> pd.DataFra
             matcheddate = re.match(ecl_datematcher, line)
             if matcheddate is None:
                 matcheddate = re.match(opm_datematcher, line)
-                if matcheddate is not None:
-                    opm = True
             if matcheddate is not None:
                 newdate = datetime.date(
                     year=int(matcheddate.group(3)),
@@ -176,15 +171,19 @@ def df(prtfile: Union[str, ResdataFiles], fipname: str = "FIPNUM") -> pd.DataFra
                     # Skip if we are not on an interesting line.
                     continue
 
-                if opm is False:
-                    # The colons in the report block are not reliably included
-                    # (differs by Eclipse version), even in the same PRT file. We
-                    # insert them in fixed positions and hope for the best (if the
-                    # ASCII table is actually dynamic with respect to content, this
-                    # will fail)
+                # The colons in the report block are not reliably included
+                # (differs by Eclipse version), even in the same PRT file. We
+                # insert them in fixed positions and hope for the best (if the
+                # ASCII table is actually dynamic with respect to content, this
+                # will fail)
+                line = line.strip()
+                if line[0] != ":":
+                    line = ":" + line
+                # There should another colon somewhere between 25 - 27
+                # (depend on OPM/Eclipse version)
+                if ":" not in line[25:27] and len(line) > 26:
                     linechars = list(line)
-                    linechars[1] = ":"
-                    linechars[27] = ":"
+                    linechars[26] = ":"
                     line = "".join(linechars)
 
                 records.append(

{res2df-1.3.2 → res2df-1.3.3}/res2df/version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.3.2'
-__version_tuple__ = version_tuple = (1, 3, 2)
+__version__ = version = '1.3.3'
+__version_tuple__ = version_tuple = (1, 3, 3)

{res2df-1.3.2 → res2df-1.3.3}/res2df.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: res2df
-Version: 1.3.2
+Version: 1.3.3
 Summary: Convert reservoir simulator input and output to DataFrames
 Home-page: http://github.com/equinor/res2df
 Author: Håvard Berland

{res2df-1.3.2 → res2df-1.3.3}/res2df.egg-info/SOURCES.txt

@@ -1,4 +1,3 @@
-.codacy.yml
 .gitignore
 .pre-commit-config.yaml
 CONTRIBUTING.md

{res2df-1.3.2 → res2df-1.3.3}/tests/data/fipreports/TEST1.PRT

@@ -222,3 +222,55 @@ Randomly generated data
   OUTFLOW TO REGION   3            -87796.                      -87796.:         58859. :           -0.     -1594053.      -1594053.
   OUTFLOW TO REGION   8                 0.                           0.:         21859. :            0.            0.             0.
  ====================================================================================================================================
+
+### Starting from OPM 2025.10, no space at the beginning of the line
+
+                              **************************************************************************
+  BALANCE  AT         0  DAYS *Drogon synthetic reservoir model                                          *
+  REPORT    0    01 Jan 2018  *                                             Flow  version 2025.10-pre  *
+                              **************************************************************************
+
+
+                                                    ==================================================
+                                                    :                  FIELD TOTALS                  :
+                                                    :        PAV  =           300  BARSA             :
+                                                    :        PORV =     512394984  RM3               :
+                                                    : Pressure is weighted by hydrocarbon pore volume:
+                                                    : Pore volumes are taken at reference conditions :
+                          :--------------- OIL  SM3 ------------------:-- WAT    SM3 --:--------------  GAS     SM3 ---------------:
+                          :    LIQUID         VAPOUR        TOTAL     :     TOTAL      :     FREE        DISSOLVED       TOTAL     :
+:-------------------------:-------------------------------------------:----------------:-------------------------------------------:
+:CURRENTLY IN PLACE       :   33773363        162535       33935898   :   444928115    :  1056474997     4805914695    5862389693  :
+:-------------------------:-------------------------------------------:----------------:-------------------------------------------:
+:ORIGINALLY IN PLACE      :   33773363        162535       33935898   :   444928115    :  1056474997     4805914695    5862389693  :
+====================================================================================================================================
+
+
+
+                                                    ==================================================
+                                                    :              FIPOPM REPORT REGION  1           :
+                                                    :        PAV  =           300  BARSA             :
+                                                    :        PORV =      82199852  RM3               :
+                          :--------------- OIL  SM3 ------------------:-- WAT    SM3 --:--------------  GAS     SM3 ---------------:
+                          :    LIQUID         VAPOUR        TOTAL     :     TOTAL      :     FREE        DISSOLVED       TOTAL     :
+:-------------------------:-------------------------------------------:----------------:-------------------------------------------:
+:CURRENTLY IN PLACE       :    311274           0           311274    :    79180976    :       0          43833585      43833585   :
+:-------------------------:-------------------------------------------:----------------:-------------------------------------------:
+:ORIGINALLY IN PLACE      :    311274           0           311274    :    79180976    :       0          43833585      43833585   :
+:-------------------------:-------------------------------------------:----------------:-------------------------------------------:
+====================================================================================================================================
+
+
+
+                                                    ==================================================
+                                                    :              FIPOPM REPORT REGION  2           :
+                                                    :        PAV  =           302  BARSA             :
+                                                    :        PORV =      21191418  RM3               :
+                          :--------------- OIL  SM3 ------------------:-- WAT    SM3 --:--------------  GAS     SM3 ---------------:
+                          :    LIQUID         VAPOUR        TOTAL     :     TOTAL      :     FREE        DISSOLVED       TOTAL     :
+:-------------------------:-------------------------------------------:----------------:-------------------------------------------:
+:CURRENTLY IN PLACE       :    4893558          0          4893558    :    13735096    :       0         689110895     689110895   :
+:-------------------------:-------------------------------------------:----------------:-------------------------------------------:
+:ORIGINALLY IN PLACE      :    4893558          0          4893558    :    13735096    :       0         689110895     689110895   :
+:-------------------------:-------------------------------------------:----------------:-------------------------------------------:
+====================================================================================================================================

{res2df-1.3.2 → res2df-1.3.3}/tests/test_fipreports.py

@@ -69,6 +69,10 @@ def test_mockprtfile():
     assert dframe["FIPNAME"].unique() == "FIPOWG"
     assert len(dframe["DATE"].unique()) == 1
 
+    dframe = fipreports.df(MOCKPRTFILE, fipname="FIPOPM")
+    assert dframe["FIPNAME"].unique() == "FIPOPM"
+    assert len(dframe["DATE"].unique()) == 1
+
     with pytest.raises(ValueError):
         fipreports.df(MOCKPRTFILE, fipname="WIPNUM")
 

res2df-1.3.2/.codacy.yml

@@ -1,2 +0,0 @@
-exclude_paths:
-  - docs/conf.py