subscript 1.13.1__tar.gz → 1.14.1__tar.gz

{subscript-1.13.1 → subscript-1.14.1}/.github/workflows/codecov.yml

@@ -14,6 +14,7 @@ jobs:
     env:
       OS: ${{ matrix.os }}
       PYTHON: '3.12'
+      UV_SYSTEM_PYTHON: 1
 
     steps:
 
@@ -22,13 +23,19 @@ jobs:
         sudo apt-get update
         sudo apt-get install libegl1
 
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
 
     - name: Setup Python
       uses: actions/setup-python@v5
       with:
         python-version: 3.12
 
+    - name: Install uv
+      uses: astral-sh/setup-uv@v6
+      with:
+        enable-cache: true
+        python-version: "3.12"
+
     - name: Install OPM-flow and ResInsight (for testing)
       run: |
         sudo apt-get install software-properties-common
@@ -40,19 +47,18 @@ jobs:
 
     - name: Install subscript and test dependencies
       run: |
-        pip install pip -U
-        pip install .[tests]
+        uv pip install ".[tests]"
 
-    - name: Force correct RIPS version
+    - name: Log OPM-Flow and ResInsight version
       run: |
-        ResInsight --console --help | grep "ResInsight v. 2021.06" && pip install rips==2021.6.0.1 || true
-        ResInsight --console --help | grep "ResInsight v. 2020.10" && pip install rips==2020.10.0.2 || true
+        flow --version
+        ResInsight --console --version
 
     - name: Generate coverage report
       run: |
         pytest tests --disable-warnings --cov=subscript --cov-report=xml
 
     - name: Upload coverage to Codecov
-      uses: codecov/codecov-action@v4
+      uses: codecov/codecov-action@v5
       with:
         token: ${{ secrets.CODECOV_TOKEN }}

{subscript-1.13.1 → subscript-1.14.1}/.github/workflows/subscript.yml

@@ -16,6 +16,7 @@ on:
 
 env:
   MPLBACKEND: Agg
+  UV_SYSTEM_PYTHON: 1
 
 jobs:
   subscript:
@@ -32,7 +33,7 @@ jobs:
           sudo apt-get install libegl1
 
       - name: Checkout commit locally
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 
@@ -41,6 +42,12 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
+        with:
+          enable-cache: true
+          python-version: ${{ matrix.python-version }}
+
       - name: Install OPM-flow and ResInsight (for testing)
         run: |
           sudo apt-get install software-properties-common
@@ -53,15 +60,7 @@ jobs:
       - name: Install subscript with dependencies
         if: ${{ always() }}
         run: |
-          pip install --upgrade pip
-          pip install .[tests,docs]
-
-      - name: Force correct RIPS version
-        run: |
-          ResInsight --console --help | grep "ResInsight v. 2021.06" \
-            && pip install rips==2021.6.0.1 || true
-          ResInsight --console --help | grep "ResInsight v. 2020.10" \
-            && pip install rips==2020.10.0.2 || true
+          uv pip install ".[tests, docs]"
 
       - name: Log OPM-Flow and ResInsight version
         run: |
@@ -69,7 +68,7 @@ jobs:
           ResInsight --console --version
 
       - name: List all installed packages
-        run: pip freeze
+        run: uv pip freeze
 
       - name: Format with ruff
         if: ${{ always() }}
@@ -85,7 +84,7 @@ jobs:
 
       - name: Run tests
         if: ${{ always() }}
-        run: pytest -n auto tests
+        run: pytest -n auto tests --mpl
 
       - name: Syntax check documentation
         if: ${{ always() }}

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: subscript
-Version: 1.13.1
+Version: 1.14.1
 Summary: Equinor's collection of subsurface reservoir modelling scripts
 Author-email: Equinor <rnyb@equinor.com>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -719,8 +719,8 @@ Requires-Dist: mypy; extra == "tests"
 Requires-Dist: pytest; extra == "tests"
 Requires-Dist: pytest-cov; extra == "tests"
 Requires-Dist: pytest-mock; extra == "tests"
+Requires-Dist: pytest-mpl; extra == "tests"
 Requires-Dist: pytest-xdist; extra == "tests"
-Requires-Dist: PyQt5-sip; extra == "tests"
 Requires-Dist: rstcheck; extra == "tests"
 Requires-Dist: rstcheck-core; extra == "tests"
 Requires-Dist: ruff; extra == "tests"
@@ -729,9 +729,9 @@ Requires-Dist: types-PyYAML; extra == "tests"
 Requires-Dist: types-python-dateutil; extra == "tests"
 Provides-Extra: docs
 Requires-Dist: autoapi; extra == "docs"
-Requires-Dist: sphinx<8.2.0; extra == "docs"
+Requires-Dist: sphinx; extra == "docs"
 Requires-Dist: sphinx-argparse; extra == "docs"
-Requires-Dist: sphinx-autodoc-typehints<2.4; extra == "docs"
+Requires-Dist: sphinx-autodoc-typehints; extra == "docs"
 Requires-Dist: sphinx-copybutton; extra == "docs"
 Requires-Dist: sphinx-togglebutton; extra == "docs"
 Requires-Dist: sphinx_rtd_theme; extra == "docs"

{subscript-1.13.1 → subscript-1.14.1}/pyproject.toml

@@ -2,7 +2,6 @@
 requires = [
     "setuptools>=45.0",
     "setuptools_scm[toml]>=6.2",
-    "wheel>=0.38.1",
 ]
 build-backend = "setuptools.build_meta"
 
@@ -60,8 +59,8 @@ tests = [
     "pytest",
     "pytest-cov",
     "pytest-mock",
+    "pytest-mpl",
     "pytest-xdist",
-    "PyQt5-sip",
     "rstcheck",
     "rstcheck-core",
     "ruff",
@@ -71,9 +70,9 @@ tests = [
 ]
 docs = [
     "autoapi",
-    "sphinx<8.2.0",
+    "sphinx",
     "sphinx-argparse",
-    "sphinx-autodoc-typehints<2.4",
+    "sphinx-autodoc-typehints",
     "sphinx-copybutton",
     "sphinx-togglebutton",
     "sphinx_rtd_theme",
@@ -164,10 +163,11 @@ markers = [
 ignore_directives = ["argparse", "automodule"]
 
 [tool.ruff]
-lint.ignore = [
-    "C901",
-]
-lint.select = [
+src = ["src"]
+line-length = 88
+
+[tool.ruff.lint]
+select = [
     "C",
     "E",
     "F",
@@ -178,8 +178,12 @@ lint.select = [
     "RSE",
     "SIM",
     "W",
+    "PD",
+]
+ignore = [
+    "C901",
+    "PD013",
 ]
-line-length = 88
 
 [tool.ruff.lint.isort]
 combine-as-imports = true

{subscript-1.13.1 → subscript-1.14.1}/src/subscript/check_swatinit/check_swatinit.py

@@ -74,21 +74,23 @@ def main() -> None:
 
     if args.volplot or args.volplotfile:
         plotter.wvol_waterfall(qc_vols)
-    if args.volplot:
-        pyplot.show()
     if args.volplotfile:
         print(f"Dumping volume plot to {args.volplotfile}")
         pyplot.savefig(args.volplotfile)
+    if args.volplot:
+        pyplot.show()
 
-    if (args.plotfile or args.plot) and args.eqlnum not in qc_frame["EQLNUM"].values:
+    if (args.plotfile or args.plot) and args.eqlnum not in qc_frame[
+        "EQLNUM"
+    ].to_numpy():
         sys.exit(f"Error: EQLNUM {args.eqlnum} does not exist in grid. No plotting.")
     if args.plot or args.plotfile:
         plotter.plot_qc_panels(qc_frame[qc_frame["EQLNUM"] == args.eqlnum])
-    if args.plot:
-        pyplot.show()
     if args.plotfile:
         print(f"Dumping plot to {args.plotfile}")
         pyplot.savefig(args.plotfile)
+    if args.plot:
+        pyplot.show()
 
 
 def check_applicability(eclfiles: res2df.ResdataFiles) -> None:
@@ -129,7 +131,7 @@ def reorder_dframe_for_nonnans(dframe: pd.DataFrame) -> pd.DataFrame:
     will aid data analysis application to deduce correct datatypes for
     columns"""
     null_count = "__NULL_COUNT__"
-    dframe[null_count] = dframe.isnull().sum(axis=1)
+    dframe[null_count] = dframe.isna().sum(axis=1)
     return (
         dframe.sort_values(null_count).drop(null_count, axis=1).reset_index(drop=True)
     )
@@ -253,11 +255,11 @@ def make_qc_gridframe(eclfiles: res2df.ResdataFiles) -> pd.DataFrame:
         # GLOBAL_INDEX is 0-indexed.
         grid_df["SWATINIT_DECK"] = pd.Series(swatinit_deckdata)[
             grid_df["GLOBAL_INDEX"].astype(int).tolist()
-        ].values
+        ].to_numpy()
 
     if "SWATINIT" not in grid_df:
         # OPM-flow does not include SWATINIT in the INIT file.
-        grid_df.rename({"SWATINIT_DECK": "SWATINIT"}, axis="columns", inplace=True)
+        grid_df = grid_df.rename({"SWATINIT_DECK": "SWATINIT"}, axis="columns")
     elif "SWATINIT_DECK" in grid_df:
         # (if SWATINIT is inputted using binary data in Eclipse deck, the code above
         # is not able to extract it)
@@ -352,7 +354,7 @@ def qc_flag(qc_frame: pd.DataFrame) -> pd.DataFrame:
         qc_col[
             (~np.isclose(qc_frame["OIP_INIT"], 0))
             & (~np.isclose(qc_frame["SWAT"], qc_frame["SWATINIT"], atol=1e-6))
-            & (~pd.isnull(qc_frame["PC_SCALING"]))
+            & (~pd.isna(qc_frame["PC_SCALING"]))
         ] = __FINE_EQUIL__
 
     # SWATINIT=1 above contact:
@@ -409,9 +411,7 @@ def qc_flag(qc_frame: pd.DataFrame) -> pd.DataFrame:
 
     # Tag the remainder with "unknown", when/if this happens, it is a bug or a
     # feature request:
-    qc_col.fillna(__UNKNOWN__, inplace=True)
-
-    return qc_col
+    return qc_col.fillna(__UNKNOWN__)
 
 
 def qc_volumes(qc_frame: pd.DataFrame) -> Dict[str, float]:
@@ -496,8 +496,10 @@ def _evaluate_pc(
             np.interp(
                 swat,
                 swl
-                + (satfunc[sat_name].values - sw_min) / (sw_max - sw_min) * (swu - swl),
-                satfunc[pc_name].values * pc_scaling,
+                + (satfunc[sat_name].to_numpy() - sw_min)
+                / (sw_max - sw_min)
+                * (swu - swl),
+                satfunc[pc_name].to_numpy() * pc_scaling,
             )
         )
     return p_cap
@@ -534,15 +536,15 @@ def compute_pc(qc_frame: pd.DataFrame, satfunc_df: pd.DataFrame) -> pd.Series:
 
     for satnum, satnum_frame in qc_frame.groupby("SATNUM"):
         if "SWLPC" in satnum_frame:
-            swls = satnum_frame["SWLPC"].values
+            swls = satnum_frame["SWLPC"].to_numpy()
         elif "SWL" in satnum_frame:
-            swls = satnum_frame["SWL"].values
+            swls = satnum_frame["SWL"].to_numpy()
         else:
             swls = None
-        swus = satnum_frame["SWU"].values if "SWU" in satnum_frame else None
+        swus = satnum_frame["SWU"].to_numpy() if "SWU" in satnum_frame else None
         p_cap[satnum_frame.index] = _evaluate_pc(
-            satnum_frame["SWAT"].values,
-            satnum_frame["PC_SCALING"].values,
+            satnum_frame["SWAT"].to_numpy(),
+            satnum_frame["PC_SCALING"].to_numpy(),
             swls,
             swus,
             satfunc_df[satfunc_df["SATNUM"] == satnum],
@@ -596,7 +598,7 @@ def merge_equil(grid_df: pd.DataFrame, equil_df: pd.DataFrame) -> pd.DataFrame:
     assert "PRESSURE" in equil_df
 
     # Be compatible with future change in res2df:
-    equil_df.rename({"ACCURACY": "OIP_INIT"}, axis="columns", inplace=True)
+    equil_df = equil_df.rename({"ACCURACY": "OIP_INIT"}, axis="columns")
 
     contacts = list({"OWC", "GOC", "GWC"}.intersection(set(equil_df.columns)))
     # Rename and slice the equil dataframe:
@@ -607,7 +609,7 @@ def merge_equil(grid_df: pd.DataFrame, equil_df: pd.DataFrame) -> pd.DataFrame:
         equil_df = equil_df[equil_df["KEYWORD"] == "EQUIL"]
     equil_df = equil_df[["Z_DATUM", "PRESSURE_DATUM", "EQLNUM", "OIP_INIT"] + contacts]
     equil_df["EQLNUM"] = equil_df["EQLNUM"].astype(int)
-    assert not pd.isnull(equil_df).any().any(), (
+    assert not pd.isna(equil_df).any().any(), (
         f"BUG: NaNs in equil dataframe:\n{equil_df}"
     )
     return grid_df.merge(equil_df, on="EQLNUM", how="left")

{subscript-1.13.1 → subscript-1.14.1}/src/subscript/check_swatinit/plotter.py

@@ -63,8 +63,8 @@ def plot_qc_panels(
     pyplot.subplot(2, 2, 4)
     pc_depth(qc_frame)
 
-    oip_init = qc_frame["OIP_INIT"].values[0]
-    eqlnum = qc_frame["EQLNUM"].values[0]
+    oip_init = qc_frame["OIP_INIT"].to_numpy()[0]
+    eqlnum = qc_frame["EQLNUM"].to_numpy()[0]
     pyplot.suptitle(f"EQLNUM: {eqlnum}, OIP_INIT: {oip_init}")
     if show:
         pyplot.show()
@@ -150,15 +150,15 @@ def pc_depth(
 def add_contacts_to_plot(qc_frame: pd.DataFrame, axis: pyplot.Axes) -> None:
     """Annotate axes with named horizontal lines for contacts."""
     if "OWC" in qc_frame:
-        owc = qc_frame["OWC"].values[0]  # OWC is assumed constant in the dataframe
+        owc = qc_frame["OWC"].to_numpy()[0]  # OWC is assumed constant in the dataframe
         axis.axhline(owc, color="black", linestyle="--", linewidth=1)
         axis.annotate(f"OWC={owc:g}", (0, owc))
     if "GOC" in qc_frame:
-        goc = qc_frame["GOC"].values[0]
+        goc = qc_frame["GOC"].to_numpy()[0]
         axis.axhline(goc, color="black", linestyle="--", linewidth=1)
         axis.annotate(f"GOC={goc:g}", (0, goc))
     if "GWC" in qc_frame:
-        gwc = qc_frame["GWC"].values[0]
+        gwc = qc_frame["GWC"].to_numpy()[0]
         axis.axhline(gwc, color="black", linestyle="--", linewidth=1)
         axis.annotate(f"GWC={gwc:g}", (0, gwc))
 
@@ -199,10 +199,10 @@ def wvol_waterfall(qc_vols: Dict[str, float]) -> None:
     blank.loc["SWAT_WVOL"] = 0
 
     fig = trans.plot(kind="bar", alpha=0.7, stacked=True, legend=None, bottom=blank)
-    fig.plot(step.index, step.values, "k")
+    fig.plot(step.index, step.to_numpy(), "k")
     pyplot.gcf().subplots_adjust(bottom=0.25)
 
-    blanktrans = blank.values + trans["volume"].values
+    blanktrans = blank.to_numpy() + trans["volume"].to_numpy()
     span = blank.max() - blanktrans[1:-1].min()
 
     if np.isclose(span, 0.0):

{subscript-1.13.1 → subscript-1.14.1}/src/subscript/csv2ofmvol/csv2ofmvol.py

@@ -116,7 +116,7 @@ def read_pdm_csv_files(
     # Reindex:
     data = data.set_index(["WELL", "DATE"])
 
-    if not [data.columns.values]:
+    if not [data.columns.to_numpy()]:
         raise ValueError("No data columns found")
 
     # Drop duplicate multiindices (WELL, DATE)
@@ -220,7 +220,7 @@ def df2vol(data: pd.DataFrame) -> str:
 
     # Fill empty cells with zeros, empty cells can stem from concatenation
     # of dataframes with gas and water injectors.
-    voldata.fillna(value=0.0, inplace=True)
+    voldata = voldata.fillna(value=0.0)
 
     volstr = ""
     volstr += "*METRIC\n"

{subscript-1.13.1 → subscript-1.14.1}/src/subscript/csv_merge/csv_merge.py

@@ -307,7 +307,7 @@ def csv_merge_main(
             if len(merged_df[col].unique()) == 1:
                 columnstodelete.append(col)
         logger.info("Dropping constant columns %s", str(columnstodelete))
-        merged_df.drop(columnstodelete, inplace=True, axis=1)
+        merged_df = merged_df.drop(columnstodelete, axis=1)
 
     if merged_df.empty:
         logger.error("No data to output")

{subscript-1.13.1 → subscript-1.14.1}/src/subscript/csv_stack/csv_stack.py

@@ -311,7 +311,7 @@ def csv_stack(
 
         # Stack the multiindex columns, this will add a lot of rows to
         # our ensemble, and condense the number of columns
-        dframe = dframe.stack()
+        dframe = dframe.stack(future_stack=True)
 
         # The values from non-multiindex-columns must be propagated to
         # the rows that emerged from the stacking. If you use the

{subscript-1.13.1 → subscript-1.14.1}/src/subscript/field_statistics/field_statistics.py

@@ -37,7 +37,7 @@ from field parameters using ERTBOX grid.
 The script reads ensembles of realizations from scratch disk  from
 <RUN_PATH> directory::
 
-  share/results/grids/geogrid--<propertyname>.roff.
+  share/results/grids/<geogridname>--<propertyname>.roff.
 
 Optionally also temporary field parameters coming from APS or petrophysical
 field parameters can be used to calculate mean and standard deviations.
@@ -172,9 +172,13 @@ EPILOGUE = """
 
     # Specify which geogrid fields to use
     # Geogrid fields are typically found in:
-    # <RUN_PATH>/share/results/grids/geogrid--<property-name>.roff
+    # <RUN_PATH>/share/results/grids/<geogridname>--<property-name>.roff
     # Optional keyword
     geogrid_fields:
+        # Prefix (name of geogrid) to be used for field parameters related to the
+        # geogrid.
+        geogrid_name: "geogrid"
+
         # Selected set of zone names to use in calculations of statistics.
         # Must be one or more of the defined zones.
         # Require at least one zone to be selected.
@@ -201,7 +205,7 @@ EPILOGUE = """
         # For each zone specify which discrete parameter to use to calculate
         # facies probability estimates.
         # Possible names are those found in the
-        # share/results/grids/geogrid--<name>.roff
+        # share/results/grids/<geogridname>--<name>.roff
         # files that are of discrete type.
         # This key can be omitted or some of the lines specifying parameters
         # for a zone if you don't want to use it.
@@ -213,7 +217,7 @@ EPILOGUE = """
         # For each zone specify which continuous parameter to use to
         # calculate estimate of mean and stdev over ensemble.
         # Possible names are those found in the
-        #  share/results/grids/geogrid--<name>.roff
+        #  share/results/grids/<geogridname>--<name>.roff
         # files that are of continuous type
         # This key can be omitted or some of the lines specifying
         # parameters for a zone if you don't want to use it.
@@ -608,9 +612,10 @@ def read_ensemble_realization(
     iter_number,
     property_param_name,
     zone_code_names,
+    geogrid_name,
 ):
     realization_path = Path(f"realization-{realization_number}/iter-{iter_number}")
-    grid_path = Path("share/results/grids/geogrid.roff")
+    grid_path = Path("share/results/grids/" + geogrid_name + ".roff")
     file_path_grid = Path(ensemble_path) / realization_path / grid_path
     if file_path_grid.exists():
         grid = xtgeo.grid_from_file(file_path_grid, fformat="roff")
@@ -618,7 +623,9 @@ def read_ensemble_realization(
     else:
         return None, None, None
 
-    property_path = Path(f"share/results/grids/geogrid--{property_param_name}.roff")
+    property_path = Path(
+        "share/results/grids/" + geogrid_name + f"--{property_param_name}.roff"
+    )
     file_path_property = Path(ensemble_path) / realization_path / property_path
     property_param = xtgeo.gridproperty_from_file(file_path_property, fformat="roff")
 
@@ -635,9 +642,10 @@ def read_geogrid_realization(
     realization_number,
     iter_number,
     zone_code_names,
+    geogrid_name,
 ):
     realization_path = Path(f"realization-{realization_number}/iter-{iter_number}")
-    grid_path = Path("share/results/grids/geogrid.roff")
+    grid_path = Path("share/results/grids/" + geogrid_name + ".roff")
     file_path_grid = Path(ensemble_path) / realization_path / grid_path
     if file_path_grid.exists():
         grid = xtgeo.grid_from_file(file_path_grid, fformat="roff")
@@ -778,6 +786,7 @@ def write_mean_stdev_nactive(
     result_path,
     ens_path,
     zone_code_names,
+    geogrid_name,
     copy_to_geogrid_realization=False,
 ):
     output_path = result_path
@@ -826,7 +835,11 @@ def write_mean_stdev_nactive(
         # Use realization number 0
         real_number = 0
         geogrid_dimensions, geogrid_subgrids = read_geogrid_realization(
-            ens_path, real_number, iter_number, zone_code_names
+            ens_path,
+            real_number,
+            iter_number,
+            zone_code_names,
+            geogrid_name,
         )
 
         ertbox_to_geogrid_statistics(
@@ -839,6 +852,7 @@ def write_mean_stdev_nactive(
             ertbox_dims,
             conformity,
             ens_path,
+            geogrid_name,
             param_name=param_name,
         )
 
@@ -852,6 +866,7 @@ def write_mean_stdev_nactive(
             ertbox_dims,
             conformity,
             ens_path,
+            geogrid_name,
             param_name=param_name,
         )
 
@@ -875,13 +890,14 @@ def ertbox_to_geogrid_statistics(
     ertbox_dimensions,
     zone_conformity,
     ens_path,
+    geogrid_name,
     param_name=None,
     facies_name=None,
 ):
     if param_name:
-        geogrid_stat_name = f"geogrid--{statistics_name}_{param_name}"
+        geogrid_stat_name = f"{geogrid_name}--{statistics_name}_{param_name}"
     if facies_name:
-        geogrid_stat_name = f"geogrid--{statistics_name}_{facies_name}"
+        geogrid_stat_name = f"{geogrid_name}--{statistics_name}_{facies_name}"
     assert (param_name is not None) or (facies_name is not None)
     geogrid_stat_file_name = (
         ens_path
@@ -930,6 +946,7 @@ def write_fraction_nactive(
     result_path,
     ens_path,
     zone_code_names,
+    geogrid_name,
     ncount_active_values=None,
     copy_to_geogrid_realization=False,
 ):
@@ -979,7 +996,11 @@ def write_fraction_nactive(
         # Use realization number 0
         real_number = 0
         geogrid_dimensions, geogrid_subgrids = read_geogrid_realization(
-            ens_path, real_number, iter_number, zone_code_names
+            ens_path,
+            real_number,
+            iter_number,
+            zone_code_names,
+            geogrid_name,
         )
         ertbox_to_geogrid_statistics(
             "prob",
@@ -991,6 +1012,7 @@ def write_fraction_nactive(
             ertbox_dimensions,
             conformity,
             ens_path,
+            geogrid_name,
             facies_name=facies_name,
         )
 
@@ -1042,6 +1064,14 @@ def get_specifications(input_dict, ertbox_size, ert_config_path):
         use_geogrid_fields = True
         geogrid_fields_dict = input_dict["geogrid_fields"]
 
+        key = "geogrid_name"
+        if key in geogrid_fields_dict:
+            geogrid_name = geogrid_fields_dict[key]
+            geogrid_name = geogrid_name.strip()
+        else:
+            # Set default
+            geogrid_name = "geogrid"
+
         key = "zone_code_names"
         if key in geogrid_fields_dict:
             zone_code_names = geogrid_fields_dict[key]
@@ -1119,6 +1149,7 @@ def get_specifications(input_dict, ertbox_size, ert_config_path):
         zone_names_used,
         zone_conformity,
         zone_code_names,
+        geogrid_name,
         param_name_dict,
         disc_param_name_dict,
         init_path,
@@ -1254,6 +1285,7 @@ def calc_stats(
         zone_names,
         zone_conformity,
         zone_code_names,
+        geogrid_name,
         param_name_dict,
         disc_param_name_dict,
         _,
@@ -1290,6 +1322,7 @@ def calc_stats(
                                 iter_number,
                                 param_name,
                                 zone_code_names,
+                                geogrid_name,
                             )
                         )
                         if grid_dimensions is None:
@@ -1342,6 +1375,7 @@ def calc_stats(
                             result_path,
                             ens_path,
                             zone_code_names,
+                            geogrid_name,
                             copy_to_geogrid_realization=copy_to_geogrid_realization,
                         )
                         has_written_nactive = True
@@ -1377,6 +1411,7 @@ def calc_stats(
                                 iter_number,
                                 param_name,
                                 zone_code_names,
+                                geogrid_name,
                             )
                         )
 
@@ -1439,6 +1474,7 @@ def calc_stats(
                                     result_path,
                                     ens_path,
                                     zone_code_names,
+                                    geogrid_name,
                                     ncount_active_values=sum_active,
                                     copy_to_geogrid_realization=copy_to_geogrid_realization,
                                 )
@@ -1453,6 +1489,7 @@ def calc_stats(
                                     result_path,
                                     ens_path,
                                     zone_code_names,
+                                    geogrid_name,
                                     copy_to_geogrid_realization=copy_to_geogrid_realization,
                                 )
                         txt4 = f"  Sum facies volume fraction: {sum_fraction}"

{subscript-1.13.1 → subscript-1.14.1}/src/subscript/fmuobs/parsers.py

@@ -458,8 +458,7 @@ def resinsight_df2df(ri_dframe: pd.DataFrame) -> pd.DataFrame:
     if ri_dframe.empty:
         return pd.DataFrame()
 
-    dframe = ri_dframe.copy()
-    dframe.rename({"VECTOR": "KEY"}, axis="columns", inplace=True)
+    dframe = ri_dframe.copy().rename({"VECTOR": "KEY"}, axis="columns")
     dframe["LABEL"] = (
         dframe["KEY"].astype(str)
         + "-"