res2df 1.3.7__py3-none-any.whl → 1.3.9__py3-none-any.whl

res2df/equil.py

@@ -5,8 +5,8 @@ Extract EQUIL from a :term:`.DATA file` as Pandas DataFrame
 import argparse
 import contextlib
 import logging
+from collections.abc import Container
 from pathlib import Path
-from typing import Dict, List, Optional, Union
 
 import pandas as pd
 
@@ -25,14 +25,13 @@ from .res2csvlogger import getLogger_res2csv
 from .resdatafiles import ResdataFiles
 
 with contextlib.suppress(ImportError):
-    # pylint: disable=unused-import
     import opm.io
 
 
 logger = logging.getLogger(__name__)
 
-SUPPORTED_KEYWORDS: List[str] = ["EQUIL", "PBVD", "PDVD", "RSVD", "RVVD"]
-RENAMERS: Dict[str, Dict[str, Union[str, List[str]]]] = {}
+SUPPORTED_KEYWORDS: list[str] = ["EQUIL", "PBVD", "PDVD", "RSVD", "RVVD"]
+RENAMERS: dict[str, dict[str, str | list[str]]] = {}
 RENAMERS["PBVD"] = {"DATA": ["Z", "PB"]}
 RENAMERS["PDVD"] = {"DATA": ["Z", "PD"]}
 RENAMERS["RSVD"] = {"DATA": ["Z", "RS"]}
@@ -80,9 +79,9 @@ RENAMERS["oil-gas"] = {
 
 
 def df(
-    deck: Union[str, ResdataFiles, "opm.libopmcommon_python.Deck"],
-    keywords: Optional[List[str]] = None,
-    ntequl: Optional[int] = None,
+    deck: "str | ResdataFiles | opm.opmcommon_python.Deck",
+    keywords: list[str] | None = None,
+    ntequl: int | None = None,
 ) -> pd.DataFrame:
     """Extract EQUIL related keyword data, EQUIL, RSVD, RVVD
     PBVD and PDVD.
@@ -138,7 +137,7 @@ def df(
 
 
 def rsvd_fromdeck(
-    deck: Union[str, "opm.libopmcommon_python.Deck"], ntequl: Optional[int] = None
+    deck: "str | opm.opmcommon_python.Deck", ntequl: int | None = None
 ) -> pd.DataFrame:
     """Extract RSVD data from a :term:`deck`
 
@@ -155,7 +154,7 @@ def rsvd_fromdeck(
 
 
 def rvvd_fromdeck(
-    deck: Union[str, "opm.libopmcommon_python.Deck"], ntequl: Optional[int] = None
+    deck: "str | opm.opmcommon_python.Deck", ntequl: int | None = None
 ) -> pd.DataFrame:
     """Extract RVVD data from a :term:`deck`
 
@@ -172,7 +171,7 @@ def rvvd_fromdeck(
 
 
 def pbvd_fromdeck(
-    deck: Union[str, "opm.libopmcommon_python.Deck"], ntequl: Optional[int] = None
+    deck: "str | opm.opmcommon_python.Deck", ntequl: int | None = None
 ) -> pd.DataFrame:
     """Extract PBVD data from a :term:`deck`
 
@@ -189,7 +188,7 @@ def pbvd_fromdeck(
 
 
 def pdvd_fromdeck(
-    deck: Union[str, "opm.libopmcommon_python.Deck"], ntequl: Optional[int] = None
+    deck: "str | opm.opmcommon_python.Deck", ntequl: int | None = None
 ) -> pd.DataFrame:
     """Extract PDVD data from a :term:`deck`
 
@@ -205,7 +204,7 @@ def pdvd_fromdeck(
     )
 
 
-def phases_from_deck(deck: Union[str, "opm.libopmcommon_python.Deck"]) -> str:
+def phases_from_deck(deck: "str | opm.opmcommon_python.Deck") -> str:
     """Determined the set of phases from a :term:`deck`, as
     a string with values "oil-water-gas", "gas-water", "oil-water",
     or "oil-gas"
@@ -227,7 +226,7 @@ def phases_from_deck(deck: Union[str, "opm.libopmcommon_python.Deck"]) -> str:
     return ""
 
 
-def phases_from_columns(columns: List[str]) -> str:
+def phases_from_columns(columns: Container[str]) -> str:
     """Determine the set of phases available in an
     equil dataframe, based on which columns are there.
     Returns "oil-water-gas", "gas-water", "oil-water",
@@ -253,7 +252,7 @@ def phases_from_columns(columns: List[str]) -> str:
 
 
 def equil_fromdeck(
-    deck: Union[str, "opm.libopmcommon_python.Deck"], ntequl: Optional[int] = None
+    deck: "str | opm.opmcommon_python.Deck", ntequl: int | None = None
 ) -> pd.DataFrame:
     """Extract EQUIL data from a :term:`deck`
 
@@ -321,9 +320,7 @@ def fill_reverse_parser(parser: argparse.ArgumentParser) -> argparse.ArgumentPar
 
 def equil_main(args) -> None:
     """Read from disk and write CSV back to disk"""
-    logger = getLogger_res2csv(  # pylint: disable=redefined-outer-name
-        __name__, vars(args)
-    )
+    logger = getLogger_res2csv(__name__, vars(args))
     resdatafiles = ResdataFiles(args.DATAFILE)
     if resdatafiles:
         deck = resdatafiles.get_deck()
@@ -355,9 +352,7 @@ def equil_reverse_main(args) -> None:
     """Entry-point for module, for command line utility
     for CSV to reservoir simulator :term:`include files <include file>`
     """
-    logger = getLogger_res2csv(  # pylint: disable=redefined-outer-name
-        __name__, vars(args)
-    )
+    logger = getLogger_res2csv(__name__, vars(args))
     equil_df = pd.read_csv(args.csvfile)
     logger.info("Parsed %s", args.csvfile)
     inc_string = df2res(equil_df, keywords=args.keywords)
@@ -366,10 +361,10 @@ def equil_reverse_main(args) -> None:
 
 def df2res(
     equil_df: pd.DataFrame,
-    keywords: Optional[List[str]] = None,
-    comments: Optional[Dict[str, str]] = None,
+    keywords: list[str] | None = None,
+    comments: dict[str, str] | None = None,
     withphases: bool = False,
-    filename: Optional[str] = None,
+    filename: str | None = None,
 ) -> str:
     """Generate string contents of :term:`include files <include file>`
     from dataframes with solution (EQUIL, RSVD++) data.
@@ -404,7 +399,7 @@ def df2res(
     return string
 
 
-def df2res_equil(dframe: pd.DataFrame, comment: Optional[str] = None) -> str:
+def df2res_equil(dframe: pd.DataFrame, comment: str | None = None) -> str:
     """Create string with :term:`include file` contents for EQUIL keyword
 
     Args:
@@ -435,7 +430,7 @@ def df2res_equil(dframe: pd.DataFrame, comment: Optional[str] = None) -> str:
     )
 
 
-def df2res_rsvd(dframe: pd.DataFrame, comment: Optional[str] = None) -> str:
+def df2res_rsvd(dframe: pd.DataFrame, comment: str | None = None) -> str:
     """Create string with :term:`include file` contents for RSVD keyword
 
     This data consists of one table (rs as a function
@@ -448,7 +443,7 @@ def df2res_rsvd(dframe: pd.DataFrame, comment: Optional[str] = None) -> str:
     return _df2res_equilfuncs("RSVD", dframe, comment)
 
 
-def df2res_rvvd(dframe: pd.DataFrame, comment: Optional[str] = None) -> str:
+def df2res_rvvd(dframe: pd.DataFrame, comment: str | None = None) -> str:
     """Create string with :term:`include file` contents for RVVD keyword
 
     This data consists of one table (rv as a function
@@ -461,7 +456,7 @@ def df2res_rvvd(dframe: pd.DataFrame, comment: Optional[str] = None) -> str:
     return _df2res_equilfuncs("RVVD", dframe, comment)
 
 
-def df2res_pbvd(dframe: pd.DataFrame, comment: Optional[str] = None) -> str:
+def df2res_pbvd(dframe: pd.DataFrame, comment: str | None = None) -> str:
     """Create string with :term:`include file` contents for PBVD keyword
 
     Bubble-point versus depth
@@ -476,7 +471,7 @@ def df2res_pbvd(dframe: pd.DataFrame, comment: Optional[str] = None) -> str:
     return _df2res_equilfuncs("PBVD", dframe, comment)
 
 
-def df2res_pdvd(dframe: pd.DataFrame, comment: Optional[str] = None):
+def df2res_pdvd(dframe: pd.DataFrame, comment: str | None = None):
     """Create string with :term:`include file` contents for PDVD keyword.
 
     Dew-point versus depth.
@@ -492,7 +487,7 @@ def df2res_pdvd(dframe: pd.DataFrame, comment: Optional[str] = None):
 
 
 def _df2res_equilfuncs(
-    keyword: str, dframe: pd.DataFrame, comment: Optional[str] = None
+    keyword: str, dframe: pd.DataFrame, comment: str | None = None
 ) -> str:
     """Internal function to be used by df2res_<keyword>() functions"""
     if dframe.empty:

res2df/faults.py

@@ -8,7 +8,6 @@ a DataFrame
 import argparse
 import contextlib
 import logging
-from typing import Union
 
 import pandas as pd
 
@@ -18,8 +17,6 @@ from .resdatafiles import ResdataFiles
 
 with contextlib.suppress(ImportError):
     # Needed for mypy
-
-    # pylint: disable=unused-import
     import opm.io
 
 
@@ -30,7 +27,7 @@ COLUMNS = ["NAME", "I", "J", "K", "FACE"]
 ALLOWED_FACES = ["X", "Y", "Z", "I", "J", "K", "X-", "Y-", "Z-", "I-", "J-", "K-"]
 
 
-def df(deck: Union[ResdataFiles, "opm.libopmcommon_python.Deck"]) -> pd.DataFrame:
+def df(deck: "ResdataFiles | opm.opmcommon_python.Deck") -> pd.DataFrame:
     """Produce a dataframe of fault data from a :term:`deck`
 
     All data for the keyword FAULTS will be returned.
@@ -85,9 +82,7 @@ def fill_parser(parser: argparse.ArgumentParser) -> argparse.ArgumentParser:
 
 def faults_main(args) -> None:
     """Read from disk and write CSV back to disk"""
-    logger = getLogger_res2csv(  # pylint: disable=redefined-outer-name
-        __name__, vars(args)
-    )
+    logger = getLogger_res2csv(__name__, vars(args))
     resdatafiles = ResdataFiles(args.DATAFILE)
     if resdatafiles:
         deck = resdatafiles.get_deck()

res2df/fipreports.py

@@ -1,11 +1,9 @@
-# pylint: disable=c0301
 """Extract FIP region reports from PRT file"""
 
 import argparse
 import datetime
 import logging
 import re
-from typing import List, Optional, Union
 
 import numpy as np
 import pandas as pd
@@ -16,7 +14,7 @@ from .resdatafiles import ResdataFiles
 
 logger = logging.getLogger(__name__)
 
-REGION_REPORT_COLUMNS: List[str] = [
+REGION_REPORT_COLUMNS: list[str] = [
     "DATE",
     "FIPNAME",
     "REGION",
@@ -50,7 +48,7 @@ def report_block_lineparser(line: str) -> tuple:
         return ()
 
     colonsections = line.split(":")
-    to_index: Optional[int]
+    to_index: int | None
     if "OUTFLOW TO REGION" in line:
         to_index = int(colonsections[1].split()[3])
         row_name = "OUTFLOW TO REGION"
@@ -59,9 +57,9 @@ def report_block_lineparser(line: str) -> tuple:
         row_name = " ".join(colonsections[1].strip().upper().split())
 
     # Oil section:
-    liquid_oil: Optional[float] = None
-    vapour_oil: Optional[float] = None
-    total_oil: Optional[float] = None
+    liquid_oil: float | None = None
+    vapour_oil: float | None = None
+    total_oil: float | None = None
     if len(colonsections[2].split()) == 3:
         (liquid_oil, vapour_oil, total_oil) = map(
             float_or_nan, colonsections[2].split()
@@ -98,7 +96,7 @@ def report_block_lineparser(line: str) -> tuple:
     )
 
 
-def df(prtfile: Union[str, ResdataFiles], fipname: str = "FIPNUM") -> pd.DataFrame:
+def df(prtfile: str | ResdataFiles, fipname: str = "FIPNUM") -> pd.DataFrame:
     """
     Parses a PRT file from and finds FIPXXXX REGION REPORT blocks and
     organizes those numbers into a dataframe
@@ -153,13 +151,13 @@ def df(prtfile: Union[str, ResdataFiles], fipname: str = "FIPNUM") -> pd.DataFra
                 )
                 if newdate != date:
                     date = newdate
-                    logger.debug("Found date: %s", str(date))
+                    logger.debug("Found date: %s", date)
                 continue
             matchedreportblock = re.match(reportblockmatcher, line)
             if matchedreportblock:
                 in_report_block = True
                 region_index = int(matchedreportblock.group(1))
-                logger.debug("  Region report for region %s", str(region_index))
+                logger.debug("  Region report for region %s", region_index)
                 continue
             if line.startswith(" ============================"):
                 in_report_block = False
@@ -187,7 +185,7 @@ def df(prtfile: Union[str, ResdataFiles], fipname: str = "FIPNUM") -> pd.DataFra
                     line = "".join(linechars)
 
                 records.append(
-                    [date, fipname, region_index] + list(report_block_lineparser(line))
+                    [date, fipname, region_index, *list(report_block_lineparser(line))]
                 )
     return pd.DataFrame(data=records, columns=REGION_REPORT_COLUMNS)
 
@@ -211,9 +209,7 @@ def fill_parser(parser: argparse.ArgumentParser) -> argparse.ArgumentParser:
 
 def fipreports_main(args) -> None:
     """Command line API"""
-    logger = getLogger_res2csv(  # pylint: disable=redefined-outer-name
-        __name__, vars(args)
-    )
+    logger = getLogger_res2csv(__name__, vars(args))
     if args.PRTFILE.endswith(".PRT"):
         prtfile = args.PRTFILE
     else:

res2df/grid.py

@@ -16,13 +16,11 @@ import fnmatch
 import logging
 import textwrap
 from pathlib import Path
-from typing import Dict, List, Optional, Tuple, Type, Union
 
 import dateutil.parser
 import numpy as np
 import pandas as pd
-import pyarrow
-import pyarrow.feather
+import pyarrow as pa
 import resfo
 from resdata.resfile import ResdataFile
 
@@ -39,13 +37,13 @@ from .resdatafiles import ResdataFiles
 logger = logging.getLogger(__name__)
 
 
-def get_available_rst_dates(resdatafiles: ResdataFiles) -> List[datetime.date]:
+def get_available_rst_dates(resdatafiles: ResdataFiles) -> list[datetime.date]:
     """Return a list of datetime objects for the available dates in the RST file"""
     report_indices = ResdataFile.file_report_list(resdatafiles.get_rstfilename())
     logger.info(
         "Restart report indices (count %s): %s",
-        str(len(report_indices)),
-        str(report_indices),
+        len(report_indices),
+        report_indices,
     )
     return [
         resdatafiles.get_rstfile().iget_restart_sim_time(index).date()
@@ -55,8 +53,8 @@ def get_available_rst_dates(resdatafiles: ResdataFiles) -> List[datetime.date]:
 
 def dates2rstindices(
     resdatafiles: ResdataFiles,
-    dates: Optional[Union[str, datetime.date, List[datetime.date]]],
-) -> Tuple[List[int], List[datetime.date], List[str]]:
+    dates: str | datetime.date | list[datetime.date] | None,
+) -> tuple[list[int], list[datetime.date], list[str]]:
     """Return the restart index/indices for a given datetime or list of datetimes
 
       dates: datetime.date or list of datetime.date, must
@@ -110,22 +108,22 @@ def dates2rstindices(
         chosendates = [x for x in dates if x in availabledates]
         if not chosendates:
             raise ValueError("None of the requested dates were found")
-        if len(chosendates) < len(availabledates):
+        if len(chosendates) < len(dates):
             logger.warning("Not all dates found in UNRST\n")
     else:
         raise ValueError("date " + str(dates) + " not understood")
 
     logger.info(
         "Available dates (count %s) in RST: %s",
-        str(len(availabledates)),
-        str([x.isoformat() for x in availabledates]),
+        len(availabledates),
+        [x.isoformat() for x in availabledates],
     )
     rstindices = [availabledates.index(x) for x in chosendates]
     isostrings = [x.isoformat() for x in chosendates]
     return (rstindices, chosendates, isostrings)
 
 
-def _df2pyarrow(dframe: pd.DataFrame) -> pyarrow.Table:
+def _df2pyarrow(dframe: pd.DataFrame) -> pa.Table:
     """Construct a pyarrow table from dataframe with
     grid information
 
@@ -133,25 +131,25 @@ def _df2pyarrow(dframe: pd.DataFrame) -> pyarrow.Table:
 
     32-bit types will be used for integers and floats (todo)
     """
-    field_list: List[pyarrow.Field] = []
+    field_list: list[pa.Field] = []
     for colname in dframe.columns:
         if pd.api.types.is_integer_dtype(dframe.dtypes[colname]):
-            dtype = pyarrow.int32()
+            dtype = pa.int32()
         elif pd.api.types.is_string_dtype(dframe.dtypes[colname]):
             # Parameters are potentially merged into the dataframe.
-            dtype = pyarrow.string()
+            dtype = pa.string()
         else:
-            dtype = pyarrow.float32()
-        field_list.append(pyarrow.field(colname, dtype))
+            dtype = pa.float32()
+        field_list.append(pa.field(colname, dtype))
 
-    schema = pyarrow.schema(field_list)
-    return pyarrow.Table.from_pandas(dframe, schema=schema, preserve_index=False)
+    schema = pa.schema(field_list)
+    return pa.Table.from_pandas(dframe, schema=schema, preserve_index=False)
 
 
 def rst2df(
     resdatafiles: ResdataFiles,
-    date: Union[str, datetime.date, List[datetime.date]],
-    vectors: Optional[Union[str, List[str]]] = None,
+    date: str | datetime.date | list[datetime.date],
+    vectors: str | list[str] | None = None,
     dateinheaders: bool = False,
     stackdates: bool = False,
 ) -> pd.DataFrame:
@@ -193,12 +191,12 @@ def rst2df(
     # data for:
     (rstindices, chosendates, isodates) = dates2rstindices(resdatafiles, date)
 
-    logger.info("Extracting restart information at dates %s", str(isodates))
+    logger.info("Extracting restart information at dates %s", isodates)
 
     # Determine the available restart vectors, we only include
     # those with correct length, meaning that they are defined
     # for all active cells:
-    activecells = resdatafiles.get_egrid().getNumActive()
+    activecells = resdatafiles.get_egrid().get_num_active()
     rstvectors = []
     for vec in resfo.lazy_read(resdatafiles.get_rstfilename()):
         keyword_name = vec.read_keyword().strip()
@@ -218,22 +216,20 @@ def rst2df(
         # Filter the rst vectors once more, all of them
         # might not be available at all timesteps:
         present_rstvectors = []
-        for vec in rstvectors:
+        for rst_vec in rstvectors:
             try:
-                if resdatafiles.get_rstfile().iget_named_kw(vec, rstindex):
-                    present_rstvectors.append(vec)
+                if resdatafiles.get_rstfile().iget_named_kw(rst_vec, rstindex):
+                    present_rstvectors.append(rst_vec)
             except IndexError:
                 pass
         logger.info(
             "Present restart vectors at index %s: %s",
-            str(rstindex),
-            str(present_rstvectors),
+            rstindex,
+            present_rstvectors,
         )
         if not present_rstvectors:
             if vectorswasdefaulted:
-                logger.warning(
-                    "No restart vectors available at index %s", str(rstindex)
-                )
+                logger.warning("No restart vectors available at index %s", rstindex)
             continue
 
         # Make the dataframe
@@ -262,7 +258,7 @@ def rst2df(
         # Tag the column names if requested, or if multiple rst indices
         # are asked for
         datestr = chosendates[rstindices.index(rstindex)].isoformat()
-        if dateinheaders or len(rstindices) > 1 and not stackdates:
+        if dateinheaders or (len(rstindices) > 1 and not stackdates):
             rst_df.columns = [colname + "@" + datestr for colname in rst_df.columns]
 
         # resdata emits a number around -1.0000000200408773e+20 which
@@ -270,7 +266,7 @@ def rst2df(
         rst_df = rst_df.where(rst_df > -1e20 + 1e13)  # some trial and error
 
         # Remove columns that are all NaN:
-        rst_df.dropna(axis="columns", how="all", inplace=True)
+        rst_df = rst_df.dropna(axis="columns", how="all")
 
         rst_df.index.name = "active"
 
@@ -282,13 +278,14 @@ def rst2df(
     if not stackdates:
         return pd.concat(rst_dfs.values(), axis=1).reset_index()
 
-    rststack = pd.concat(rst_dfs, sort=False).reset_index()
-    rststack.rename(columns={"level_0": "DATE"}, inplace=True)
+    rststack = (
+        pd.concat(rst_dfs, sort=False).reset_index().rename(columns={"level_0": "DATE"})
+    )
     return rststack
 
 
 def gridgeometry2df(
-    resdatafiles: ResdataFiles, zonemap: Optional[Dict[int, str]] = None
+    resdatafiles: ResdataFiles, zonemap: dict[int, str] | None = None
 ) -> pd.DataFrame:
     """Produce a Pandas Dataframe with grid geometry
 
@@ -314,9 +311,9 @@ def gridgeometry2df(
     if not egrid_file or not grid:
         raise ValueError("No EGRID file supplied")
 
-    logger.info("Extracting grid geometry from %s", str(egrid_file))
+    logger.info("Extracting grid geometry from %s", egrid_file)
     index_frame = grid.export_index(active_only=True)
-    ijk = index_frame.values[:, 0:3] + 1  # ijk from resdata.grid is off by one
+    ijk = index_frame.to_numpy()[:, 0:3] + 1  # ijk from resdata.grid is off by one
 
     xyz = grid.export_position(index_frame)
     vol = grid.export_volume(index_frame)
@@ -368,8 +365,8 @@ def gridgeometry2df(
 def merge_initvectors(
     resdatafiles: ResdataFiles,
     dframe: pd.DataFrame,
-    initvectors: List[str],
-    ijknames: Optional[List[str]] = None,
+    initvectors: list[str],
+    ijknames: list[str] | None = None,
 ) -> pd.DataFrame:
     """Merge in INIT vectors to a dataframe by I, J, K.
 
@@ -406,13 +403,13 @@ def merge_initvectors(
         initvectors = [initvectors]
     assert isinstance(initvectors, list)
 
-    logger.info("Merging INIT data %s into dataframe", str(initvectors))
-    ijkinit = df(resdatafiles, vectors=initvectors)[["I", "J", "K"] + initvectors]
-    return pd.merge(dframe, ijkinit, left_on=ijknames, right_on=["I", "J", "K"])
+    logger.info("Merging INIT data %s into dataframe", initvectors)
+    ijkinit = df(resdatafiles, vectors=initvectors)[["I", "J", "K", *initvectors]]
+    return dframe.merge(ijkinit, left_on=ijknames, right_on=["I", "J", "K"])
 
 
 def init2df(
-    resdatafiles: ResdataFiles, vectors: Optional[Union[str, List[str]]] = None
+    resdatafiles: ResdataFiles, vectors: str | list[str] | None = None
 ) -> pd.DataFrame:
     """Extract information from INIT file with cell data
 
@@ -440,7 +437,7 @@ def init2df(
     for vec in init.headers:
         if vec[0] == "PORV" and any(fnmatch.fnmatch("PORV", key) for key in vectors):
             include_porv = True
-        elif vec[1] == egrid.getNumActive() and any(
+        elif vec[1] == egrid.get_num_active() and any(
             fnmatch.fnmatch(vec[0], key) for key in vectors
         ):
             usevectors.append(vec[0])
@@ -459,7 +456,7 @@ def init2df(
         init_df = init_df.where(init_df > -1e20 + 1e13)  # some trial and error
 
         # Remove columns that are all NaN:
-        init_df.dropna(axis="columns", how="all", inplace=True)
+        init_df = init_df.dropna(axis="columns", how="all")
 
     else:
         init_df = pd.DataFrame()  # empty
@@ -469,21 +466,21 @@ def init2df(
         porv_numpy = init.iget_named_kw("PORV", 0).numpyView()
         glob_idxs = [
             egrid.get_global_index(active_index=ix)
-            for ix in range(egrid.getNumActive())
+            for ix in range(egrid.get_num_active())
         ]
         init_df["PORV"] = porv_numpy[glob_idxs]
-    logger.info("Extracted %s from INIT file", str(init_df.columns.values))
+    logger.info("Extracted %s from INIT file", init_df.columns.to_numpy())
     return init_df
 
 
 def df(
     resdatafiles: ResdataFiles,
-    vectors: Union[str, List[str]] = "*",
+    vectors: str | list[str] = "*",
     dropconstants: bool = False,
-    rstdates: Optional[Union[str, datetime.date, List[datetime.date]]] = None,
+    rstdates: str | datetime.date | list[datetime.date] | None = None,
     dateinheaders: bool = False,
     stackdates: bool = False,
-    zonemap: Optional[Dict[int, str]] = None,
+    zonemap: dict[int, str] | None = None,
 ):
     """Produce a dataframe with grid information
 
@@ -591,7 +588,7 @@ def fill_parser(parser: argparse.ArgumentParser) -> argparse.ArgumentParser:
 
 
 def drop_constant_columns(
-    dframe: pd.DataFrame, alwayskeep: Optional[Union[str, List[str]]] = None
+    dframe: pd.DataFrame, alwayskeep: str | list[str] | None = None
 ) -> pd.DataFrame:
     """Drop/delete constant columns from a dataframe.
 
@@ -618,16 +615,16 @@ def drop_constant_columns(
         if len(dframe[col].unique()) == 1:
             columnstodelete.append(col)
     if columnstodelete:
-        logging.info("Deleting constant columns %s", str(columnstodelete))
+        logging.info("Deleting constant columns %s", columnstodelete)
     return dframe.drop(columnstodelete, axis=1)
 
 
 def df2res(
     grid_df: pd.DataFrame,
-    keywords: Union[str, List[str]],
-    resdatafiles: Optional[ResdataFiles] = None,
-    dtype: Optional[Type] = None,
-    filename: Optional[str] = None,
+    keywords: str | list[str],
+    resdatafiles: ResdataFiles | None = None,
+    dtype: type | None = None,
+    filename: str | None = None,
     nocomments: bool = False,
 ) -> str:
     """
@@ -680,24 +677,24 @@ def df2res(
     active_cells = None
     if resdatafiles is not None and resdatafiles.get_egrid() is not None:
         global_size = resdatafiles.get_egrid().get_global_size()
-        active_cells = resdatafiles.get_egrid().getNumActive()
+        active_cells = resdatafiles.get_egrid().get_num_active()
 
     if "GLOBAL_INDEX" not in grid_df:
         logger.warning(
-            ("Global index not found in grid dataframe. Assumes all cells are active")
+            "Global index not found in grid dataframe. Assumes all cells are active"
         )
         # Drop NaN rows for columns to be used (triggered by stacked
         # dates and no global index, unlikely)
         # Also copy dataframe to avoid side-effects on incoming data.
         grid_df = grid_df.dropna(
-            axis="rows", subset=[keyword for keyword in keywords if keyword in grid_df]
+            axis="index", subset=[keyword for keyword in keywords if keyword in grid_df]
         )
         grid_df["GLOBAL_INDEX"] = grid_df.index
 
     if global_size is None:
         global_size = int(grid_df["GLOBAL_INDEX"].max() + 1)
         active_cells = len(grid_df[grid_df.index >= 0])
-        logger.warning("Global grid size estimated to %s", str(global_size))
+        logger.warning("Global grid size estimated to %s", global_size)
 
     res2df_header = (
         "Output file printed by "
@@ -716,14 +713,14 @@ def df2res(
     # If we have NaNs in the dataframe, we will be more careful (costs memory)
     if grid_df.isna().any().any():
         grid_df = grid_df.dropna(
-            axis="rows", subset=[keyword for keyword in keywords if keyword in grid_df]
+            axis="index", subset=[keyword for keyword in keywords if keyword in grid_df]
         )
 
     for keyword in keywords:
         if keyword not in grid_df.columns:
             raise ValueError(f"Keyword {keyword} not found in grid dataframe")
         vector = np.zeros(global_size)
-        vector[grid_df["GLOBAL_INDEX"].astype(int).values] = grid_df[keyword]
+        vector[grid_df["GLOBAL_INDEX"].astype(int).to_numpy()] = grid_df[keyword]
         if dtype is int:
             vector = vector.astype(int)
         if dtype is float:
@@ -764,9 +761,7 @@ def df2res(
 
 def grid_main(args) -> None:
     """This is the command line API"""
-    logger = getLogger_res2csv(  # pylint: disable=redefined-outer-name
-        __name__, vars(args)
-    )
+    logger = getLogger_res2csv(__name__, vars(args))
     resdatafiles = ResdataFiles(args.DATAFILE)
     grid_df = df(
         resdatafiles,