subscript 1.0.0__tar.gz → 1.1.0__tar.gz

{subscript-1.0.0 → subscript-1.1.0}/.github/workflows/subscript.yml

@@ -66,7 +66,7 @@ jobs:
 
       - name: Lint with black
         if: ${{ always() }}
-        run: black --check *.py src tests
+        run: black --check src tests
 
       - name: Lint with flake8
         if: ${{ always() }}
@@ -78,11 +78,7 @@ jobs:
 
       - name: Run tests
         if: ${{ always() }}
-        run: |
-          pytest -n auto tests
-          # Check that repository is untainted by test code:
-          git status --porcelain
-          test -z "$(git status --porcelain)"
+        run: pytest -n auto tests
 
       - name: Syntax check documentation
         if: ${{ always() }}

{subscript-1.0.0 → subscript-1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: subscript
-Version: 1.0.0
+Version: 1.1.0
 Summary: Equinor's collection of subsurface reservoir modelling scripts
 Author-email: Equinor <rnyb@equinor.com>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -698,7 +698,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: configsuite
-Requires-Dist: ecl
+Requires-Dist: resdata
 Requires-Dist: ecl2df
 Requires-Dist: ert>=2.38.0b7
 Requires-Dist: fmu-tools

{subscript-1.0.0 → subscript-1.1.0}/docs/scripts/eclcompress.rst

@@ -76,9 +76,7 @@ Notes
   compressed file into account.
 - Eclipse loading time of the compressed file is probably reduced by the
   same factor as the compression factor.
-- Only known compressable keywords are compressed by default. If you wish
-  to specify particular keywords or a regex instead this can be provided
-  directly through the command line.
+- Only known compressable keywords are compressed.
 
 
 Possible improvements

{subscript-1.0.0 → subscript-1.1.0}/pyproject.toml

@@ -36,7 +36,7 @@ classifiers = [
 dynamic = ["version"]
 dependencies = [
     "configsuite",
-    "ecl",
+    "resdata",
     "ecl2df",
     "ert>=2.38.0b7",
     "fmu-tools",
@@ -125,6 +125,16 @@ CsvStack = "subscript.csv_stack.csv_stack"
 FmuObs = "subscript.fmuobs.fmuobs"
 Params2Csv = "subscript.params2csv.params2csv"
 
+[tool.setuptools]
+script-files = [
+    "src/subscript/legacy/duf",
+    "src/subscript/legacy/eclmanual",
+    "src/subscript/legacy/ertwatch",
+    "src/subscript/legacy/list_rms_usage",
+    "src/subscript/legacy/nosim",
+    "src/subscript/legacy/runeclipse",
+]
+
 [tool.black]
 line-length = 88
 

{subscript-1.0.0 → subscript-1.1.0}/src/subscript/co2_containment/co2_calculation.py

@@ -5,8 +5,8 @@ from typing import Dict, List, Literal, Optional, Tuple, Union
 
 import numpy as np
 import xtgeo
-from ecl.eclfile import EclFile
-from ecl.grid import EclGrid
+from resdata.grid import Grid
+from resdata.resfile import ResdataFile
 
 DEFAULT_CO2_MOLAR_MASS = 44.0
 DEFAULT_WATER_MOLAR_MASS = 18.0
@@ -235,12 +235,12 @@ class Co2Data:
     zone: Optional[np.ndarray] = None
 
 
-def _try_prop(unrst: EclFile, prop_name: str):
+def _try_prop(unrst: ResdataFile, prop_name: str):
     """
-    Function to determine if a property (prop_name) is part of an EclFile (unrst)
+    Function to determine if a property (prop_name) is part of an ResdataFile (unrst)
 
     Args:
-      unrst (EclFile): EclFile to fetch property names from
+      unrst (ResdataFile): ResdataFile to fetch property names from
       prop_name (str): The property name to be searched in unrst
 
     Returns:
@@ -255,14 +255,14 @@ def _try_prop(unrst: EclFile, prop_name: str):
 
 
 def _read_props(
-    unrst: EclFile,
+    unrst: ResdataFile,
     prop_names: List,
 ) -> dict:
     """
-    Reads the properties in prop_names from an EclFile named unrst
+    Reads the properties in prop_names from an ResdataFile named unrst
 
     Args:
-      unrst (EclFile): EclFile to read prop_names from
+      unrst (ResdataFile): ResdataFile to read prop_names from
       prop_names (List): List with property names to be read
 
     Returns:
@@ -275,14 +275,14 @@ def _read_props(
 
 
 def _fetch_properties(
-    unrst: EclFile, properties_to_extract: List
+    unrst: ResdataFile, properties_to_extract: List
 ) -> Tuple[Dict[str, Dict[str, List[np.ndarray]]], List[str]]:
     """
-    Fetches the properties in properties_to_extract from an EclFile
+    Fetches the properties in properties_to_extract from an ResdataFile
     named unrst
 
     Args:
-      unrst (EclFile): EclFile to fetch properties_to_extract from
+      unrst (ResdataFile): ResdataFile to fetch properties_to_extract from
       properties_to_extract: List with property names to be fetched
 
     Returns:
@@ -362,7 +362,7 @@ def _extract_source_data(
 ) -> SourceData:
     # pylint: disable-msg=too-many-locals
     """
-    Extracts the properties in properties_to_extract from EclGrid files
+    Extracts the properties in properties_to_extract from Grid files
 
     Args:
       grid_file (str): Path to EGRID-file
@@ -376,9 +376,9 @@ def _extract_source_data(
 
     """
     print("Start extracting source data")
-    grid = EclGrid(grid_file)
-    unrst = EclFile(unrst_file)
-    init = EclFile(init_file)
+    grid = Grid(grid_file)
+    unrst = ResdataFile(unrst_file)
+    init = ResdataFile(init_file)
     properties, dates = _fetch_properties(unrst, properties_to_extract)
     print("Done fetching properties")
 

{subscript-1.0.0 → subscript-1.1.0}/src/subscript/eclcompress/eclcompress.py

@@ -6,12 +6,10 @@ import glob
 import itertools
 import logging
 import os
-import re
 import shutil
 import textwrap
-import warnings
 from pathlib import Path
-from typing import List, Optional, Pattern, Tuple, Union
+from typing import List, Tuple, Union
 
 import subscript
 
@@ -79,7 +77,6 @@ def eclcompress(
     files: Union[str, List[str]],
     keeporiginal: bool = False,
     dryrun: bool = False,
-    eclkw_regexp: Optional[str] = None,
 ) -> int:
     """Run-length encode a set of grdecl files.
 
@@ -89,8 +86,7 @@ def eclcompress(
         files: Filenames to be compressed
         keeporiginal: Whether to copy the original to a backup file
         dryrun: If true, only print compression efficiency
-        eclkw_regexp: Regular expression for locating Eclipse keywords.
-            Default is [A-Z]{2-8}$
+
     Returns:
         Number of bytes saved by compression.
     """
@@ -98,12 +94,6 @@ def eclcompress(
     if not isinstance(files, list):
         files = [files]  # List with one element
 
-    if eclkw_regexp:
-        warnings.warn(
-            "Providing a keyword regex will be removed in Komodo 2023.11.",
-            DeprecationWarning,
-        )
-
     totalsavings = 0
 
     for filename in files:
@@ -137,7 +127,7 @@ def eclcompress(
         # Index the list of strings (the file contents) by the line numbers
         # where Eclipse keywords start, and where the first data record of the keyword
         # ends (compression is not attempted in record 2 and onwards for any keyword)
-        keywordsets = find_keyword_sets(filelines, eclkw_regexp=eclkw_regexp)
+        keywordsets = find_keyword_sets(filelines)
 
         if not keywordsets:
             logger.info(
@@ -299,9 +289,7 @@ def compress_multiple_keywordsets(
     return compressedlines
 
 
-def find_keyword_sets(
-    filelines: List[str], eclkw_regexp: Optional[Union[str, Pattern[str]]] = None
-) -> List[Tuple[int, int]]:
+def find_keyword_sets(filelines: List[str]) -> List[Tuple[int, int]]:
     """Parse list of strings, looking for Eclipse data sets that we want.
 
     Example:
@@ -335,9 +323,6 @@ def find_keyword_sets(
 
     Args:
         filelines: Eclipse deck lines (not necessarily complete decks)
-        eclkw_regexp: Regular expression for locating Eclipse keywords.
-            Default is None, in which it uses a predefined allowlist of
-            keywords
 
     Return:
         2-tuples, with start and end line indices for datasets to
@@ -346,26 +331,19 @@ def find_keyword_sets(
     """
     keywordsets = []
     kwstart = None
-    if eclkw_regexp:
-        eclkw_regexp = re.compile(eclkw_regexp)
 
     for lineidx, line in enumerate(filelines):
         line = line.strip()
         if not line:
             continue
-        if eclkw_regexp:
-            if re.match(eclkw_regexp, line) and line not in DENYLIST_KEYWORDS:
-                kwstart = lineidx
-                continue
-        else:
-            # Remove embracing quotes if in a multi-keyword
-            keyword = line.split(" ")[0].strip("'")
-            if keyword in ALLOWLIST_KEYWORDS:
-                kwstart = lineidx
-                if "/" in line:
-                    keywordsets.append((kwstart, lineidx))
-                    kwstart = None
-                continue
+        # Remove embracing quotes if in a multi-keyword
+        keyword = line.split(" ")[0].strip("'")
+        if keyword in ALLOWLIST_KEYWORDS:
+            kwstart = lineidx
+            if "/" in line:
+                keywordsets.append((kwstart, lineidx))
+                kwstart = None
+            continue
         if kwstart is not None and line[0:2] == "--":
             # This means we found a comment section within a data set
             # In that case it is vital to preserve the current line
@@ -453,14 +431,6 @@ def get_parser() -> argparse.ArgumentParser:
             "no files are specified on the command line."
         ),
     )
-    parser.add_argument(
-        "--eclkw_regexp",
-        help=(
-            "Regular expression to determine which Eclipse keyword "
-            "to recognize. Default is None, using instead a list of known "
-            "compressable keywords."
-        ),
-    )
     parser.add_argument(
         "--version",
         action="version",
@@ -506,7 +476,6 @@ def main():
         args.files,
         keeporiginal=args.keeporiginal,
         dryrun=args.dryrun,
-        eclkw_regexp=args.eclkw_regexp,
     )
 
 
@@ -515,7 +484,6 @@ def main_eclcompress(
     wildcardfile: str,
     keeporiginal: bool = False,
     dryrun: bool = False,
-    eclkw_regexp: Optional[str] = None,
 ) -> None:
     """Implements the command line functionality
 
@@ -525,8 +493,6 @@ def main_eclcompress(
         keeporiginal: Whether a backup file should be left behind
         dryrun: Nothing written to disk, only statistics for
             compression printed to terminal.
-        eclkw_regexp: Regular expression for locating Eclipse keywords.
-            Default is None
     """
     # A list of wildcards on the command line should always be compressed:
     if grdeclfiles:
@@ -558,7 +524,6 @@ def main_eclcompress(
             globbedfiles,
             keeporiginal=keeporiginal,
             dryrun=dryrun,
-            eclkw_regexp=eclkw_regexp,
         )
         savings_mb = savings / 1024.0 / 1024.0
         print(f"eclcompress finished. Saved {savings_mb:.1f} Mb from compression")

{subscript-1.0.0 → subscript-1.1.0}/src/subscript/restartthinner/restartthinner.py

@@ -10,7 +10,7 @@ from pathlib import Path
 
 import numpy
 import pandas
-from ecl.eclfile import EclFile
+from resdata.resfile import ResdataFile
 
 from subscript import __version__
 
@@ -26,8 +26,8 @@ written to the same filename (keeping the original is optional)
 """
 
 
-def find_libecl_app(toolname: str) -> str:
-    """Locate path of apps in libecl.
+def find_resdata_app(toolname: str) -> str:
+    """Locate path of apps in resdata.
 
     These have varying suffixes due through the history of libecl Makefiles.
 
@@ -61,10 +61,10 @@ def date_slicer(slicedates: list, restartdates: list, restartindices: list) -> d
     return slicedatemap
 
 
-def ecl_repacker(rstfilename: str, slicerstindices: list, quiet: bool) -> None:
+def rd_repacker(rstfilename: str, slicerstindices: list, quiet: bool) -> None:
     """
     Wrapper for ecl_unpack.x and ecl_pack.x utilities. These
-    utilities are from libecl.
+    utilities are from resdata.
 
     First unpacking a UNRST file, then deleting dates the dont't want, then
     pack the remainding files into a new UNRST file
@@ -79,11 +79,11 @@ def ecl_repacker(rstfilename: str, slicerstindices: list, quiet: bool) -> None:
         out = ""
     # Error early if libecl tools are not available
     try:
-        find_libecl_app("ecl_unpack")
-        find_libecl_app("ecl_pack")
+        find_resdata_app("rd_unpack")
+        find_resdata_app("rd_pack")
     except IOError:
         sys.exit(
-            "ERROR: ecl_unpack.x and/or ecl_pack.x not found.\n"
+            "ERROR: rd_unpack.x and/or rd_pack.x not found.\n"
             "These tools are required and must be installed separately"
         )
 
@@ -99,13 +99,13 @@ def ecl_repacker(rstfilename: str, slicerstindices: list, quiet: bool) -> None:
         )
         os.chdir(tempdir)
         os.system(
-            find_libecl_app("ecl_unpack") + " " + os.path.basename(rstfilename) + out
+            find_resdata_app("rd_unpack") + " " + os.path.basename(rstfilename) + out
         )
         unpackedfiles = glob.glob("*.X*")
         for file in unpackedfiles:
             if int(file.split(".X")[1]) not in slicerstindices:
                 os.remove(file)
-        os.system(find_libecl_app("ecl_pack") + " *.X*" + out)
+        os.system(find_resdata_app("rd_pack") + " *.X*" + out)
         # We are inside the tmp directory, move file one step up:
         os.rename(
             os.path.join(os.getcwd(), os.path.basename(rstfilename)),
@@ -120,7 +120,7 @@ def get_restart_indices(rstfilename: str) -> list:
     """Extract a list of RST indices for a filename"""
     if Path(rstfilename).exists():
         # This function segfaults if file does not exist
-        return EclFile.file_report_list(str(rstfilename))
+        return ResdataFile.file_report_list(str(rstfilename))
     raise FileNotFoundError(f"{rstfilename} not found")
 
 
@@ -134,7 +134,7 @@ def restartthinner(
     """
     Thin an existing UNRST file to selected number of restarts.
     """
-    rst = EclFile(filename)
+    rst = ResdataFile(filename)
     restart_indices = get_restart_indices(filename)
     restart_dates = [
         rst.iget_restart_sim_time(index) for index in range(0, len(restart_indices))
@@ -177,7 +177,7 @@ def restartthinner(
             if not quiet:
                 print(f"Info: Backing up {filename} to {backupname}")
             shutil.copyfile(filename, backupname)
-        ecl_repacker(filename, slicerstindices, quiet)
+        rd_repacker(filename, slicerstindices, quiet)
     print(f"Written to {filename}")
 
 

{subscript-1.0.0 → subscript-1.1.0}/src/subscript/sector2fluxnum/flux_obj.py

@@ -1,9 +1,9 @@
 import os
 import sys
 
-from ecl import EclDataType
-from ecl.eclfile import EclKW
-from ecl.grid import EclRegion
+from resdata import ResDataType
+from resdata.grid import ResdataRegion
+from resdata.resfile import ResdataKW
 
 from subscript.sector2fluxnum import flux_util
 
@@ -20,9 +20,9 @@ class Fluxnum:
 
         Creates a non-initialized  FLUXNUM keyword
         """
-        int_type = EclDataType.ECL_INT
+        int_type = ResDataType.RD_INT
         self.grid = grid
-        self.fluxnum_kw = EclKW("FLUXNUM", grid.getGlobalSize(), int_type)
+        self.fluxnum_kw = ResdataKW("FLUXNUM", grid.getGlobalSize(), int_type)
         self.included_wells = []
         self.dummy_lgr_cell = []
         self.dummy_lgr_well = []
@@ -44,7 +44,7 @@ class Fluxnum:
 
         Initializes inner region used to define the FLUXNUM
         """
-        self.inner_region = EclRegion(self.grid, False)
+        self.inner_region = ResdataRegion(self.grid, False)
         self.inner_region.select_all()
 
     def set_lgr_box_region(self, i, j, k):
@@ -54,7 +54,7 @@ class Fluxnum:
         Only works for Box regions
 
         """
-        self.lgr_region = EclRegion(self.grid, False)
+        self.lgr_region = ResdataRegion(self.grid, False)
         ijk_list = flux_util.unpack_ijk(i, j, k)
 
         # Drags lgr boundaries one cell from box region
@@ -91,11 +91,11 @@ class Fluxnum:
             print("ERROR: FLUXNUM input file not found!")
             sys.exit(1)
 
-        int_type = EclDataType.ECL_INT
+        int_type = ResDataType.RD_INT
 
         with open(fluxnum_file, "r", encoding="utf8") as file_handle:
-            self.fluxnum_kw = EclKW.read_grdecl(
-                file_handle, "FLUXNUM", ecl_type=int_type
+            self.fluxnum_kw = ResdataKW.read_grdecl(
+                file_handle, "FLUXNUM", rd_type=int_type
             )
 
     def get_fluxnum_kw(self):
@@ -203,11 +203,11 @@ class FluxnumBox(Fluxnum):
         self.set_outer_region(i_start, i_end, j_start, j_end, k_start, k_end)
 
     def set_inner_region(self, i_start, i_end, j_start, j_end, k_start, k_end):
-        self.inner_region = EclRegion(self.grid, False)
+        self.inner_region = ResdataRegion(self.grid, False)
         self.inner_region.select_box((i_start, j_start, k_start), (i_end, j_end, k_end))
 
     def set_outer_region(self, i_start, i_end, j_start, j_end, k_start, k_end):
-        self.outer_region = EclRegion(self.grid, False)
+        self.outer_region = ResdataRegion(self.grid, False)
         self.outer_region.select_box((i_start, j_start, k_start), (i_end, j_end, k_end))
         self.outer_region.invert()
 
@@ -247,8 +247,8 @@ class FluxnumFipnum(Fluxnum):
                 raise Exception("ERROR: FIPNUM input file not found!")
 
             with open(fipnum_file, "r", encoding="utf8") as file_handle:
-                fipnum = EclKW.read_grdecl(
-                    file_handle, "FIPNUM", ecl_type=EclDataType.ECL_INT
+                fipnum = ResdataKW.read_grdecl(
+                    file_handle, "FIPNUM", rd_type=ResDataType.RD_INT
                 )
 
         else:

{subscript-1.0.0 → subscript-1.1.0}/src/subscript/sector2fluxnum/flux_util.py

@@ -1,16 +1,16 @@
-from ecl.grid import EclRegion
+from resdata.grid import ResdataRegion
 
 
 def filter_region(
     grid, idx_i, idx_j, idx_k, fipnum, fipnum_kw, combine_operator="intersect"
 ):
     # Filter out the selected grid cells
-    region = EclRegion(grid, False)
-    region1 = EclRegion(grid, False)
-    region_i = EclRegion(grid, False)
-    region_j = EclRegion(grid, False)
-    region_k = EclRegion(grid, False)
-    region_fip = EclRegion(grid, False)
+    region = ResdataRegion(grid, False)
+    region1 = ResdataRegion(grid, False)
+    region_i = ResdataRegion(grid, False)
+    region_j = ResdataRegion(grid, False)
+    region_k = ResdataRegion(grid, False)
+    region_fip = ResdataRegion(grid, False)
 
     # Create selected regions for each filter type
     if idx_i:

{subscript-1.0.0 → subscript-1.1.0}/src/subscript/sector2fluxnum/sector2fluxnum.py

@@ -3,8 +3,8 @@ import datetime
 import os
 
 import cwrap
-from ecl.eclfile import EclFile, FortIO
-from ecl.grid import EclGrid
+from resdata.grid import Grid
+from resdata.resfile import FortIO, ResdataFile
 
 from subscript.sector2fluxnum import completions, datafile_obj, flux_obj, fluxfile_obj
 
@@ -105,11 +105,11 @@ def sector_to_fluxnum(args):
     print("Reading grid ...")
     if args.egrid:
         args.egrid = os.path.abspath(args.egrid).split(".")[0:1]
-        grid = EclGrid(f"{args.egrid[0]}.EGRID")
+        grid = Grid(f"{args.egrid[0]}.EGRID")
     else:
-        grid = EclGrid(f"{args.ECLIPSE_CASE[0]}.EGRID")
+        grid = Grid(f"{args.ECLIPSE_CASE[0]}.EGRID")
 
-    init = EclFile(f"{args.ECLIPSE_CASE[0]}.INIT")
+    init = ResdataFile(f"{args.ECLIPSE_CASE[0]}.INIT")
 
     # Finding well completions
     completion_list, well_list = completions.get_completion_list(
@@ -170,9 +170,9 @@ def sector_to_fluxnum(args):
         # Needs the coordinates from the
         print("Generating new FLUX file...")
 
-        grid_coarse = EclGrid(f"{args.test[0]}.EGRID")
-        grid_fine = EclGrid(f"{args.test[0]}.EGRID")
-        flux_fine = EclFile(f"{args.test[0]}.FLUX")
+        grid_coarse = Grid(f"{args.test[0]}.EGRID")
+        grid_fine = Grid(f"{args.test[0]}.EGRID")
+        flux_fine = ResdataFile(f"{args.test[0]}.FLUX")
 
     else:
         print("Executing DUMPFLUX NOSIM run ...")
@@ -187,15 +187,15 @@ def sector_to_fluxnum(args):
         # Needs the coordinates from the
         print("Generating new FLUX file...")
 
-        grid_coarse = EclGrid(f"DUMPFLUX_{eclipse_case_root}.EGRID")
-        grid_fine = EclGrid(f"DUMPFLUX_{eclipse_case_root}.EGRID")
-        flux_fine = EclFile(f"DUMPFLUX_{eclipse_case_root}.FLUX")
+        grid_coarse = Grid(f"DUMPFLUX_{eclipse_case_root}.EGRID")
+        grid_fine = Grid(f"DUMPFLUX_{eclipse_case_root}.EGRID")
+        flux_fine = ResdataFile(f"DUMPFLUX_{eclipse_case_root}.FLUX")
 
     # Reads restart file
     if args.restart:
-        rst_coarse = EclFile(f"{args.restart[0]}.UNRST")
+        rst_coarse = ResdataFile(f"{args.restart[0]}.UNRST")
     else:
-        rst_coarse = EclFile(f"{args.ECLIPSE_CASE[0]}.UNRST")
+        rst_coarse = ResdataFile(f"{args.ECLIPSE_CASE[0]}.UNRST")
 
     flux_object_fine = fluxfile_obj.Fluxfile(grid_fine, flux_fine)
 

{subscript-1.0.0 → subscript-1.1.0}/src/subscript/summaryplot/summaryplot.py

@@ -32,12 +32,12 @@ from typing import Optional
 
 import matplotlib.pyplot
 import numpy as np
-from ecl.eclfile import EclFile  # type: ignore
-from ecl.grid import EclGrid  # type: ignore
-from ecl.summary import EclSum  # type: ignore
 
 # Get rid of FutureWarning from pandas/plotting.py
 from pandas.plotting import register_matplotlib_converters
+from resdata.grid import Grid  # type: ignore
+from resdata.resfile import ResdataFile  # type: ignore
+from resdata.summary import Summary  # type: ignore
 
 import subscript
 
@@ -146,7 +146,7 @@ def summaryplotter(
     Will plot Eclipse summary vectors to screen or dump to file based on kwargs.
 
     Args:
-        eclsums: List of EclSum objects
+        summaryfiles: List of Summary objects
         datafiles: List of Eclipse DATA files
         vectors: List of strings, with Eclipse summary vectors
         parameterfiles:
@@ -161,7 +161,7 @@ def summaryplotter(
         logcolourby:
     """
     rstfiles = []  # EclRst objects
-    gridfiles = []  # EclGrid objects
+    gridfiles = []  # Grid objects
     parametervalues = []  # Vector of values pr. realization for colouring
 
     if parameterfiles is None:
@@ -169,7 +169,7 @@ def summaryplotter(
 
     if datafiles and not summaryfiles:
         logger.info("Reloading summary files from disk")
-        summaryfiles = [EclSum(datafile) for datafile in datafiles]
+        summaryfiles = [Summary(datafile) for datafile in datafiles]
 
     if maxlabels == 0:
         nolegend = True
@@ -308,8 +308,8 @@ def summaryplotter(
             logger.info("Loading grid and restart file %s", rstfile)
             # TODO: Allow some of the rstfiles to be missing
             # TODO: Handle missing rstfiles gracefully
-            rst = EclFile(rstfile)
-            grid = EclGrid(gridfile)
+            rst = ResdataFile(rstfile)
+            grid = Grid(gridfile)
             rstfiles.append(rst)
             gridfiles.append(grid)
             logger.info("RST loading done")
@@ -574,24 +574,24 @@ def summaryplotter(
 def split_vectorsdatafiles(vectorsdatafiles):
     """
     Takes a list of strings and determines which of the arguments are Eclipse runs
-    (by attempting to construct an EclSum object), and which are summary
-    vector names/wildcards (that is, those that are not openable as EclSum)
+    (by attempting to construct an Summary object), and which are summary
+    vector names/wildcards (that is, those that are not openable as Summary)
 
     Args:
         vectorsdatafiles (list): List of strings
 
     Returns:
-        tuple: 4-tuple of lists, with EclSum-filenames, datafilename-strings,
+        tuple: 4-tuple of lists, with Summary-filenames, datafilename-strings,
         vector-strings, parameterfilename-strings
     """
-    summaryfiles = []  # Eclsum instances corresponding to datafiles
+    summaryfiles = []  # Summary instances corresponding to datafiles
     datafiles = []  # strings
     vectors = []  # strings
     parameterfiles = []  # strings
 
     for vecdata in vectorsdatafiles:
         try:
-            sumfn = EclSum(vecdata)
+            sumfn = Summary(vecdata)
             datafiles.append(vecdata)
 
             summaryfiles.append(sumfn)

{subscript-1.0.0 → subscript-1.1.0}/src/subscript/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.0.0'
-__version_tuple__ = version_tuple = (1, 0, 0)
+__version__ = version = '1.1.0'
+__version_tuple__ = version_tuple = (1, 1, 0)