res2df 1.3.2__py2.py3-none-any.whl → 1.3.3__py2.py3-none-any.whl

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/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.dist-info → res2df-1.3.3.dist-info}/METADATA

@@ -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.dist-info → res2df-1.3.3.dist-info}/RECORD

@@ -6,7 +6,7 @@ res2df/constants.py,sha256=0W-ZYlm3Bbe9MONrRhA0c4yLXfJlqGX5apFN64i8RU0,258
 res2df/csv2res.py,sha256=2LegGNGjEQ4lzRPjmS5MYTDsq8yWcRSd2OY6rpearEI,3283
 res2df/equil.py,sha256=NIJwAgbpjJg0pxsqfxPB86d2rdAVMNJBKsJsoG6ExxU,17175
 res2df/faults.py,sha256=5v4cWcEmIQwG8TXBBsiteT_3kCNO0noNiAiOZ6JC-80,3163
-res2df/fipreports.py,sha256=PwFUyNDngUi03cTJB8aPIQliPob82N5_IpkjOSbZPUg,7666
+res2df/fipreports.py,sha256=jgwSDOMjtsoluRqhA03TzrnjvbI7nClCIYoDHQmsiY0,7696
 res2df/grid.py,sha256=4V9nPtZQpk4DejBZANVdA-1DBJ0sVK6odPLe3XSoFCA,27680
 res2df/gruptree.py,sha256=4XO-jUaxZHr26iZOkyKByxCYQ1TU2fyW8a76jzphlZM,16929
 res2df/inferdims.py,sha256=ur0GE1ASzfzoXPgUjaow46NWBlBCgiX6qfAmn8HJatg,7329
@@ -22,7 +22,7 @@ res2df/satfunc.py,sha256=sxoqXsORI5xijD0RSybr6unm-sQNpUckXFNwHEtVdv8,13808
 res2df/summary.py,sha256=cHRL78XaypLCCdrIcW9gnlLmoCW6U6Nqpy5yO7FxaTQ,31833
 res2df/svg_color_keyword_names.txt,sha256=yiI2Ohv3NxxEAJC5OjVERZi7MLi2-bk7okyI5-xFDr8,1456
 res2df/trans.py,sha256=fWlelN74QPnxm5krWYXIGxhRZKVJA2r1lHXE-Ac1DuI,10880
-res2df/version.py,sha256=2MIKMHG_bp3KmQVZwa0rSvoTHIRfxwkSxFOUhMK4eQc,511
+res2df/version.py,sha256=izB7sUD9NjNwuyxtrmSVzoVd_rq6pE3mbNEjvepKk_g,511
 res2df/wcon.py,sha256=67A2qtqokaefLyI5mdTaGkTlkSkDIRhVNVYA-8TE9oE,3376
 res2df/wellcompletiondata.py,sha256=s4PvMNYBcgSJzPE6_so6suxgeI_fzHbDzA8kHxen-AA,10990
 res2df/wellconnstatus.py,sha256=KPteMgwomDpp11rAkmN5GTLMEdS79Ah0QEFdG0VSu-E,4055
@@ -79,9 +79,9 @@ res2df/vfp/_vfpcommon.py,sha256=0no9r1jwGaABXexZ6WoKrOl2fFq87RMmcRZLE640cnk,7053
 res2df/vfp/_vfpdefs.py,sha256=yvi5nCkJ2UZxVx0LuVbBHLNjn0e0UCSZudmzvTk689A,7028
 res2df/vfp/_vfpinj.py,sha256=HZddHIarLUD4BlMsch8kUBTjxyOctpN56X2qPJiSzLo,23676
 res2df/vfp/_vfpprod.py,sha256=gmPKYDxphIutdhH-cn4qr5sIOGSDtxNNNAbk5Krc5Dk,36825
-res2df-1.3.2.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-res2df-1.3.2.dist-info/METADATA,sha256=HSjJKB8l7GQIUqc54aBQF11IQ2KTy3f4WyUZE36x5JM,3361
-res2df-1.3.2.dist-info/WHEEL,sha256=AeO2BvogYWm3eGaHCvhzmUYt8ia7KfURiHzO_1atlys,109
-res2df-1.3.2.dist-info/entry_points.txt,sha256=ctl-_CwayyUVqFMUrwTT3Z3gZdnW6WCaiaLUJ4f_HnY,180
-res2df-1.3.2.dist-info/top_level.txt,sha256=U8AZBqrFHm9PMXg0toCfHJ817VfFtdKQpc8JuS5qToM,7
-res2df-1.3.2.dist-info/RECORD,,
+res2df-1.3.3.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+res2df-1.3.3.dist-info/METADATA,sha256=g8fVXqZjlSmTUw-Rkrux6PU_0tBrHOFvEF0sWfZZ2Wc,3361
+res2df-1.3.3.dist-info/WHEEL,sha256=oSJJyWjO7Z2XSScFQUpXG1HL-N0sFMqqeKVVbZTPkWc,109
+res2df-1.3.3.dist-info/entry_points.txt,sha256=ctl-_CwayyUVqFMUrwTT3Z3gZdnW6WCaiaLUJ4f_HnY,180
+res2df-1.3.3.dist-info/top_level.txt,sha256=U8AZBqrFHm9PMXg0toCfHJ817VfFtdKQpc8JuS5qToM,7
+res2df-1.3.3.dist-info/RECORD,,

{res2df-1.3.2.dist-info → res2df-1.3.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (79.0.1)
+Generator: setuptools (80.3.1)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any