subscript 1.9.0__tar.gz → 1.11.0__tar.gz

{subscript-1.9.0 → subscript-1.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: subscript
-Version: 1.9.0
+Version: 1.11.0
 Summary: Equinor's collection of subsurface reservoir modelling scripts
 Author-email: Equinor <rnyb@equinor.com>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -700,7 +700,6 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: resdata
 Requires-Dist: res2df
-Requires-Dist: ert
 Requires-Dist: ert>=10.2.0b13
 Requires-Dist: fmu-tools
 Requires-Dist: grid3d_maps
@@ -723,6 +722,7 @@ Requires-Dist: pytest; extra == "tests"
 Requires-Dist: pytest-cov; extra == "tests"
 Requires-Dist: pytest-mock; extra == "tests"
 Requires-Dist: pytest-xdist; extra == "tests"
+Requires-Dist: PyQt5-sip<12.16.0; python_version == "3.8" and extra == "tests"
 Requires-Dist: rstcheck; extra == "tests"
 Requires-Dist: rstcheck-core; extra == "tests"
 Requires-Dist: ruff; extra == "tests"

{subscript-1.9.0 → subscript-1.11.0}/ci/testkomodo.sh

@@ -30,5 +30,12 @@ get_os_arch () {
 
 start_tests () {
     os_arch="$(get_os_arch)"
-    pytest -n auto --flow-simulator="/project/res/$os_arch/bin/flowdaily" --eclipse-simulator="runeclipse"
+
+    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 -n auto --flow-simulator="/project/res/$os_arch/bin/flowdaily" --eclipse-simulator="eclrun"
 }

{subscript-1.9.0 → subscript-1.11.0}/docs/contributing.rst

@@ -58,11 +58,9 @@ running tests that rely upon a black oil simulation.
 
 .. code-block:: console
 
-  # running on redhat 7
-  pytest -n auto --flow-simulator="/project/res/x86_64_RH_7/bin/flowdaily" --eclipse-simulator="runeclipse"
-
   # running on redhat 8
-  pytest -n auto --flow-simulator="/project/res/x86_64_RH_8/bin/flowdaily" --eclipse-simulator="runeclipse"
+  source /prog/res/ecl/script/eclrun.cshrc  # Use eclrun.bash if using the bash shell
+  pytest -n auto --flow-simulator="/project/res/x86_64_RH_8/bin/flowdaily" --eclipse-simulator="eclrun"
 
 Code style
 ----------

{subscript-1.9.0 → subscript-1.11.0}/docs/scripts/fmu_copy_revision.rst

@@ -14,8 +14,8 @@ Copying Profiles
 
 By default some file types and directories will be skipped. Here are some profiles:
 
-#. Copy everything
-#. Copy everything, except:
+1. Copy everything
+2. Copy everything, except:
 
    * Directories with name ``backup``
    * Directories with name ``users``
@@ -24,13 +24,15 @@ By default some file types and directories will be skipped. Here are some profil
    * Files ending with ~
    * Empty folders (except those listed above) will be kept
 
-#. Copy everything, except:
+3. Copy everything, except:
 
    * All folders and files mentioned in option 2
    * The following folders under ``ert/`` (if they exist):
 
       * ``output``
       * ``ert/*/storage``, including ``ert/storage`` (for backward compatibility)
+      * ``ert/model/``
+      * ``ert/model/logs``, including ``ert/output/log`` (for backward compatibility)
 
    * The following folders or files under ``rms/`` (if they exist):
 
@@ -51,15 +53,15 @@ By default some file types and directories will be skipped. Here are some profil
 
    * Empty folders (at destination) except those listed above will kept
 
-#. As profile 3, but also all empty folder (at destination) will removed. This the DEFAULT profile!
-#. As profile 3, but keeps more data:
+4. As profile 3, but also all empty folder (at destination) will removed. This the DEFAULT profile!
+5. As profile 3, but keeps more data:
 
     * Folders and files ``rms/output`` will be kept
     * Folders and files ``share/results`` and share/templates will be kept.
 
-#. Only copy the ``<coviz>`` folder (if present), which shall be under ``<revision>/share/coviz``:
+6. Only copy the ``<coviz>`` folder (if present), which shall be under ``<revision>/share/coviz``:
 
     * Symbolic links will be kept, if possible
 
-#. Make your own filter rules in a named file.
+7. Make your own filter rules in a named file.
 

{subscript-1.9.0 → subscript-1.11.0}/pyproject.toml

@@ -38,7 +38,6 @@ dynamic = ["version"]
 dependencies = [
     "resdata",
     "res2df",
-    "ert",
     "ert>=10.2.0b13",
     "fmu-tools",
     "grid3d_maps",
@@ -64,6 +63,7 @@ tests = [
     "pytest-cov",
     "pytest-mock",
     "pytest-xdist",
+    "PyQt5-sip<12.16.0; python_version == '3.8'",
     "rstcheck",
     "rstcheck-core",
     "ruff",

{subscript-1.9.0 → subscript-1.11.0}/src/subscript/bjobsusers/bjobsusers.py

@@ -143,7 +143,7 @@ def show_status(status: str = "RUN", title: str = "Running", umax: int = 10) ->
     print("--------------")
     for user, count in dframe.iterrows():
         print(
-            count[0],
+            count.iloc[0],
             userinfo(  # lgtm [py/clear-text-logging-sensitive-data]
                 str(user), call_pinky
             ),

{subscript-1.9.0 → subscript-1.11.0}/src/subscript/casegen_upcars/casegen_upcars.py

@@ -242,9 +242,9 @@ def main():
                 streak_box = streaks["BoundingBox"]
             else:
                 streak_box = flatten(parser.streak_box)
-                assert (
-                    len(streak_box) % 4 == 0
-                ), "Number of input for streak box must be 4 or multiplication of 4"
+                assert len(streak_box) % 4 == 0, (
+                    "Number of input for streak box must be 4 or multiplication of 4"
+                )
                 streak_box = [
                     streak_box[i : i + 4] for i in range(0, len(streak_box), 4)
                 ]

{subscript-1.9.0 → subscript-1.11.0}/src/subscript/casegen_upcars/model.py

@@ -84,20 +84,20 @@ class Model:
         self._eclipse_output_per_line = 6
 
         streak_dz = listify(streak_dz, len(streak_k), float)
-        assert len(streak_dz) == len(
-            streak_k
-        ), "Number of streak k-index is differs from number of streak dz"
+        assert len(streak_dz) == len(streak_k), (
+            "Number of streak k-index is differs from number of streak dz"
+        )
 
         streak_nz = listify(streak_nz, len(streak_k), int)
-        assert len(streak_nz) == len(
-            streak_k
-        ), "Number of streak k-index is differs from number of streak cell count (nz)"
+        assert len(streak_nz) == len(streak_k), (
+            "Number of streak k-index is differs from number of streak cell count (nz)"
+        )
 
         if isinstance(streak_rect, list) and len(streak_rect) > 0:
             if isinstance(streak_rect[0], list) and len(streak_rect) > 1:
-                assert len(streak_rect) == len(
-                    streak_k
-                ), "Number of streak k-index is differs from number of streak box"
+                assert len(streak_rect) == len(streak_k), (
+                    "Number of streak k-index is differs from number of streak box"
+                )
             elif isinstance(streak_rect[0], list):
                 streak_rect = [streak_rect[0]] * len(streak_k)
             else:
@@ -603,9 +603,9 @@ Initializing model
     ):
         # pylint: disable=too-many-arguments
         streak_property = listify(streak_property, len(self._streak_k))
-        assert len(streak_property) == len(
-            self._streak_k
-        ), f"Number of input {keyword} is not equal to number of streak"
+        assert len(streak_property) == len(self._streak_k), (
+            f"Number of input {keyword} is not equal to number of streak"
+        )
         data_type = np.int16 if isinstance(fracture_property, int) else float
         props = np.empty(
             (self._total_nx, self._total_ny, self._total_nz), dtype=data_type
@@ -666,9 +666,9 @@ Initializing model
     def set_layers_property(self, keyword, matrix_property, streak_property):
         """Store matrix and streak property"""
         streak_property = listify(streak_property, len(self._streak_k))
-        assert len(streak_property) == len(
-            self._streak_k
-        ), f"Number of input {keyword} is not equal to number of streaks"
+        assert len(streak_property) == len(self._streak_k), (
+            f"Number of input {keyword} is not equal to number of streaks"
+        )
         keyword = keyword.upper()
         self._streak_props[keyword] = streak_property
         self._matrix_props[keyword] = matrix_property

{subscript-1.9.0 → subscript-1.11.0}/src/subscript/check_swatinit/check_swatinit.py

@@ -163,30 +163,30 @@ def human_report_qc_vols(qc_vols: Dict[str, float]) -> str:
     swatinit_hcvol = qc_vols["PORV"] - qc_vols["SWATINIT_WVOL"]
     swat_hcvol = qc_vols["PORV"] - qc_vols["SWAT_WVOL"]
     for key in ["VOLUME", "PORV"]:
-        string += f"{key:25s} {qc_vols[key]/1e6:>10.4f} Mrm3\n"
+        string += f"{key:25s} {qc_vols[key] / 1e6:>10.4f} Mrm3\n"
     for key in ["SWATINIT_WVOL"]:
-        string += f"{key:25s} {qc_vols[key]/1e6:>10.4f} Mrm3"
+        string += f"{key:25s} {qc_vols[key] / 1e6:>10.4f} Mrm3"
         string += 11 * " "
-        string += f"HC: {swatinit_hcvol/1e6:>8.3f} Mrm3\n"
+        string += f"HC: {swatinit_hcvol / 1e6:>8.3f} Mrm3\n"
     for key in QC_FLAGS:
         if key in skip_if_zero and np.isclose(qc_vols[key], 0, atol=1):
             # Tolerance is 1 rm3, which is small in relevant contexts.
             continue
 
-        string += f"+ {key:23s} {qc_vols[key]/1e6:>10.4f} Mrm3  "
-        string += f" {qc_vols[key]/qc_vols['SWATINIT_WVOL']*100:>3.2f} %"
+        string += f"+ {key:23s} {qc_vols[key] / 1e6:>10.4f} Mrm3  "
+        string += f" {qc_vols[key] / qc_vols['SWATINIT_WVOL'] * 100:>3.2f} %"
         if swatinit_hcvol > 0.0:
-            string += f"         {-qc_vols[key]/swatinit_hcvol*100:>3.2f} %"
+            string += f"         {-qc_vols[key] / swatinit_hcvol * 100:>3.2f} %"
         string += "\n"
     for key in ["SWAT_WVOL"]:
-        string += f"= {key:23s} {qc_vols[key]/1e6:>10.4f} Mrm3  "
+        string += f"= {key:23s} {qc_vols[key] / 1e6:>10.4f} Mrm3  "
         change = (qc_vols["SWAT_WVOL"] - qc_vols["SWATINIT_WVOL"]) / qc_vols[
             "SWATINIT_WVOL"
         ]
-        string += f" {change*100:>3.2f} %"
+        string += f" {change * 100:>3.2f} %"
         if swatinit_hcvol > 0.0:
             hc_change = (swat_hcvol - swatinit_hcvol) / swatinit_hcvol
-            string += f"         {hc_change*100:>3.2f} %"
+            string += f"         {hc_change * 100:>3.2f} %"
     return string
 
 
@@ -619,9 +619,9 @@ 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()
-    ), f"BUG: NaNs in equil dataframe:\n{equil_df}"
+    assert not pd.isnull(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.9.0 → subscript-1.11.0}/src/subscript/check_swatinit/pillarmodel.py

@@ -297,7 +297,7 @@ class PillarModel:
                     string += "SGOF\n"
                 string += "-- SG KRG KROG PC\n"
                 string += "  0 0 1 0 \n"
-                string += f"  {1-self.swl[satnum]:g} 1.0 0.0 0\n/\n"
+                string += f"  {1 - self.swl[satnum]:g} 1.0 0.0 0\n/\n"
 
         if "GAS" in self.phases and "OIL" not in self.phases:
             for satnum_idx, satnum in enumerate(range(len(self.swl))):

{subscript-1.9.0 → subscript-1.11.0}/src/subscript/check_swatinit/plotter.py

@@ -47,9 +47,9 @@ def plot_qc_panels(
     if eqlnum is not None:
         qc_frame = qc_frame[qc_frame["EQLNUM"] == eqlnum]
 
-    assert (
-        len(qc_frame["EQLNUM"].unique()) == 1
-    ), "Can only plot for one EQLNUM at a time"
+    assert len(qc_frame["EQLNUM"].unique()) == 1, (
+        "Can only plot for one EQLNUM at a time"
+    )
     pyplot.style.use("seaborn-v0_8-darkgrid")
     seaborn.color_palette("tab10")
 
@@ -73,9 +73,9 @@ def plot_qc_panels(
 def visual_depth(qc_frame: pd.DataFrame) -> float:
     """Suggest a deep depth limit for what to plot, in order to avoid
     showing too much of a less interesting water zone"""
-    assert (
-        len(qc_frame["EQLNUM"].unique()) == 1
-    ), "Can only plot for one EQLNUM at a time"
+    assert len(qc_frame["EQLNUM"].unique()) == 1, (
+        "Can only plot for one EQLNUM at a time"
+    )
     lowest_hc = qc_frame[qc_frame["SWATINIT"] < 1]["Z"].max()
     hc_height = lowest_hc - qc_frame["Z"].min()
 
@@ -212,7 +212,7 @@ def wvol_waterfall(qc_vols: Dict[str, float]) -> None:
     for number, qc_flag in enumerate(index[1:]):
         change = qc_vols[qc_flag] / qc_vols["SWATINIT_WVOL"]
         pyplot.gca().annotate(
-            f"{change*100:3.2f}%",
+            f"{change * 100:3.2f}%",
             (
                 number + 1,
                 blanktrans[number] + max(0, qc_vols[qc_flag]) + span / 20,
@@ -222,7 +222,7 @@ def wvol_waterfall(qc_vols: Dict[str, float]) -> None:
         )
         hc_change = -qc_vols[qc_flag] / swatinit_hcvol
         pyplot.gca().annotate(
-            f"{hc_change*100:3.2f}%",
+            f"{hc_change * 100:3.2f}%",
             (number + 1, blanktrans[number] + max(0, qc_vols[qc_flag]) + 4 * span / 20),
             horizontalalignment="center",
             color="C2",
@@ -231,14 +231,14 @@ def wvol_waterfall(qc_vols: Dict[str, float]) -> None:
         "SWATINIT_WVOL"
     ]
     pyplot.gca().annotate(
-        f"{final_change*100:>3.2f}%",
+        f"{final_change * 100:>3.2f}%",
         (6, total + span / 20),
         horizontalalignment="center",
         color="C0",
     )
     final_hc_change = (swat_hcvol - swatinit_hcvol) / swatinit_hcvol
     pyplot.gca().annotate(
-        f"{final_hc_change*100:>3.2f}%",
+        f"{final_hc_change * 100:>3.2f}%",
         (6, total + 4 * span / 20),
         horizontalalignment="center",
         color="C2",

{subscript-1.9.0 → subscript-1.11.0}/src/subscript/csv_merge/csv_merge.py

@@ -68,7 +68,9 @@ class CsvMerge(ErtScript):
         args = parser.parse_args(args)
         logger.setLevel(logging.INFO)
         globbedfiles = glob_patterns(args.csvfiles)
-        csv_merge_main(csvfiles=globbedfiles, output=args.output)
+        csv_merge_main(
+            csvfiles=globbedfiles, output=args.output, memoryconservative=True
+        )
 
 
 def get_parser() -> argparse.ArgumentParser:

{subscript-1.9.0 → subscript-1.11.0}/src/subscript/field_statistics/field_statistics.py

@@ -1038,7 +1038,7 @@ def get_specifications(input_dict, ertbox_size, ert_config_path):
             zone_code_names = geogrid_fields_dict[key]
         else:
             raise KeyError(
-                f"Missing keyword:  {key} specifying " "zone name for each zone number."
+                f"Missing keyword:  {key} specifying zone name for each zone number."
             )
 
         key = "use_zones"
@@ -1630,10 +1630,12 @@ def main():
             zone_list = list(zone_code_names.values())
 
         key = "continuous_property_param_per_zone"
+        cont_prop_dict = None
         if key in geogrid_fields_dict:
             cont_prop_dict = geogrid_fields_dict[key]
 
         key = "discrete_property_param_per_zone"
+        discrete_prop_dict = None
         if key in geogrid_fields_dict:
             discrete_prop_dict = geogrid_fields_dict[key]
 

{subscript-1.9.0 → subscript-1.11.0}/src/subscript/fmu_copy_revision/fmu_copy_revision.py

@@ -117,6 +117,8 @@ FILTER3_ADD = """
 - ert/output/**
 - ert/storage/**
 - ert/output/storage/**
+- ert/model/logs/**
+- ert/output/log/**
 - input/seismic/**
 - rms/model/*.log
 - rms/output/**
@@ -138,6 +140,7 @@ DIRFILTER3 = """
 - ert/output/
 - ert/storage/
 - ert/**/storage/
+- ert/model/logs/
 - rms/input/seismic/
 - share/results/
 - share/templates/
@@ -455,9 +458,9 @@ class CopyFMU:
         """Checking diskspace."""
         print("Checking disk space at current partition...")
         total, used, free = shutil.disk_usage(".")
-        print(f"  Total: {total // (2 ** 30):d} G")
-        print(f"  Used:  {used // (2 ** 30):d} G")
-        print(f"  Free:  {free // (2 ** 30):d} G")
+        print(f"  Total: {total // (2**30):d} G")
+        print(f"  Used:  {used // (2**30):d} G")
+        print(f"  Free:  {free // (2**30):d} G")
 
         if self.args.skipestimate:
             print("  Skip estimation of current revision size!")
@@ -649,8 +652,7 @@ class CopyFMU:
         timing = float(stdout[-1])
         timing = time.strftime("%H hours %M minutes %S seconds", time.gmtime(timing))
         print(
-            f"\n ** The rsync process took {timing}, using "
-            f"{self.nthreads} threads **\n"
+            f"\n ** The rsync process took {timing}, using {self.nthreads} threads **\n"
         )
 
 

{subscript-1.9.0 → subscript-1.11.0}/src/subscript/grav_subs_points/grav_subs_points.py

@@ -215,7 +215,8 @@ def export_grav_points_xyz(act_stations, phase, diff_date, out_folder) -> None:
         for index, row in act_stations.iterrows():
             file.write(
                 f"{row['utmx']:.3f} {row['utmy']:.3f} "
-                f"{row['dgsim_'+phase+'_'+diff_date[0]+'_'+diff_date[1]]:.3f} \n"
+                f"{row['dgsim_' + phase + '_' + diff_date[0] + '_' + diff_date[1]]:.3f}"
+                " \n"
             )
 
 
@@ -251,7 +252,7 @@ def export_subs_points_xyz(act_stations, diff_date, out_folder) -> None:
         for index, row in act_stations.iterrows():
             file.write(
                 f"{row['utmx']:.3f} {row['utmy']:.3f} "
-                f"{row['subsidence_'+diff_date[0]+'_'+diff_date[1]]:.3f}\n"
+                f"{row['subsidence_' + diff_date[0] + '_' + diff_date[1]]:.3f}\n"
             )
 
 

{subscript-1.9.0 → subscript-1.11.0}/src/subscript/interp_relperm/interp_relperm.py

@@ -109,9 +109,9 @@ class Interpolator(BaseModel):
 
     @model_validator(mode="after")
     def check_param_w_or_param_g(self) -> Interpolator:
-        assert (
-            self.param_w is not None or self.param_g is not None
-        ), "Provide either param_w or param_g"
+        assert self.param_w is not None or self.param_g is not None, (
+            "Provide either param_w or param_g"
+        )
         return self
 
 

{subscript-1.9.0 → subscript-1.11.0}/src/subscript/legacy/nosim

@@ -5,7 +5,7 @@
 #
 # How it works:
 #   Makes a copy of your ECLDECK.DATA, callled .NOSIMMED.DATA
-#   Runs the modified copy using 'runeclipse'
+#   Runs the modified copy using 'eclrun'
 #
 # NB: No cleanup is performed, but the temporary file is
 # hidden so it will not clutter too much.
@@ -49,7 +49,7 @@ my $args = " -p $progname " ;
 if ($version) { $args .= "-v $version " ; } ;
 $args .= ".NOSIMMED.DATA" ;
 
-system("runeclipse -i $args") ;
+system("eclrun eclipse $args") ;
 
 
 sub in_error 

subscript-1.11.0/src/subscript/legacy/runeclipse

@@ -0,0 +1,47 @@
+#!/bin/bash
+
+echo "runeclipse (from subscript) is deprecated. Instead you should use 'eclrun'."
+
+
+env | grep -q ECLPATH || (echo "For eclrun to work, you must 'source /prog/res/ecl/script/eclrun.cshrc'" && exit 1)
+
+
+version_setup=""
+queue_setup="-q normal "
+program="eclipse"
+while [[ $# -gt 0 ]]; do
+  case $1 in 
+    -p)
+      program=$2
+      shift
+      shift
+      ;;
+    -i)
+      queue_setup=""
+      shift
+      ;;
+    -v)
+      version_setup="-v $2 "
+      shift
+      shift
+      ;;
+    -x)
+      # Assume span is 1 by default in onprem LSF
+      shift
+      ;;
+    -q)
+      queue_setup="-q $2 "
+      shift
+      shift
+      ;;
+    *)
+      datafile=$1
+      shift
+      ;;
+  esac
+done
+
+echo
+echo "Equivalent command using eclrun:"
+echo
+echo "> eclrun ${queue_setup}${version_setup}${program} ${datafile}"

{subscript-1.9.0 → subscript-1.11.0}/src/subscript/merge_unrst_files/merge_unrst_files.py

@@ -49,7 +49,7 @@ def get_parser() -> argparse.ArgumentParser:
         "-v",
         "--version",
         action="version",
-        version=f"%(prog)s (subscript version {__version__ })",
+        version=f"%(prog)s (subscript version {__version__})",
     )
     return parser
 

{subscript-1.9.0 → subscript-1.11.0}/src/subscript/pack_sim/pack_sim.py

@@ -488,8 +488,7 @@ def inspect_file(
                 "** - REMOVE THE USEFLUX KEYWORD                                     **"
             )
             print(
-                "******************************************"
-                "****************************"
+                "**********************************************************************"
             )
             new_data_file += line
         else:

{subscript-1.9.0 → subscript-1.11.0}/src/subscript/presentvalue/presentvalue.py

@@ -67,8 +67,7 @@ def get_parser() -> argparse.ArgumentParser:
         "--oilvector",
         type=str,
         help=(
-            "Eclipse vector to read cumulative oil production from. "
-            "Use None to ignore."
+            "Eclipse vector to read cumulative oil production from. Use None to ignore."
         ),
         default="FOPT",
     )
@@ -76,8 +75,7 @@ def get_parser() -> argparse.ArgumentParser:
         "--gasvector",
         type=str,
         help=(
-            "Eclipse vector to read cumulative gas production from. "
-            "Use None to ignore."
+            "Eclipse vector to read cumulative gas production from. Use None to ignore."
         ),
         default="FGPT",
     )
