res2df 1.3.6__py3-none-any.whl → 1.3.7__py3-none-any.whl

res2df/grid.py

@@ -438,13 +438,12 @@ def init2df(
     usevectors = []
     include_porv = False
     for vec in init.headers:
-        if vec[1] == egrid.getNumActive() and any(
+        if vec[0] == "PORV" and any(fnmatch.fnmatch("PORV", key) for key in vectors):
+            include_porv = True
+        elif vec[1] == egrid.getNumActive() and any(
             fnmatch.fnmatch(vec[0], key) for key in vectors
         ):
             usevectors.append(vec[0])
-        if vec[0] == "PORV" and any(fnmatch.fnmatch("PORV", key) for key in vectors):
-            include_porv = True
-
     if usevectors:
         init_df = pd.DataFrame(
             columns=usevectors,
@@ -465,8 +464,6 @@ def init2df(
     else:
         init_df = pd.DataFrame()  # empty
 
-    logger.info("Extracted %s from INIT file", str(init_df.columns.values))
-
     # PORV is indexed by active_index, not global, needs special treatment:
     if include_porv:
         porv_numpy = init.iget_named_kw("PORV", 0).numpyView()
@@ -474,7 +471,8 @@ def init2df(
             egrid.get_global_index(active_index=ix)
             for ix in range(egrid.getNumActive())
         ]
-        init_df["PORV"] = porv_numpy[glob_idxs].reshape(-1, 1)
+        init_df["PORV"] = porv_numpy[glob_idxs]
+    logger.info("Extracted %s from INIT file", str(init_df.columns.values))
     return init_df
 
 

res2df/nnc.py

@@ -60,7 +60,7 @@ def df(
     # Grid indices for first cell in cell pairs, into a vertical
     # vector. The indices are "global" in resdata terms, and are
     # 1-based (FORTRAN). Convert to zero-based before sending to get_ijk()
-    nnc1 = egrid_file["NNC1"][0].numpy_view().reshape(-1, 1)
+    nnc1 = egrid_file["NNC1"][0].numpy_view()
     logger.info(
         "NNC1: len: %d, min: %d, max: %d (global indices)",
         len(nnc1),
@@ -76,7 +76,8 @@ def df(
     nnc1_df[idx_cols1] += 1
 
     # Grid indices for second cell in cell pairs
-    nnc2 = egrid_file["NNC2"][0].numpy_view().reshape(-1, 1)
+    nnc2 = egrid_file["NNC2"][0].numpy_view()
+
     logger.info(
         "NNC2: len: %d, min: %d, max: %d (global indices)",
         len(nnc2),
@@ -91,7 +92,7 @@ def df(
     nnc2_df[idx_cols2] += 1
 
     # Obtain transmissibility value, corresponding to the cell pairs above.
-    tran = init_file["TRANNNC"][0].numpy_view().reshape(-1, 1)
+    tran = init_file["TRANNNC"][0].numpy_view()
     logger.info(
         "TRANNNC: len: %d, min: %f, max: %f, mean=%f",
         len(tran),

res2df/version.py

@@ -1,7 +1,14 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -9,13 +16,19 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
 
-__version__ = version = '1.3.6'
-__version_tuple__ = version_tuple = (1, 3, 6)
+__version__ = version = '1.3.7'
+__version_tuple__ = version_tuple = (1, 3, 7)
+
+__commit_id__ = commit_id = None

{res2df-1.3.6.dist-info → res2df-1.3.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: res2df
-Version: 1.3.6
+Version: 1.3.7
 Summary: Convert reservoir simulator input and output to DataFrames
 Author-email: Håvard Berland <havb@equinor.com>
 License:                     GNU GENERAL PUBLIC LICENSE

{res2df-1.3.6.dist-info → res2df-1.3.7.dist-info}/RECORD

@@ -7,10 +7,10 @@ res2df/csv2res.py,sha256=2LegGNGjEQ4lzRPjmS5MYTDsq8yWcRSd2OY6rpearEI,3283
 res2df/equil.py,sha256=NIJwAgbpjJg0pxsqfxPB86d2rdAVMNJBKsJsoG6ExxU,17175
 res2df/faults.py,sha256=5v4cWcEmIQwG8TXBBsiteT_3kCNO0noNiAiOZ6JC-80,3163
 res2df/fipreports.py,sha256=jgwSDOMjtsoluRqhA03TzrnjvbI7nClCIYoDHQmsiY0,7696
-res2df/grid.py,sha256=4V9nPtZQpk4DejBZANVdA-1DBJ0sVK6odPLe3XSoFCA,27680
+res2df/grid.py,sha256=tqUUleUx0_cqYm25jCFkkH2RF0aIsaCW7y5eMVOBm84,27665
 res2df/gruptree.py,sha256=-qDpjaeWY5Lk42wZJ-uBWyJvigcSCo1VOAOyBxrzhOk,16943
 res2df/inferdims.py,sha256=ur0GE1ASzfzoXPgUjaow46NWBlBCgiX6qfAmn8HJatg,7329
-res2df/nnc.py,sha256=qEPuAhTFwmZuClxaKsrBh28HlLquE0-XH7ams4ylt50,9346
+res2df/nnc.py,sha256=ct3p4-wS7PhEbgk3XSw2fIQ8XAMMKB-u3xBCoTCcVsE,9302
 res2df/parameters.py,sha256=pkgmW5tVtyMav1T43RxdYHnoejvnZarFhKfhhgp028U,6277
 res2df/pillars.py,sha256=NXFZhcd4L0pRFLH3B3ip_3ClVuy8Dgz13m4QW4mZDfA,16174
 res2df/pvt.py,sha256=JNmCUvaNBnq-SUdmnxkt9n3rkR-HUneiHJBfINACVfU,22646
@@ -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=O6KrLlaUs-R3ppT6iunhqb7DyTGig2RAYgNqUiGEk0w,511
+res2df/version.py,sha256=9qdAkeKpYRPlg4U3YkEjvtASI0L0DeNUwh145oTzMIs,704
 res2df/wcon.py,sha256=67A2qtqokaefLyI5mdTaGkTlkSkDIRhVNVYA-8TE9oE,3376
 res2df/wellcompletiondata.py,sha256=s4PvMNYBcgSJzPE6_so6suxgeI_fzHbDzA8kHxen-AA,10990
 res2df/wellconnstatus.py,sha256=Wq6VHTrpbiqKveOu1T0Q_AT1gg4sqNI6rjc-LxuHJEs,4069
@@ -79,9 +79,9 @@ res2df/vfp/_vfpcommon.py,sha256=0no9r1jwGaABXexZ6WoKrOl2fFq87RMmcRZLE640cnk,7053
 res2df/vfp/_vfpdefs.py,sha256=yvi5nCkJ2UZxVx0LuVbBHLNjn0e0UCSZudmzvTk689A,7028
 res2df/vfp/_vfpinj.py,sha256=x_lyeYLLLfMo4knh8TSrcOM5vhe9mARiqMfKcWBiXdk,23690
 res2df/vfp/_vfpprod.py,sha256=4fkRXs5TxuZPx4GbJod9NB2foxLC0wDdSFui7AyWh2c,36881
-res2df-1.3.6.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-res2df-1.3.6.dist-info/METADATA,sha256=OzxDIOulutVgTOK6AikEuc6Wf-0ab00u2U-sEjlNEuM,44422
-res2df-1.3.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-res2df-1.3.6.dist-info/entry_points.txt,sha256=ctl-_CwayyUVqFMUrwTT3Z3gZdnW6WCaiaLUJ4f_HnY,180
-res2df-1.3.6.dist-info/top_level.txt,sha256=U8AZBqrFHm9PMXg0toCfHJ817VfFtdKQpc8JuS5qToM,7
-res2df-1.3.6.dist-info/RECORD,,
+res2df-1.3.7.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+res2df-1.3.7.dist-info/METADATA,sha256=lV8yxdAGJ9hF5GmnJQIK8ZuMPGvcLRePe8iYAKV-FTo,44422
+res2df-1.3.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+res2df-1.3.7.dist-info/entry_points.txt,sha256=ctl-_CwayyUVqFMUrwTT3Z3gZdnW6WCaiaLUJ4f_HnY,180
+res2df-1.3.7.dist-info/top_level.txt,sha256=U8AZBqrFHm9PMXg0toCfHJ817VfFtdKQpc8JuS5qToM,7
+res2df-1.3.7.dist-info/RECORD,,