res2df 1.2.3__tar.gz → 1.3.1__tar.gz

{res2df-1.2.3 → res2df-1.3.1}/.github/workflows/codecov.yml

@@ -13,7 +13,7 @@ jobs:
         os: [ubuntu-latest]
     env:
       OS: ${{ matrix.os }}
-      PYTHON: '3.8'
+      PYTHON: '3.11'
 
     steps:
     - uses: actions/checkout@v4
@@ -21,7 +21,7 @@ jobs:
     - name: Setup Python
       uses: actions/setup-python@v5
       with:
-        python-version: 3.8
+        python-version: 3.11
         cache: "pip"
         cache-dependency-path: |
           setup.py

{res2df-1.2.3 → res2df-1.3.1}/.github/workflows/res2df.yml

@@ -19,21 +19,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
-        pandas-version: ['pandas>2']
+        python-version: ['3.11', '3.12']
         include:
           # For one of the Python versions we
           # install the extra dependency ert
           # (in order to not double the job matrix)
-
-          # Only test with pandas < 2 for py38 and py311
-          # No wheels for python3.12 for pandas<2
-          - python-version: '3.8'
-            install-ert: true
-          - python-version: '3.8'
-            pandas-version: 'pandas<2'
           - python-version: '3.11'
-            pandas-version: 'pandas<2'
+            install-ert: true
 
     steps:
       - name: Checkout commit locally
@@ -58,13 +50,6 @@ jobs:
           pip install --upgrade pip
           pip install ".[tests, docs]"
 
-      - name: Install numpy<2 if pandas<2
-        if: matrix.pandas-version == 'pandas<2'
-        run: pip install "numpy<2"
-
-      - name: Check pandas version
-        run: |
-          pip install "${{matrix.pandas-version}}"
 
       - name: Install ert
         if: matrix.install-ert
@@ -87,7 +72,7 @@ jobs:
           python setup.py build_sphinx
 
       - name: Update GitHub pages
-        if: github.repository_owner == 'equinor' && github.ref == 'refs/heads/master' && matrix.python-version == '3.8' && matrix.pandas-version == 'pandas>2'
+        if: github.repository_owner == 'equinor' && github.ref == 'refs/heads/master' && matrix.python-version == '3.11'
         run: |
             cp -R ./build/sphinx/html ../html
 
@@ -110,7 +95,7 @@ jobs:
             fi
 
       - name: Build python package and publish to pypi
-        if: github.event_name == 'release' && matrix.python-version == '3.8' && matrix.pandas-version == 'pandas>2'
+        if: github.event_name == 'release' && matrix.python-version == '3.11'
         env:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.res2df_pypi_token }}

{res2df-1.2.3 → res2df-1.3.1}/.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.6.0
+  rev: v5.0.0
   hooks:
   - id:  no-commit-to-branch
     args: ['--branch', 'master']
@@ -13,7 +13,7 @@ repos:
   - id: trailing-whitespace
 
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.5.7
+    rev: v0.9.2
     hooks:
     - id: ruff
       args: [ --fix ]

res2df-1.3.1/CONTRIBUTING.md

@@ -0,0 +1,30 @@
+# Contributing
+
+The following is a set of guidelines for contributing to `res2df`.
+
+There are several important ways you can help; here are some examples:
+
+- Submitting bug reports and feature requests: see [Issues](https://github.com/equinor/res2df/issues).
+- Proposing code for bug fixes and new features, then [making a pull request](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests).
+- Fixing typos and generally improving the documentation.
+- Writing tutorials, examples, and how-to documents.
+
+
+## Commits
+
+We strive to keep a consistent and clean git history and all contributions should adhere to the following:
+
+1. All tests should pass on all commits
+1. A commit should do one atomic change on the repository
+1. The commit headline should be descriptive and in the imperative
+
+Please note that we use [`black`](https://black.readthedocs.io/en/stable/) and [`isort`](https://pycqa.github.io/isort/) for code formatting.
+
+
+## Pull request process
+
+1. Work on your own fork of the main repo.
+1. Push your commits and make a draft pull request using the pull request template.
+1. Check that your pull request passes all tests.
+1. When all tests have passed and your are happy with your changes, change your pull request to "ready for review", and ask for a code review.
+1. When your code has been approved you should rebase, squash and merge your changes.

{res2df-1.2.3 → res2df-1.3.1}/PKG-INFO

@@ -1,12 +1,12 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: res2df
-Version: 1.2.3
+Version: 1.3.1
 Summary: Convert reservoir simulator input and output to DataFrames
 Home-page: http://github.com/equinor/res2df
 Author: Håvard Berland
 Author-email: havb@equinor.com
 License: GPLv3
-Requires-Python: >=3.8
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: resdata>=5.0.0-b0
@@ -41,10 +41,20 @@ Requires-Dist: sphinx-autodoc-typehints; extra == "docs"
 Requires-Dist: sphinx_rtd_theme; extra == "docs"
 Provides-Extra: ert
 Requires-Dist: ert>=10.2.0b13; extra == "ert"
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 [![Build Status](https://img.shields.io/github/workflow/status/equinor/res2df/res2df)](https://github.com/equinor/res2df/actions?query=workflow%3Ares2df)
 [![codecov](https://codecov.io/gh/equinor/res2df/graph/badge.svg?token=3sZBGGu5VG)](https://codecov.io/gh/equinor/res2df)
-[![Python 3.8-3.12](https://img.shields.io/badge/python-3.8%20|%203.9%20|%203.10%20|%203.11%20|%203.12-blue.svg)](https://www.python.org)
+[![Python 3.11-3.12](https://img.shields.io/badge/python-3.11%20|%203.12-blue.svg)](https://www.python.org)
 [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
 

{res2df-1.2.3 → res2df-1.3.1}/README.md

@@ -1,6 +1,6 @@
 [![Build Status](https://img.shields.io/github/workflow/status/equinor/res2df/res2df)](https://github.com/equinor/res2df/actions?query=workflow%3Ares2df)
 [![codecov](https://codecov.io/gh/equinor/res2df/graph/badge.svg?token=3sZBGGu5VG)](https://codecov.io/gh/equinor/res2df)
-[![Python 3.8-3.12](https://img.shields.io/badge/python-3.8%20|%203.9%20|%203.10%20|%203.11%20|%203.12-blue.svg)](https://www.python.org)
+[![Python 3.11-3.12](https://img.shields.io/badge/python-3.11%20|%203.12-blue.svg)](https://www.python.org)
 [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
 

res2df-1.3.1/ci/testkomodo.sh

@@ -0,0 +1,13 @@
+install_test_dependencies () {
+  pip install -r test_requirements.txt
+}
+
+start_tests () {
+  SHELLOPTS_BEFORE=$(set +o)
+  set +e
+  # (this script becomes flaky if set -e is active)
+  source /prog/res/ecl/script/eclrun.bash
+  eval "$SHELLOPTS_BEFORE"
+
+  pytest --run-eclipse-simulator
+}

{res2df-1.2.3 → res2df-1.3.1}/res2df/common.py

@@ -10,6 +10,7 @@ import re
 import shlex
 import signal
 import sys
+from collections import defaultdict
 from pathlib import Path
 from typing import Any, Dict, List, Optional, Set, Union
 
@@ -397,7 +398,7 @@ def merge_zones(
     zone_df.index.name = "K"
     zone_df.reset_index(inplace=True)
 
-    df[zoneheader] = df[kname].map(zonedict)
+    df[zoneheader] = df[kname].map(defaultdict(lambda: None, zonedict))
     return df
 
 
@@ -476,7 +477,7 @@ def fill_reverse_parser(
     """
     parser.add_argument(
         "csvfile",
-        help="Name of CSV file with " + modulename + " data with " "res2df format",
+        help="Name of CSV file with " + modulename + " data with res2df format",
     )
     parser.add_argument(
         "-o",
@@ -690,7 +691,7 @@ def generic_deck_table(
 
     # NaN or Nones are assumed to be defaulted, which in Eclipse terminology is
     # the string "1*":
-    dframe.fillna(value="1*", inplace=True)
+    dframe = dframe.fillna(value="1*")
 
     if drop_trailing_columns:
         for col_name in reversed(relevant_columns):
@@ -709,9 +710,9 @@ def generic_deck_table(
     }
     for int_col in integer_cols.intersection(dframe.columns):
         defaulted_rows = dframe[int_col] == "1*"
-        dframe.loc[~defaulted_rows, int_col] = (
-            dframe.loc[~defaulted_rows, int_col].astype(int).astype(str)
-        )
+        integer_values = dframe.loc[~defaulted_rows, int_col].astype(int)
+        dframe[int_col] = dframe[int_col].astype(str)
+        dframe.loc[~defaulted_rows, int_col] = integer_values
 
     # Quote all string data. This is not always needed, but needed
     # for some colums, for example well-names containing a slash.
@@ -826,9 +827,9 @@ def stack_on_colnames(
     dframe.columns = pd.MultiIndex.from_tuples(
         tuplecolumns, names=["dummy", stackcolname]
     )
-    dframe = dframe.stack()
+    dframe = dframe.stack(future_stack=True)
     staticcols = [col[0] for col in tuplecolumns if len(col) == 1]
-    dframe[staticcols] = dframe[staticcols].fillna(method="ffill")
+    dframe[staticcols] = dframe[staticcols].ffill()
     dframe.reset_index(inplace=True)
     # Drop rows stemming from the NaNs in the second tuple-element for
     # static columns:

{res2df-1.2.3 → res2df-1.3.1}/res2df/compdat.py

@@ -615,8 +615,7 @@ def expand_wlist(wlist_df: pd.DataFrame) -> pd.DataFrame:
             and wlist_record["NAME"] not in currentstate
         ):
             raise ValueError(
-                "WLIST ADD/DEL only works on existing well lists: "
-                f"{str(wlist_record)}"
+                f"WLIST ADD/DEL only works on existing well lists: {str(wlist_record)}"
             )
         if wlist_record["ACTION"] == "ADD":
             currentstate[wlist_record["NAME"]] = " ".join(
@@ -888,14 +887,12 @@ def applywelopen(
             ].drop_duplicates(subset=["I", "J", "K1", "K2"], keep="last")
         else:
             raise ValueError(
-                "A WELOPEN keyword contains data that could not be parsed. "
-                f"\n {row} "
+                f"A WELOPEN keyword contains data that could not be parsed. \n {row} "
             )
 
         if previous_state.empty:
             raise ValueError(
-                "A WELOPEN keyword is not acting on any existing connection. "
-                f"\n {row} "
+                f"A WELOPEN keyword is not acting on any existing connection. \n {row} "
             )
 
         new_state = previous_state

{res2df-1.2.3 → res2df-1.3.1}/res2df/csv2res.py

@@ -90,8 +90,7 @@ def get_parser() -> argparse.ArgumentParser:
         "satfunc",
         help="Write saturation function include files",
         description=(
-            "Write saturation function include files from CSV files with "
-            "res2df format."
+            "Write saturation function include files from CSV files with res2df format."
         ),
     )
     satfunc_fill_reverse_parser(satfunc_parser)

{res2df-1.2.3 → res2df-1.3.1}/res2df/equil.py

@@ -298,7 +298,7 @@ def fill_parser(parser: argparse.ArgumentParser) -> argparse.ArgumentParser:
         "-o",
         "--output",
         type=str,
-        help=("Name of output csv file. " "Use '-' for stdout."),
+        help=("Name of output csv file. Use '-' for stdout."),
         default="equil.csv",
     )
     parser.add_argument(

{res2df-1.2.3 → res2df-1.3.1}/res2df/grid.py

@@ -686,10 +686,7 @@ def df2res(
 
     if "GLOBAL_INDEX" not in grid_df:
         logger.warning(
-            (
-                "Global index not found in grid dataframe. "
-                "Assumes all cells are active"
-            )
+            ("Global index not found in grid dataframe. Assumes all cells are active")
         )
         # Drop NaN rows for columns to be used (triggered by stacked
         # dates and no global index, unlikely)

{res2df-1.2.3 → res2df-1.3.1}/res2df/gruptree.py

@@ -9,6 +9,7 @@ import sys
 import warnings
 from typing import Any, Dict, List, Optional, Tuple, Union
 
+import numpy as np
 import pandas as pd
 import treelib
 
@@ -19,6 +20,7 @@ with contextlib.suppress(ImportError):
     import opm.io
 
 from .common import (
+    OPMKEYWORDS,
     parse_opmio_date_rec,
     parse_opmio_deckrecord,
     parse_opmio_tstep_rec,
@@ -91,7 +93,7 @@ def df(
     # Flags which will tell when a new network related keyword
     # has been encountered
     keywords = ["GRUPTREE", "BRANPROP", "WELSPECS", "GRUPNET", "NODEPROP"]
-    found_keywords = {key: False for key in keywords}
+    found_keywords = dict.fromkeys(keywords, False)
     for kword in deck:
         if kword.name in ["DATES", "START", "TSTEP"]:
             # Whenever we encounter a new DATES, it means that
@@ -107,7 +109,7 @@ def df(
                 edgerecords += _write_edgerecords(
                     currentedges, nodedata, wellspecsedges, found_keywords, date
                 )
-                found_keywords = {key: False for key in keywords}
+                found_keywords = dict.fromkeys(keywords, False)
             # Done dumping the data for the previous date, parse the fresh
             # date:
             if kword.name in ["DATES", "START"]:
@@ -164,6 +166,17 @@ def df(
             currentedges, nodedata, wellspecsedges, found_keywords, date
         )
     dframe = pd.DataFrame(edgerecords)
+
+    string_cols = {"PARENT", "CHILD"}
+    for keyword in ["GRUPTREE", "BRANPROP", "NODEPROP", "GRUPNET", "WELSPECS"]:
+        string_cols |= {
+            item["name"]
+            for item in OPMKEYWORDS[keyword]["items"]
+            if item["value_type"] == "STRING"
+        }
+    for col in string_cols:
+        if col in dframe:
+            dframe[col] = dframe[col].replace(np.nan, None)
     if "DATE" in dframe:
         dframe["DATE"] = pd.to_datetime(dframe["DATE"])
 

{res2df-1.2.3 → res2df-1.3.1}/res2df/pvt.py

@@ -375,7 +375,7 @@ def df2res_rock(dframe: pd.DataFrame, comment: Optional[str] = None) -> str:
         return "-- No data!"
     string = "ROCK\n"
     string += comment_formatter(comment)
-    string += "--   {'PRESSURE':^21} {'COMPRESSIBILITY':^21}\n"
+    string += f"--   {'PRESSURE':^21} {'COMPRESSIBILITY':^21}\n"
     # Use everything if KEYWORD not in dframe..
     subset = dframe if "KEYWORD" not in dframe else dframe[dframe["KEYWORD"] == "ROCK"]
     if "PVTNUM" not in subset:

{res2df-1.2.3 → res2df-1.3.1}/res2df/rft.py

@@ -90,8 +90,8 @@ def _rftrecords2df(rftfile: ResdataFile) -> pd.DataFrame:
     nav_df.loc[nav_df["recordname"] == "TIME", "timeindex"] = nav_df[
         nav_df["recordname"] == "TIME"
     ].index
-    nav_df.fillna(
-        method="ffill", inplace=True
+    nav_df.ffill(
+        inplace=True
     )  # forward fill (because any record is associated to the previous TIME record)
     nav_df["timeindex"] = nav_df["timeindex"].astype(int)
     logger.info(
@@ -242,7 +242,7 @@ def process_seg_topology(seg_data: pd.DataFrame) -> pd.DataFrame:
     seg_data = seg_data.sort_values("SEGIDX")
     # For the first segment, None is allowed as SEGNXT, which excludes
     # int as a  Pandas type. Convert to 0 for the moment
-    seg_data["SEGNXT"] = seg_data["SEGNXT"].fillna(value=0).astype(int)
+    seg_data["SEGNXT"] = seg_data["SEGNXT"].fillna(value="0").astype(int)
 
     # Outer merge first to add the upstream segment information to every row.
     merged = pd.merge(
@@ -481,14 +481,14 @@ def add_extras(dframe: pd.DataFrame, inplace: bool = True) -> pd.DataFrame:
         dframe = dframe.copy()
 
     if "CONPRES" in dframe and "SEGPRES" in dframe:
-        dframe["COMPLETION_DP"] = 0
+        dframe["COMPLETION_DP"] = 0.0
         nonzero_pres = (dframe["CONPRES"] > 0) & (dframe["SEGPRES"] > 0)
         dframe.loc[nonzero_pres, "COMPLETION_DP"] = (
             dframe.loc[nonzero_pres, "CONPRES"] - dframe.loc[nonzero_pres, "SEGPRES"]
         )
 
     if not dframe.empty:
-        dframe["DRAWDOWN"] = 0  # Set a default so that the column always exists
+        dframe["DRAWDOWN"] = 0.0  # Set a default so that the column always exists
 
     if "CONPRES" in dframe and "PRESSURE" in dframe:
         nonzero_conpres = dframe["CONPRES"] > 0

{res2df-1.2.3 → res2df-1.3.1}/res2df/satfunc.py

@@ -144,9 +144,9 @@ def interpolate_defaults(dframe: pd.DataFrame) -> pd.DataFrame:
     can consist of multiple SATNUMs.
     """
     sat_cols: set = {"SW", "SO", "SG", "SL"}.intersection(dframe.columns)
-    assert (
-        len(sat_cols) == 1
-    ), f"Could not determine a single saturation column in {dframe.columns}"
+    assert len(sat_cols) == 1, (
+        f"Could not determine a single saturation column in {dframe.columns}"
+    )
     sat_col = list(sat_cols)[0]
 
     if dframe[sat_col].isna().any():
@@ -154,11 +154,12 @@ def interpolate_defaults(dframe: pd.DataFrame) -> pd.DataFrame:
 
     filled_frames = []
     for _, subframe in dframe.groupby("SATNUM"):
-        filled_frames.append(
-            subframe.set_index(sat_col)
-            .interpolate(method="index", limit_area="inside")
-            .reset_index()
+        subframe.set_index(sat_col, inplace=True)
+        numeric_columns = subframe.select_dtypes(include=["float", "int"]).columns
+        subframe[numeric_columns] = subframe[numeric_columns].interpolate(
+            method="index", limit_area="inside"
         )
+        filled_frames.append(subframe.reset_index())
     return pd.concat(filled_frames)
 
 

{res2df-1.2.3 → res2df-1.3.1}/res2df/summary.py

@@ -461,7 +461,9 @@ def _ensure_unique_datetime_index(dframe: pd.DataFrame) -> pd.DataFrame:
 
             if dframe.attrs["meta"]["TIMESTEP"]["unit"] == "DAYS":
                 for idx in np.where(index_duplicates)[0]:
-                    index_as_list[idx] += dt.timedelta(days=dframe["TIMESTEP"][idx])
+                    index_as_list[idx] += dt.timedelta(
+                        days=dframe["TIMESTEP"].iloc[idx]
+                    )
             elif dframe.attrs["meta"]["TIMESTEP"]["unit"] == "HOURS":
                 for idx in np.where(index_duplicates)[0]:
                     index_as_list[idx] += dt.timedelta(hours=dframe["TIMESTEP"][idx])
@@ -761,9 +763,7 @@ def fill_parser(parser: argparse.ArgumentParser) -> argparse.ArgumentParser:
         "-o",
         "--output",
         type=str,
-        help=(
-            "Name of output file. Use '-' to write to stdout. " "Default 'summary.csv'"
-        ),
+        help=("Name of output file. Use '-' to write to stdout. Default 'summary.csv'"),
         default="summary.csv",
     )
     parser.add_argument("--arrow", action="store_true", help="Write to pyarrow format")

{res2df-1.2.3 → res2df-1.3.1}/res2df/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.2.3'
-__version_tuple__ = version_tuple = (1, 2, 3)
+__version__ = version = '1.3.1'
+__version_tuple__ = version_tuple = (1, 3, 1)

{res2df-1.2.3 → res2df-1.3.1}/res2df.egg-info/PKG-INFO

@@ -1,12 +1,12 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: res2df
-Version: 1.2.3
+Version: 1.3.1
 Summary: Convert reservoir simulator input and output to DataFrames
 Home-page: http://github.com/equinor/res2df
 Author: Håvard Berland
 Author-email: havb@equinor.com
 License: GPLv3
-Requires-Python: >=3.8
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: resdata>=5.0.0-b0
@@ -41,10 +41,20 @@ Requires-Dist: sphinx-autodoc-typehints; extra == "docs"
 Requires-Dist: sphinx_rtd_theme; extra == "docs"
 Provides-Extra: ert
 Requires-Dist: ert>=10.2.0b13; extra == "ert"
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 [![Build Status](https://img.shields.io/github/workflow/status/equinor/res2df/res2df)](https://github.com/equinor/res2df/actions?query=workflow%3Ares2df)
 [![codecov](https://codecov.io/gh/equinor/res2df/graph/badge.svg?token=3sZBGGu5VG)](https://codecov.io/gh/equinor/res2df)
-[![Python 3.8-3.12](https://img.shields.io/badge/python-3.8%20|%203.9%20|%203.10%20|%203.11%20|%203.12-blue.svg)](https://www.python.org)
+[![Python 3.11-3.12](https://img.shields.io/badge/python-3.11%20|%203.12-blue.svg)](https://www.python.org)
 [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
 

{res2df-1.2.3 → res2df-1.3.1}/res2df.egg-info/SOURCES.txt

@@ -1,6 +1,7 @@
 .codacy.yml
 .gitignore
 .pre-commit-config.yaml
+CONTRIBUTING.md
 LICENSE
 README.md
 SECURITY.md

{res2df-1.2.3 → res2df-1.3.1}/setup.py

@@ -85,5 +85,5 @@ setup(
     install_requires=REQUIREMENTS,
     setup_requires=SETUP_REQUIREMENTS,
     extras_require=EXTRAS_REQUIRE,
-    python_requires=">=3.8",
+    python_requires=">=3.11",
 )

{res2df-1.2.3 → res2df-1.3.1}/tests/data/eightcells/EIGHTCELLS.DATA

@@ -17,7 +17,7 @@ EQLDIMS
   1 /
 
 WELLDIMS
-  1 /
+  1 1 1 1 /
 
 WSEGDIMS
   1 10 10 /
@@ -161,7 +161,7 @@ WELSEGS
 COMPSEGS
  OP1 /
 --i j k branch len
-  1 1 1 1      10 10 Z /
+  1 1 1 1      10 20 Z /
 /
 
 WRFTPLT

{res2df-1.2.3 → res2df-1.3.1}/tests/test_equil.py

@@ -446,7 +446,7 @@ RSVD
     pd.testing.assert_frame_equal(rsvd_df, rsvd_df_fromcsv)
 
 
-def test_ntequl():
+def test_ntequl_no_eqldims():
     """Test that we can infer NTEQUL when not supplied"""
     deckstr = """
 GAS
@@ -479,6 +479,8 @@ EQUIL
     with pytest.raises((ValueError, RuntimeError)):
         equil.df(deckstr, ntequl=3)
 
+
+def test_ntequl_with_eqldims():
     deckstr = """
 GAS
 OIL

{res2df-1.2.3 → res2df-1.3.1}/tests/test_gruptree.py

@@ -31,7 +31,7 @@ def test_eightcells_dataset():
 
     expected_dframe = pd.DataFrame(
         [
-            ["2000-01-01", "FIELD", "GRUPTREE", np.nan],
+            ["2000-01-01", "FIELD", "GRUPTREE", None],
             ["2000-01-01", "OP1", "WELSPECS", "OPS"],
             ["2000-01-01", "OPS", "GRUPTREE", "FIELD"],
         ],
@@ -291,7 +291,7 @@ GRUPNET
                     {"CHILD": "FIELDB", "PARENT": None, "TERMINAL_PRESSURE": 80},
                     {"CHILD": "FIELDA", "PARENT": None, "TERMINAL_PRESSURE": 90},
                     {"CHILD": "OP", "PARENT": "FIELDA", "TERMINAL_PRESSURE": 100},
-                    {"CHILD": "OPX", "PARENT": "FIELDB", "TERMINAL_PRESSURE": None},
+                    {"CHILD": "OPX", "PARENT": "FIELDB", "TERMINAL_PRESSURE": np.nan},
                 ]
             ),
             """
@@ -588,12 +588,12 @@ BRANPROP
         """,
             pd.DataFrame(
                 [
-                    ["2000-01-01", "FIELD", "GRUPTREE", np.nan, np.nan, np.nan],
+                    ["2000-01-01", "FIELD", "GRUPTREE", None, np.nan, np.nan],
                     ["2000-01-01", "TMPL_A", "GRUPTREE", "FIELD", np.nan, np.nan],
-                    ["2000-01-01", "FIELD", "BRANPROP", np.nan, np.nan, 20],
+                    ["2000-01-01", "FIELD", "BRANPROP", None, np.nan, 20],
                     ["2000-01-01", "NODE_A", "BRANPROP", "FIELD", 1, np.nan],
                     ["2000-01-01", "TMPL_A", "BRANPROP", "NODE_A", 2, np.nan],
-                    ["2000-02-01", "FIELD", "BRANPROP", np.nan, np.nan, 20],
+                    ["2000-02-01", "FIELD", "BRANPROP", None, np.nan, 20],
                     ["2000-02-01", "NODE_A", "BRANPROP", "FIELD", 1, np.nan],
                     ["2000-02-01", "NODE_B", "BRANPROP", "FIELD", 3, np.nan],
                     ["2000-02-01", "TMPL_A", "BRANPROP", "NODE_B", 4, np.nan],
@@ -636,13 +636,13 @@ NODEPROP
         """,
             pd.DataFrame(
                 [
-                    ["2000-01-01", "FIELD", "GRUPTREE", np.nan, np.nan, np.nan],
-                    ["2000-01-01", "TMPL_A", "GRUPTREE", "FIELD", np.nan, np.nan],
-                    ["2000-01-01", "FIELD", "BRANPROP", np.nan, 20, "NO"],
-                    ["2000-01-01", "NODE_A", "BRANPROP", "FIELD", np.nan, np.nan],
+                    ["2000-01-01", "FIELD", "GRUPTREE", None, np.nan, None],
+                    ["2000-01-01", "TMPL_A", "GRUPTREE", "FIELD", None, None],
+                    ["2000-01-01", "FIELD", "BRANPROP", None, 20, "NO"],
+                    ["2000-01-01", "NODE_A", "BRANPROP", "FIELD", np.nan, None],
                     ["2000-01-01", "TMPL_A", "BRANPROP", "NODE_A", np.nan, "YES"],
-                    ["2000-02-01", "FIELD", "BRANPROP", np.nan, 22, "YES"],
-                    ["2000-02-01", "NODE_A", "BRANPROP", "FIELD", np.nan, np.nan],
+                    ["2000-02-01", "FIELD", "BRANPROP", None, 22, "YES"],
+                    ["2000-02-01", "NODE_A", "BRANPROP", "FIELD", np.nan, None],
                     ["2000-02-01", "TMPL_A", "BRANPROP", "NODE_A", np.nan, "YES"],
                 ],
                 columns=[
@@ -699,15 +699,15 @@ NODEPROP
             # where there are two trees
             pd.DataFrame(
                 [
-                    ["2000-01-01", "FIELD", "GRUPTREE", np.nan],
+                    ["2000-01-01", "FIELD", "GRUPTREE", None],
                     ["2000-01-01", "TMPL_A", "GRUPTREE", "FIELD"],
                     ["2000-01-01", "WELL_2", "WELSPECS", "TMPL_B"],
                     ["2000-01-01", "TMPL_B", "GRUPTREE", "FIELD"],
-                    ["2000-01-01", "FIELD", "BRANPROP", np.nan],
+                    ["2000-01-01", "FIELD", "BRANPROP", None],
                     ["2000-01-01", "NODE_A", "BRANPROP", "FIELD"],
                     ["2000-01-01", "TMPL_A", "BRANPROP", "NODE_A"],
                     ["2000-01-01", "WELL_1", "WELSPECS", "TMPL_A"],
-                    ["2000-02-01", "FIELD", "BRANPROP", np.nan],
+                    ["2000-02-01", "FIELD", "BRANPROP", None],
                     ["2000-02-01", "NODE_A", "BRANPROP", "FIELD"],
                     ["2000-02-01", "TMPL_A", "BRANPROP", "NODE_A"],
                     ["2000-02-01", "WELL_1", "WELSPECS", "TMPL_A"],