@@ -85,8 +83,7 @@ def get_parser() -> argparse.ArgumentParser:
         "--gasinjvector",
         type=str,
         help=(
-            "Eclipse vector to read cumulative gas injection from. "
-            "Use None to ignore."
+            "Eclipse vector to read cumulative gas injection from. Use None to ignore."
         ),
         default="FGIT",
     )

{subscript-1.9.0 → subscript-1.11.0}/src/subscript/prtvol2csv/prtvol2csv.py

@@ -109,8 +109,7 @@ def get_parser() -> argparse.ArgumentParser:
         "--dir",
         type=str,
         help=(
-            'This option is deprecated and MUST be set to "." for future '
-            "compatibility."
+            'This option is deprecated and MUST be set to "." for future compatibility.'
         ),
         default=None,
     )
@@ -379,10 +378,16 @@ def prtvol2df(
     # Remove extra empty 'regions' (from the reservoir volume table in .PRT)
     # Concatenate dataframes horizontally. Both are/must be indexed by value
     # of fipname (FIPNUM):
+
+    # Get maximum FIPNUM
+    sim_max_fipnum = simvolumes_df.index.max()
+    res_max_fipnum = resvolumes_df.loc[(resvolumes_df != 0).any(axis=1)].index.max()
+    max_fipnum = max(sim_max_fipnum, res_max_fipnum)
     volumes = (
-        pd.concat([simvolumes_df, resvolumes_df[: len(simvolumes_df)]], axis=1)
+        pd.concat([simvolumes_df, resvolumes_df[:max_fipnum]], axis=1)
         .apply(pd.to_numeric)
         .fillna(value=0.0)
+        .sort_index()
     )
 
     # Rename the index to "FIPNUM", as required by webviz-subsurface, if requested

{subscript-1.9.0 → subscript-1.11.0}/src/subscript/sector2fluxnum/datafile_obj.py

@@ -407,9 +407,9 @@ class Datafile:
                 raise
 
         if ecl_version:
-            commandline = f"runeclipse -i -v {ecl_version} {self.DUMPFLUX_name}"
+            commandline = f"eclrun eclipse -v {ecl_version} {self.DUMPFLUX_name}"
         else:
-            commandline = f"runeclipse -i {self.DUMPFLUX_name}"
+            commandline = f"eclrun eclipse {self.DUMPFLUX_name}"
 
         args = shlex.split(commandline)
 

{subscript-1.9.0 → subscript-1.11.0}/src/subscript/sector2fluxnum/fluxfile_obj.py

@@ -123,7 +123,7 @@ def create_map_rst(
             mapping.append(min_pos_index)
 
         if (counter + 1) % 100 == 0:
-            print(f"Map progress: {counter+1:d}")
+            print(f"Map progress: {counter + 1:d}")
 
     return mapping
 

{subscript-1.9.0 → subscript-1.11.0}/src/subscript/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.9.0'
-__version_tuple__ = version_tuple = (1, 9, 0)
+__version__ = version = '1.11.0'
+__version_tuple__ = version_tuple = (1, 11, 0)

{subscript-1.9.0 → subscript-1.11.0}/src/subscript.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: subscript
-Version: 1.9.0
+Version: 1.11.0
 Summary: Equinor's collection of subsurface reservoir modelling scripts
 Author-email: Equinor <rnyb@equinor.com>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -700,7 +700,6 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: resdata
 Requires-Dist: res2df
-Requires-Dist: ert
 Requires-Dist: ert>=10.2.0b13
 Requires-Dist: fmu-tools
 Requires-Dist: grid3d_maps
@@ -723,6 +722,7 @@ Requires-Dist: pytest; extra == "tests"
 Requires-Dist: pytest-cov; extra == "tests"
 Requires-Dist: pytest-mock; extra == "tests"
 Requires-Dist: pytest-xdist; extra == "tests"
+Requires-Dist: PyQt5-sip<12.16.0; python_version == "3.8" and extra == "tests"
 Requires-Dist: rstcheck; extra == "tests"
 Requires-Dist: rstcheck-core; extra == "tests"
 Requires-Dist: ruff; extra == "tests"

{subscript-1.9.0 → subscript-1.11.0}/src/subscript.egg-info/SOURCES.txt

@@ -48,7 +48,6 @@ docs/scripts/prtvol2csv.rst
 docs/scripts/restartthinner.rst
 docs/scripts/ri_wellmod.rst
 docs/scripts/rmsecl_volumetrics.rst
-docs/scripts/runeclipse.rst
 docs/scripts/sector2fluxnum.rst
 docs/scripts/summaryplot.rst
 docs/scripts/sunsch.rst
@@ -389,6 +388,7 @@ tests/testdata_ofmvol2csv/ofm_example.vol
 tests/testdata_prtvol2csv/0readme.txt
 tests/testdata_prtvol2csv/DROGON_FIPNUM.PRT
 tests/testdata_prtvol2csv/DROGON_FIPZON.PRT
+tests/testdata_prtvol2csv/DROGON_INACTIVE_FIPNUM.PRT
 tests/testdata_ri_wellmod/drogon_wells_noicd.rsp
 tests/testdata_ri_wellmod/ri_reek_wells.rsp
 tests/testdata_ri_wellmod/drogon_include/grid/drogon.grid.grdecl