subscript 1.0.0__tar.gz → 1.1.1__tar.gz

{subscript-1.0.0 → subscript-1.1.1}/.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.1}/PKG-INFO

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

{subscript-1.0.0 → subscript-1.1.1}/docs/overview.rst

@@ -10,7 +10,6 @@ Script                    CLI  ERT Forward Model  ERT Workflow
 bjobsusers                ✅   ⛔️                 ⛔️
 casegen_upcars            ✅   ⛔️                 ⛔️
 check_swatinit            ✅   ✅                 ⛔️
-co2_containment           ✅   ⛔️                 ⛔️
 convert_grid_format [*]_  ✅   ✅                 ⛔️
 csv2ofmvol                ✅   ✅                 ⛔️
 csv_merge                 ✅   ⛔️                 ✅

{subscript-1.0.0 → subscript-1.1.1}/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.1}/docs/scripts/prtvol2csv.rst

@@ -130,5 +130,5 @@ file has been supplied defining the map from zones and regions to FIPNUM:
 See also
 --------
 
-* https://equinor.github.io/ecl2df/usage/fipreports.html can be used to extract
+* https://equinor.github.io/res2df/usage/fipreports.html can be used to extract
   more information from  the PRT files.

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

@@ -36,8 +36,8 @@ classifiers = [
 dynamic = ["version"]
 dependencies = [
     "configsuite",
-    "ecl",
-    "ecl2df",
+    "resdata",
+    "res2df",
     "ert>=2.38.0b7",
     "fmu-tools",
     "matplotlib",
@@ -91,7 +91,6 @@ Documentation = "https://equinor.github.io/subscript"
 bjobsusers = "subscript.bjobsusers.bjobsusers:main"
 casegen_upcars = "subscript.casegen_upcars.casegen_upcars:main"
 check_swatinit = "subscript.check_swatinit.check_swatinit:main"
-co2_containment = "subscript.co2_containment.co2_containment:main"
 convert_grid_format = "subscript.convert_grid_format.convert_grid_format:main"
 csv2ofmvol = "subscript.csv2ofmvol.csv2ofmvol:main"
 csv_merge = "subscript.csv_merge.csv_merge:main"
@@ -125,6 +124,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.1}/src/subscript/check_swatinit/check_swatinit.py

@@ -3,9 +3,9 @@ import argparse
 import sys
 from typing import Any, Dict, List
 
-import ecl2df
 import numpy as np
 import pandas as pd
+import res2df
 from matplotlib import pyplot
 
 import subscript
@@ -58,7 +58,7 @@ def main() -> None:
     if args.DATAFILE.endswith(".csv"):
         qc_frame = pd.read_csv(args.DATAFILE)
     else:
-        eclfiles = ecl2df.EclFiles(args.DATAFILE)
+        eclfiles = res2df.ResdataFiles(args.DATAFILE)
 
         # Fail hard if the deck is not suitable for this tool or
         # give warnings/hints to the user:
@@ -102,11 +102,11 @@ def main() -> None:
         pyplot.savefig(args.plotfile)
 
 
-def check_applicability(eclfiles: ecl2df.EclFiles) -> None:
+def check_applicability(eclfiles: res2df.ResdataFiles) -> None:
     """Check that the input is relevant for usage with check_swatinit. This
     function may raise exceptions, SystemExit or only give warnings"""
 
-    deck = eclfiles.get_ecldeck()
+    deck = eclfiles.get_deck()
 
     init = eclfiles.get_initfile()
     if (
@@ -212,7 +212,7 @@ def human_report_pc_scaling(qc_frame: pd.DataFrame) -> str:
     return string
 
 
-def make_qc_gridframe(eclfiles: ecl2df.EclFiles) -> pd.DataFrame:
+def make_qc_gridframe(eclfiles: res2df.ResdataFiles) -> pd.DataFrame:
     """Construct a dataframe with needed information for swatinit qc from an
     Eclipse run.
 
@@ -220,7 +220,7 @@ def make_qc_gridframe(eclfiles: ecl2df.EclFiles) -> pd.DataFrame:
     satfunc and equil merged in.
     """
 
-    grid_df = ecl2df.grid.df(
+    grid_df = res2df.grid.df(
         eclfiles,
         vectors=[
             # All of these are required.
@@ -242,14 +242,14 @@ def make_qc_gridframe(eclfiles: ecl2df.EclFiles) -> pd.DataFrame:
         rstdates="first",
     )
 
-    # Circumvent bug in ecl2df that will pick SWL from both INIT and restart file:
+    # Circumvent bug in res2df that will pick SWL from both INIT and restart file:
     grid_df = grid_df.loc[:, ~grid_df.columns.duplicated()]
 
     # Merge in PPCWMAX from the deck, it is not reported in binary output files:
-    if "PPCWMAX" in eclfiles.get_ecldeck():
+    if "PPCWMAX" in eclfiles.get_deck():
         grid_df["PPCWMAX"] = ppcwmax_gridvector(eclfiles)
 
-    # This will be unneccessary from ecl2df 0.13.0:
+    # This will be unneccessary from res2df 0.13.0:
     grid_df = grid_df.where(grid_df > -1e20 + 1e13)
 
     if "SWL" not in grid_df:
@@ -257,7 +257,7 @@ def make_qc_gridframe(eclfiles: ecl2df.EclFiles) -> pd.DataFrame:
         logger.warning("Consider adding FILLEPS to the PROPS section")
         grid_df["SWL"] = 0.0
 
-    deck = eclfiles.get_ecldeck()
+    deck = eclfiles.get_deck()
     if "SWATINIT" in deck:
         swatinit_deckdata = deck["SWATINIT"][0][0].get_raw_data_list()
         # This list includes non-active cells, we must map via GLOBAL_INDEX:
@@ -280,12 +280,12 @@ def make_qc_gridframe(eclfiles: ecl2df.EclFiles) -> pd.DataFrame:
             del grid_df["SWATINIT_DECK"]  # This is not needed
 
     # Exposed to issues with endpoint scaling in peculiar decks:
-    satfunc_df = ecl2df.satfunc.df(eclfiles)
+    satfunc_df = res2df.satfunc.df(eclfiles)
 
     # Merge in the input pcmax pr. satnum for each cell:
     grid_df = merge_pc_max(grid_df, satfunc_df)
 
-    grid_df = merge_equil(grid_df, ecl2df.equil.df(eclfiles, keywords=["EQUIL"]))
+    grid_df = merge_equil(grid_df, res2df.equil.df(eclfiles, keywords=["EQUIL"]))
 
     grid_df = augment_grid_frame_qc_vectors(grid_df)
 
@@ -587,7 +587,7 @@ def compute_pc(qc_frame: pd.DataFrame, satfunc_df: pd.DataFrame) -> pd.Series:
     return p_cap
 
 
-def ppcwmax_gridvector(eclfiles: ecl2df.EclFiles) -> pd.Series:
+def ppcwmax_gridvector(eclfiles: res2df.ResdataFiles) -> pd.Series:
     """Generate a vector of PPCWMAX data pr cell
 
     PPCWMAX is pr. SATNUM in the input deck
@@ -596,11 +596,11 @@ def ppcwmax_gridvector(eclfiles: ecl2df.EclFiles) -> pd.Series:
         eclfiles
 
     Returns:
-        pd.Series, indexed according to ecl2df.grid.df(eclfiles)
+        pd.Series, indexed according to res2df.grid.df(eclfiles)
     """
 
-    satnum_df = ecl2df.grid.df(eclfiles, vectors="SATNUM")
-    deck = eclfiles.get_ecldeck()
+    satnum_df = res2df.grid.df(eclfiles, vectors="SATNUM")
+    deck = eclfiles.get_deck()
     for satnum in satnum_df["SATNUM"].unique():
         ppcwmax = deck["PPCWMAX"][satnum - 1][0].get_raw_data_list()[0]
         satnum_df.loc[satnum_df["SATNUM"] == satnum, "PPCWMAX"] = ppcwmax
@@ -615,7 +615,7 @@ def merge_equil(grid_df: pd.DataFrame, equil_df: pd.DataFrame) -> pd.DataFrame:
     assert "Z" in equil_df
     assert "PRESSURE" in equil_df
 
-    # Be compatible with future change in ecl2df:
+    # Be compatible with future change in res2df:
     equil_df.rename({"ACCURACY": "OIP_INIT"}, axis="columns", inplace=True)
 
     contacts = list(set(["OWC", "GOC", "GWC"]).intersection(set(equil_df.columns)))

{subscript-1.0.0 → subscript-1.1.1}/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.1}/src/subscript/fmuobs/parsers.py

@@ -462,7 +462,11 @@ def resinsight_df2df(ri_dframe: pd.DataFrame) -> pd.DataFrame:
 
     dframe = ri_dframe.copy()
     dframe.rename({"VECTOR": "KEY"}, axis="columns", inplace=True)
-    dframe["LABEL"] = dframe["KEY"].astype(str)  # + "-" + dframe["DATE"].astype(str)
+    dframe["LABEL"] = (
+        dframe["KEY"].astype(str)
+        + "-"
+        + (dframe.groupby("KEY").cumcount() + 1).astype(str)
+    )
     dframe["CLASS"] = "SUMMARY_OBSERVATION"
     if "DATE" in dframe:
         dframe["DATE"] = pd.to_datetime(dframe["DATE"])

{subscript-1.0.0 → subscript-1.1.1}/src/subscript/interp_relperm/interp_relperm.py

@@ -11,7 +11,7 @@ import pyscal
 import yaml
 from configsuite import MetaKeys as MK  # lgtm [py/import-and-import-from]
 from configsuite import types  # lgtm [py/import-and-import-from]
-from ecl2df import satfunc
+from res2df import satfunc
 
 import subscript
 
@@ -397,10 +397,10 @@ def main() -> None:
 
     logger.setLevel(logging.INFO)
 
-    # Mute expected warnings from ecl2df.inferdims, we get these
+    # Mute expected warnings from res2df.inferdims, we get these
     # because we don't tell the module how many SATNUMs there are in
     # input files, which is slightly fragile for opm to parse.
-    logging.getLogger("ecl2df.inferdims").setLevel(logging.ERROR)
+    logging.getLogger("res2df.inferdims").setLevel(logging.ERROR)
 
     # parse the config file
     if not Path(args.configfile).exists():

{subscript-1.0.0 → subscript-1.1.1}/src/subscript/presentvalue/presentvalue.py

@@ -5,9 +5,9 @@ import logging
 from pathlib import Path
 from typing import Dict, Optional
 
-import ecl2df
 import numpy as np
 import pandas as pd
+import res2df
 import scipy.optimize
 
 from subscript import __version__, getLogger
@@ -422,8 +422,8 @@ def get_yearly_summary(
         vec.split(":")[0].endswith("T") for vec in [oilvector, gasvector, gasinjvector]
     ):
         raise ValueError("Only cumulative Eclipse vectors can be used")
-    eclfiles = ecl2df.EclFiles(eclfile)
-    sum_df = ecl2df.summary.df(
+    eclfiles = res2df.ResdataFiles(eclfile)
+    sum_df = res2df.summary.df(
         eclfiles, column_keys=[oilvector, gasvector, gasinjvector], time_index="yearly"
     )
     sum_df.rename(

{subscript-1.0.0 → subscript-1.1.1}/src/subscript/prtvol2csv/prtvol2csv.py

@@ -7,8 +7,8 @@ import warnings
 from pathlib import Path
 from typing import Optional
 
-import ecl2df
 import pandas as pd
+import res2df
 from fmu.tools.fipmapper.fipmapper import FipMapper
 
 from subscript import __version__, getLogger
@@ -162,7 +162,7 @@ def currently_in_place_from_prt(
 ) -> pd.DataFrame:
     """Extracts currently-in-place volumes from a PRT file
 
-    This function uses ecl2df.fipreports, and slices its
+    This function uses res2df.fipreports, and slices its
     output for the purpose here.
 
     Args:
@@ -174,7 +174,7 @@ def currently_in_place_from_prt(
     Returns:
         pd.DataFrame
     """
-    inplace_df = ecl2df.fipreports.df(prt_file, fipname=fipname)
+    inplace_df = res2df.fipreports.df(prt_file, fipname=fipname)
 
     available_dates = inplace_df.sort_values("DATE")["DATE"].unique()
     if date is None or date == "first":

{subscript-1.0.0 → subscript-1.1.1}/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.1}/src/subscript/sector2fluxnum/completions.py

@@ -1,4 +1,4 @@
-from ecl2df import EclFiles, compdat
+from res2df import ResdataFiles, compdat
 
 
 def get_completion_list(ecl_data_file_name):
@@ -14,7 +14,7 @@ def get_completion_list(ecl_data_file_name):
     List of completions associated to well names
     """
 
-    ecl_file = EclFiles(ecl_data_file_name)
+    ecl_file = ResdataFiles(ecl_data_file_name)
     compdat_df = compdat.df(ecl_file)
 
     # Convert from ECL index

{subscript-1.0.0 → subscript-1.1.1}/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: