subscript 1.14.2__tar.gz → 1.14.3__tar.gz

{subscript-1.14.2 → subscript-1.14.3}/.github/workflows/codecov.yml

@@ -5,6 +5,10 @@ on:
   push:
     branches: [main]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
 jobs:
   coverage:
     runs-on: ${{ matrix.os }}
@@ -36,23 +40,21 @@ jobs:
         enable-cache: true
         python-version: "3.12"
 
-    - name: Install OPM-flow and ResInsight (for testing)
+    - name: Install OPM-flow (for testing)
       run: |
         sudo apt-get install software-properties-common
         sudo apt-add-repository ppa:opm/ppa
         sudo apt-get update
         sudo apt-get install mpi-default-bin
         sudo apt-get install libopm-simulators-bin
-        sudo apt-get install resinsight
 
     - name: Install subscript and test dependencies
       run: |
         uv pip install ".[tests]"
 
-    - name: Log OPM-Flow and ResInsight version
+    - name: Log OPM-Flow version
       run: |
         flow --version
-        ResInsight --console --version
 
     - name: Generate coverage report
       run: |

subscript-1.14.3/.github/workflows/linting.yml

@@ -0,0 +1,58 @@
+name: lint
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+  release:
+    types:
+      - published
+  schedule:
+    # Run nightly to check that tests are working with latest dependencies
+    - cron: "0 0 * * *"
+
+env:
+  UV_SYSTEM_PYTHON: 1
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ["3.12"]
+
+    steps:
+      - name: Checkout commit locally
+        uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
+        with:
+          enable-cache: true
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install subscript with dependencies
+        run: |
+          uv pip install ".[tests, docs]"
+
+      - name: Format and lint with ruff
+        run: |
+          ruff format . --check
+          ruff check .
+
+      - name: Check typing with mypy
+        run: mypy src/subscript

{subscript-1.14.2 → subscript-1.14.3}/.github/workflows/subscript.yml

@@ -18,6 +18,10 @@ env:
   MPLBACKEND: Agg
   UV_SYSTEM_PYTHON: 1
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
 jobs:
   subscript:
     runs-on: ubuntu-latest
@@ -48,43 +52,29 @@ jobs:
           enable-cache: true
           python-version: ${{ matrix.python-version }}
 
-      - name: Install OPM-flow and ResInsight (for testing)
+      - name: Install OPM-flow (for testing)
         run: |
           sudo apt-get install software-properties-common
           sudo apt-add-repository ppa:opm/ppa
           sudo apt-get update
           sudo apt-get install mpi-default-bin
           sudo apt-get install libopm-simulators-bin
-          sudo apt-get install resinsight
 
       - name: Install subscript with dependencies
         if: ${{ always() }}
         run: |
           uv pip install ".[tests, docs]"
 
-      - name: Log OPM-Flow and ResInsight version
+      - name: Log OPM-Flow version
         run: |
           flow --version
-          ResInsight --console --version
 
       - name: List all installed packages
         run: uv pip freeze
 
-      - name: Format with ruff
-        if: ${{ always() }}
-        run: ruff format . --check
-
-      - name: Lint with ruff
-        if: ${{ always() }}
-        run: ruff check .
-
-      - name: Check typing with mypy
-        if: ${{ always() }}
-        run: mypy src/subscript
-
       - name: Run tests
         if: ${{ always() }}
-        run: pytest -n auto tests --mpl
+        run: pytest -n logical tests --mpl
 
       - name: Syntax check documentation
         if: ${{ always() }}

{subscript-1.14.2 → subscript-1.14.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: subscript
-Version: 1.14.2
+Version: 1.14.3
 Summary: Equinor's collection of subsurface reservoir modelling scripts
 Author-email: Equinor <rnyb@equinor.com>
 License:                     GNU GENERAL PUBLIC LICENSE
@@ -705,14 +705,11 @@ Requires-Dist: matplotlib
 Requires-Dist: numpy
 Requires-Dist: opm>=2023.04
 Requires-Dist: pandas
+Requires-Dist: pydantic
 Requires-Dist: pyscal
 Requires-Dist: pyyaml
-Requires-Dist: rips
 Requires-Dist: scipy
 Requires-Dist: seaborn
-Requires-Dist: segyio
-Requires-Dist: shapely
-Requires-Dist: xlrd
 Requires-Dist: xtgeo
 Provides-Extra: tests
 Requires-Dist: mypy; extra == "tests"
@@ -727,6 +724,9 @@ Requires-Dist: ruff; extra == "tests"
 Requires-Dist: types-Jinja2; extra == "tests"
 Requires-Dist: types-PyYAML; extra == "tests"
 Requires-Dist: types-python-dateutil; extra == "tests"
+Requires-Dist: pandas-stubs; extra == "tests"
+Requires-Dist: types-seaborn; extra == "tests"
+Requires-Dist: scipy-stubs; extra == "tests"
 Provides-Extra: docs
 Requires-Dist: autoapi; extra == "docs"
 Requires-Dist: sphinx; extra == "docs"
@@ -740,7 +740,7 @@ Dynamic: license-file
 # subscript
 
 [![subscript](https://github.com/equinor/subscript/actions/workflows/subscript.yml/badge.svg)](https://github.com/equinor/subscript/actions/workflows/subscript.yml)
-[![codecov](https://codecov.io/gh/equinor/subscript/branch/master/graph/badge.svg)](https://codecov.io/gh/equinor/subscript)
+[![codecov](https://codecov.io/gh/equinor/subscript/branch/main/graph/badge.svg)](https://codecov.io/gh/equinor/subscript)
 ![Python Version](https://img.shields.io/badge/python-3.11%20%7C%203.12-blue.svg)
 [![License: GPL v3](https://img.shields.io/github/license/equinor/subscript)](https://www.gnu.org/licenses/gpl-3.0)
 [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)

{subscript-1.14.2 → subscript-1.14.3}/README.md

@@ -1,7 +1,7 @@
 # subscript
 
 [![subscript](https://github.com/equinor/subscript/actions/workflows/subscript.yml/badge.svg)](https://github.com/equinor/subscript/actions/workflows/subscript.yml)
-[![codecov](https://codecov.io/gh/equinor/subscript/branch/master/graph/badge.svg)](https://codecov.io/gh/equinor/subscript)
+[![codecov](https://codecov.io/gh/equinor/subscript/branch/main/graph/badge.svg)](https://codecov.io/gh/equinor/subscript)
 ![Python Version](https://img.shields.io/badge/python-3.11%20%7C%203.12-blue.svg)
 [![License: GPL v3](https://img.shields.io/github/license/equinor/subscript)](https://www.gnu.org/licenses/gpl-3.0)
 [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)

{subscript-1.14.2 → subscript-1.14.3}/ci/testkomodo.sh

@@ -36,6 +36,6 @@ start_tests () {
     # (this script becomes flaky if set -e is active)
     source /prog/res/ecl/script/eclrun.bash
     eval "$SHELLOPTS_BEFORE"
-
+    export PATH=$PATH:/global/bin # For bjobsusers tests
     pytest -n auto --flow-simulator="/project/res/$os_arch/bin/flowdaily" --eclipse-simulator="eclrun"
 }

{subscript-1.14.2 → subscript-1.14.3}/docs/overview.rst

@@ -29,7 +29,6 @@ params2csv                ✅   ✅                 ✅
 presentvalue              ✅   ⛔️                 ⛔️
 prtvol2csv                ✅   ✅                 ⛔️
 restartthinner            ✅   ⛔️                 ⛔️
-ri_wellmod                ✅   ✅                 ⛔️
 rmsecl_volumetrics        ✅   ⛔️                 ⛔️
 sector2fluxnum            ✅   ⛔️                 ⛔️
 summaryplot               ✅   ⛔️                 ⛔️

{subscript-1.14.2 → subscript-1.14.3}/pyproject.toml

@@ -42,14 +42,11 @@ dependencies = [
     "numpy",
     "opm>=2023.04",
     "pandas",
+    "pydantic",
     "pyscal",
     "pyyaml",
-    "rips",
     "scipy",
     "seaborn",
-    "segyio",
-    "shapely",
-    "xlrd",
     "xtgeo",
 ]
 
@@ -67,6 +64,9 @@ tests = [
     "types-Jinja2",
     "types-PyYAML",
     "types-python-dateutil",
+    "pandas-stubs",
+    "types-seaborn",
+    "scipy-stubs",
 ]
 docs = [
     "autoapi",
@@ -106,7 +106,6 @@ params2csv = "subscript.params2csv.params2csv:main"
 presentvalue = "subscript.presentvalue.presentvalue:main"
 prtvol2csv = "subscript.prtvol2csv.prtvol2csv:main"
 restartthinner = "subscript.restartthinner.restartthinner:main"
-ri_wellmod = "subscript.ri_wellmod.ri_wellmod:main"
 rmsecl_volumetrics = "subscript.rmsecl_volumetrics.rmsecl_volumetrics:main"
 sector2fluxnum = "subscript.sector2fluxnum.sector2fluxnum:main"
 summaryplot = "subscript.summaryplot.summaryplot:main"
@@ -136,6 +135,26 @@ script-files = [
 ]
 
 [tool.mypy]
+
+plugins = ["pydantic.mypy"]
+
+strict_equality = true
+extra_checks = true
+
+[[tool.mypy.overrides]]
+module = [
+    "xtgeo.*",
+    "opm.*",
+    "resdata.*",
+    "res2df.*",
+    "ert",
+    "resfo",
+    "grid3d_maps.*",
+    "fmu.tools.*",
+    "pyscal",
+    "cwrap",
+    "grpc"
+]
 ignore_missing_imports = true
 
 [tool.pylint]
@@ -152,11 +171,10 @@ norecursedirs = [
     "build",
     "opm-common",
 ]
-addopts = "-ra --strict-markers --ignore=docs/conf.py --ignore=setup.py --ignore=.eggs"
+addopts = "-ra --strict-markers --ignore=docs/conf.py --ignore=.eggs"
 markers = [
     "integration: Marks a test as an integration test",
     "plot: Marks a test as interactive, plots will flash to the screen",
-    "ri_dev: A test using a dev version of ResInsight, skipped by default"
 ]
 
 [tool.rstcheck]
@@ -179,6 +197,8 @@ select = [
     "SIM",
     "W",
     "PD",
+    "UP",
+    "RUF",
 ]
 ignore = [
     "C901",

{subscript-1.14.2 → subscript-1.14.3}/src/subscript/__init__.py

@@ -15,7 +15,7 @@ def detect_os(release_file: Path = Path("/etc/redhat-release")) -> str:
     default_os_version = "x86_64_RH_7"
 
     if release_file.is_file():
-        with open(release_file, "r", encoding="utf-8") as buffer:
+        with open(release_file, encoding="utf-8") as buffer:
             tokens = buffer.read().split()
             for t in tokens:
                 if "." in t:
@@ -26,7 +26,6 @@ def detect_os(release_file: Path = Path("/etc/redhat-release")) -> str:
 
 
 def getLogger(module_name="subscript"):
-    # pylint: disable=invalid-name
     """Provides a unified logger for subscript scripts.
 
     Scripts in subscript are encouraged to use logging.info() instead of

{subscript-1.14.2 → subscript-1.14.3}/src/subscript/bjobsusers/bjobsusers.py

@@ -2,7 +2,7 @@ import argparse
 import os
 import re
 import subprocess
-from typing import Callable
+from collections.abc import Callable
 
 import pandas as pd
 

{subscript-1.14.2 → subscript-1.14.3}/src/subscript/casegen_upcars/casegen_upcars.py

@@ -59,7 +59,7 @@ def main():
     parser = arg_parse.parse_args()
 
     # YAML format
-    with open(parser.config_file, "r", encoding="utf8") as file_handle:
+    with open(parser.config_file, encoding="utf8") as file_handle:
         config = load(file_handle.read(), Loader=Loader)
 
         general = config["General"]
@@ -518,7 +518,7 @@ def main():
         [vug1_swatinit, vug2_swatinit],
     )
 
-    with open(template_file, "r", encoding="utf8") as file_handle:
+    with open(template_file, encoding="utf8") as file_handle:
         buffer_ = mask_token(file_handle.read(), unmask=False)
         case_template = env.from_string(buffer_)
         ast = env.parse(buffer_)

{subscript-1.14.2 → subscript-1.14.3}/src/subscript/casegen_upcars/model.py

@@ -601,7 +601,6 @@ Initializing model
     def _create_property(
         self, keyword, matrix_property, streak_property, fracture_property, vug_property
     ):
-        # 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"
@@ -630,7 +629,6 @@ Initializing model
         fracture_y_property,
         vug_property,
     ):
-        # pylint: disable=too-many-arguments
         """Distribute property in the cell with anisotropy in fracture property"""
         streak_property = listify(streak_property, len(self._streak_k))
         assert len(streak_property) == len(self._streak_k), (
@@ -704,7 +702,6 @@ Initializing model
     def export_props(
         self, filename, keyword, matrix_prop, streak_prop, frac_props, vug_prop
     ):
-        # pylint: disable=too-many-arguments
         """Print out grid property to Eclipse format file"""
         buffer_ = io.StringIO()
         print(
@@ -805,8 +802,7 @@ Initializing model
         for _i in range(self._xv.shape[0]):
             for _j in range(self._xv.shape[1]):
                 print(
-                    # pylint: disable=consider-using-f-string
-                    "{{x:{0}}} {{y:{0}}} {{z:{0}}} "
+                    "{{x:{0}}} {{y:{0}}} {{z:{0}}} "  # noqa: UP032
                     "{{x:{0}}} {{y:{0}}} {{z:{0}}}".format(
                         self._eclipse_output_float
                     ).format(x=self._xv[_i, _j], y=self._yv[_i, _j], z=0.0),
@@ -873,7 +869,6 @@ Initializing model
         self._vug_idx.fill(0)
 
     def bounded_box(self, i_1, i_2, j_1, j_2, k_1, k_2):
-        # pylint: disable=too-many-arguments
         """Make sure the box is within model domain"""
         return [
             max(i_1, 0),
@@ -1183,13 +1178,13 @@ Initializing model
             > 1 : N/S- or E/W- blocks are larger than center blocks
             < 1 : center blocks are larger than N/S- or E/W- blocks
         """
-        result = [0] * 2
+        result = [0.0] * 2
         for idx, val in enumerate([self._matrix_x_arr, self._matrix_y_arr]):
             if len(val) < 3:
                 result[idx] = 0.0
             else:
-                idx_start = int(round(len(val) / 3.0))
-                idx_end = int(round(len(val) * 2.0 / 3.0))
+                idx_start = round(len(val) / 3.0)
+                idx_end = round(len(val) * 2.0 / 3.0)
                 center_block = sum(val[idx_start:idx_end])
                 result[idx] = 0.5 * (sum(val) - center_block - 1)
         return result[0], result[1]

{subscript-1.14.2 → subscript-1.14.3}/src/subscript/casegen_upcars/udf.py

@@ -22,8 +22,7 @@ def iter_flatten(iterable):
     it_obj = iter(iterable)
     for enum_obj in it_obj:
         if isinstance(enum_obj, (list, tuple)):
-            for flatten_obj in iter_flatten(enum_obj):
-                yield flatten_obj
+            yield from iter_flatten(enum_obj)
         else:
             yield enum_obj
 

{subscript-1.14.2 → subscript-1.14.3}/src/subscript/check_swatinit/check_swatinit.py

@@ -2,12 +2,13 @@
 
 import argparse
 import sys
-from typing import Any, Dict, List, Union
+from typing import Any
 
+import matplotlib.pyplot as plt
 import numpy as np
+import numpy.typing as npt
 import pandas as pd
 import res2df
-from matplotlib import pyplot
 
 import subscript
 from subscript.check_swatinit import plotter
@@ -76,9 +77,9 @@ def main() -> None:
         plotter.wvol_waterfall(qc_vols)
     if args.volplotfile:
         print(f"Dumping volume plot to {args.volplotfile}")
-        pyplot.savefig(args.volplotfile)
+        plt.savefig(args.volplotfile)
     if args.volplot:
-        pyplot.show()
+        plt.show()
 
     if (args.plotfile or args.plot) and args.eqlnum not in qc_frame[
         "EQLNUM"
@@ -88,9 +89,9 @@ def main() -> None:
         plotter.plot_qc_panels(qc_frame[qc_frame["EQLNUM"] == args.eqlnum])
     if args.plotfile:
         print(f"Dumping plot to {args.plotfile}")
-        pyplot.savefig(args.plotfile)
+        plt.savefig(args.plotfile)
     if args.plot:
-        pyplot.show()
+        plt.show()
 
 
 def check_applicability(eclfiles: res2df.ResdataFiles) -> None:
@@ -137,7 +138,7 @@ def reorder_dframe_for_nonnans(dframe: pd.DataFrame) -> pd.DataFrame:
     )
 
 
-def human_report_qc_vols(qc_vols: Dict[str, float]) -> str:
+def human_report_qc_vols(qc_vols: dict[str, float]) -> str:
     """Produce a string with a human report for volumes
 
     Arguments:
@@ -299,7 +300,7 @@ def make_qc_gridframe(eclfiles: res2df.ResdataFiles) -> pd.DataFrame:
     return grid_df
 
 
-def qc_flag(qc_frame: pd.DataFrame) -> pd.DataFrame:
+def qc_flag(qc_frame: pd.DataFrame) -> pd.Series:
     """Compute a series categorizing the QC type of the cell, determining
     how SWATINIT behaved in that cell
 
@@ -414,7 +415,7 @@ def qc_flag(qc_frame: pd.DataFrame) -> pd.DataFrame:
     return qc_col.fillna(__UNKNOWN__)
 
 
-def qc_volumes(qc_frame: pd.DataFrame) -> Dict[str, float]:
+def qc_volumes(qc_frame: pd.DataFrame) -> dict[str, float]:
     """Compute numbers relevant for QC of saturation initialization of a
     reservoir model.
 
@@ -428,17 +429,17 @@ def qc_volumes(qc_frame: pd.DataFrame) -> Dict[str, float]:
         dict: Summed water and hydrocarbon reservoir volumes for different cell
         groupings.
     """
-    watergains: Dict[str, float]
+    watergains: dict[str, float]
     watergains = {}
 
     if "QC_FLAG" in qc_frame:
         # Ensure all categories are represented:
-        for qc_cat in QC_FLAGS:
-            watergains[qc_cat] = 0.0
+        for qc_categ in QC_FLAGS:
+            watergains[qc_categ] = 0.0
 
         # Overwrite dict values with correct figures:
         for qc_cat, qc_subframe in qc_frame.groupby("QC_FLAG"):
-            watergains[qc_cat] = (
+            watergains[str(qc_cat)] = (
                 (qc_subframe["SWAT"] - qc_subframe["SWATINIT"]) * qc_subframe["PORV"]
             ).sum()
 
@@ -458,14 +459,14 @@ def qc_volumes(qc_frame: pd.DataFrame) -> Dict[str, float]:
 
 
 def _evaluate_pc(
-    swats: List[float],
-    scale_vert: List[float],
-    swls: List[float],
-    swus: Union[None, List[float]],
+    swats: npt.NDArray[np.float64],
+    scale_vert: npt.NDArray[np.float64],
+    swls: npt.NDArray[np.float64] | None,
+    swus: npt.NDArray[np.float64] | None,
     satfunc: pd.DataFrame,
     sat_name: str = "SW",
     pc_name: str = "PCOW",
-) -> List[Any]:
+) -> list[Any]:
     """Evaluate pc as a function of saturation on a scaled Pc-curve
 
     Args:
@@ -488,9 +489,9 @@ def _evaluate_pc(
     sw_min = satfunc[sat_name].min()
     sw_max = satfunc[sat_name].max()
     if swls is None:
-        swls = [sw_min] * len(swats)
+        swls = np.full(len(swats), sw_min)
     if swus is None:
-        swus = [sw_max] * len(swats)
+        swus = np.full(len(swats), sw_max)
     for swat, pc_scaling, swl, swu in zip(swats, scale_vert, swls, swus):
         p_cap.append(
             np.interp(
@@ -533,18 +534,21 @@ def compute_pc(qc_frame: pd.DataFrame, satfunc_df: pd.DataFrame) -> pd.Series:
 
     if "SATNUM" not in qc_frame or "PC_SCALING" not in qc_frame:
         return p_cap
-
     for satnum, satnum_frame in qc_frame.groupby("SATNUM"):
         if "SWLPC" in satnum_frame:
-            swls = satnum_frame["SWLPC"].to_numpy()
+            swls = satnum_frame["SWLPC"].to_numpy(dtype=np.float64)
         elif "SWL" in satnum_frame:
-            swls = satnum_frame["SWL"].to_numpy()
+            swls = satnum_frame["SWL"].to_numpy(dtype=np.float64)
         else:
             swls = None
-        swus = satnum_frame["SWU"].to_numpy() if "SWU" in satnum_frame else None
+        swus = (
+            satnum_frame["SWU"].to_numpy(dtype=np.float64)
+            if "SWU" in satnum_frame
+            else None
+        )
         p_cap[satnum_frame.index] = _evaluate_pc(
-            satnum_frame["SWAT"].to_numpy(),
-            satnum_frame["PC_SCALING"].to_numpy(),
+            satnum_frame["SWAT"].to_numpy(dtype=np.float64),
+            satnum_frame["PC_SCALING"].to_numpy(dtype=np.float64),
             swls,
             swus,
             satfunc_df[satfunc_df["SATNUM"] == satnum],
@@ -607,7 +611,7 @@ def merge_equil(grid_df: pd.DataFrame, equil_df: pd.DataFrame) -> pd.DataFrame:
     )
     if "KEYWORD" in equil_df:
         equil_df = equil_df[equil_df["KEYWORD"] == "EQUIL"]
-    equil_df = equil_df[["Z_DATUM", "PRESSURE_DATUM", "EQLNUM", "OIP_INIT"] + contacts]
+    equil_df = equil_df[["Z_DATUM", "PRESSURE_DATUM", "EQLNUM", "OIP_INIT", *contacts]]
     equil_df["EQLNUM"] = equil_df["EQLNUM"].astype(int)
     assert not pd.isna(equil_df).any().any(), (
         f"BUG: NaNs in equil dataframe:\n{equil_df}"

{subscript-1.14.2 → subscript-1.14.3}/src/subscript/check_swatinit/pillarmodel.py

@@ -1,5 +1,4 @@
 import textwrap
-from typing import List, Optional, Union
 
 import numpy as np
 
@@ -11,31 +10,26 @@ class PillarModel:
     The reservoir model is parametrizable in terms of options related
     to SWATINIT analysis"""
 
-    # pylint: disable=too-many-arguments,too-many-instance-attributes,too-many-locals
     def __init__(
         self,
         cells: int = 1,
         apex: int = 1000,
-        phases: Optional[List[str]] = None,
-        perm: Optional[List[float]] = None,
-        poro: Optional[List[float]] = None,
-        swatinit: Optional[List[float]] = None,
-        satnum: Optional[List[int]] = None,  # one value pr. cell
-        swl: Optional[List[float]] = None,  # first saturation in swof, one pr. satnum
-        swlpc: Optional[
-            List[float]
-        ] = None,  # swl scaler for pc only, leaving kr unmodified
-        swu: Optional[List[float]] = None,  # maximum saturation in swof, one pr. satnum
-        maxpc: Optional[List[float]] = None,  # max pc in SWOF
-        minpc: Optional[List[float]] = None,  # pc at sw=1 in SWOF
-        ppcwmax: Optional[List[float]] = None,  # PPCWMAX keyword.
-        eqlnum: Optional[List[int]] = None,  # One value pr cell
-        owc: Optional[
-            List[float]
-        ] = None,  # One value pr. eqlnum region, also used for gwc.
-        goc: Optional[
-            Union[List[float], List[str]]
-        ] = None,  # One value pr. eqlnum region
+        phases: list[str] | None = None,
+        perm: list[float] | None = None,
+        poro: list[float] | None = None,
+        swatinit: list[float] | None = None,
+        satnum: list[int] | None = None,  # one value pr. cell
+        swl: list[float] | None = None,  # first saturation in swof, one pr. satnum
+        swlpc: list[float]
+        | None = None,  # swl scaler for pc only, leaving kr unmodified
+        swu: list[float] | None = None,  # maximum saturation in swof, one pr. satnum
+        maxpc: list[float] | None = None,  # max pc in SWOF
+        minpc: list[float] | None = None,  # pc at sw=1 in SWOF
+        ppcwmax: list[float] | None = None,  # PPCWMAX keyword.
+        eqlnum: list[int] | None = None,  # One value pr cell
+        owc: list[float]
+        | None = None,  # One value pr. eqlnum region, also used for gwc.
+        goc: list[float] | list[str] | None = None,  # One value pr. eqlnum region
         oip_init: int = 0,  # EQUIL item 9. Eclipse default is -5
         filleps: str = "FILLEPS",
         rptrst: str = "ALLPROPS",
@@ -117,7 +111,7 @@ class PillarModel:
         else:
             self.owc = owc
 
-        self.goc: Union[List[str], List[float]]
+        self.goc: list[str] | list[float]
         if goc is None:
             self.goc = ["1*"] * max(self.eqlnum)
         else:
@@ -149,7 +143,7 @@ class PillarModel:
         # we should not output SWATINIT keyword.
         else:
             # Mock a SWATINIT (constant above contact)
-            self.swatinit = [0] * self.cells
+            self.swatinit = [0.0] * self.cells
             for cell_idx, _ in enumerate(self.midpoints):
                 if self.midpoints[cell_idx] <= self.owc[self.eqlnum[cell_idx] - 1]:
                     self.swatinit[cell_idx] = 0.4
@@ -362,7 +356,6 @@ PVDG
         return string
 
     def schedule(self) -> str:
-        # pylint: disable=no-self-use
         """Make a string for the SCHEDULE section"""
         string = "SCHEDULE\n\n"
         string += "TSTEP \n  1 / \n"