Convert to res2df

README.md

@@ -3,7 +3,7 @@ Makes reservoir simulator (Eclipse, [OPM](https://opm-project.org/)) results ava
 
 Uploads files from reservoir simulators to azure assisted by Sumo. This is done in a three step process.
 
-1. Data is extracted in arrow format using [ecl2df](https://github.com/equinor/ecl2df).
+1. Data is extracted in arrow format using [res2df](https://github.com/equinor/res2df).
 2. Corresponding metadata is generated via [fmu-dataio](https://github.com/equinor/fmu-dataio).
 3. Data and metadata is then uploaded to Sumo using [fmu-sumo-uploader](https://github.com/equinor/fmu-sumo-uploader).
 

pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=65.0", "setuptools-scm>=7.0"]
+requires = ["setuptools", "setuptools-scm"]
 build-backend = "setuptools.build_meta"
 
 [tool.setuptools_scm]
@@ -19,7 +19,7 @@ dependencies = [
     "fmu-sumo-uploader @ git+https://github.com/equinor/fmu-sumo-uploader.git@main",
     "fmu-dataio",
     "opm<=2022.4,>=2020.10.2",
-    "ecl2df",
+    "res2df",
     "pandas<2.0",
     "arrow",
 ]

src/fmu/sumo/sim2sumo/_special_treatments.py

@@ -1,10 +1,10 @@
-"""Special treatment of some options used in ecl2df"""
+"""Special treatment of some options used in res2df"""
 from inspect import signature
 import importlib
 import logging
 from pathlib import Path
-import ecl2df
-from ecl2df.common import convert_lyrlist_to_zonemap, parse_lyrfile
+import res2df
+from res2df.common import convert_lyrlist_to_zonemap, parse_lyrfile
 import pandas as pd
 import pyarrow as pa
 
@@ -68,7 +68,7 @@ def find_functions_and_docstring(submod):
     """
     logger = logging.getLogger(__file__ + ".find_func_and_info")
 
-    import_path = "ecl2df." + submod
+    import_path = "res2df." + submod
     func = importlib.import_module(import_path).df
     logger.debug("Assigning %s to %s", func.__name__, submod)
     returns = {
@@ -93,7 +93,7 @@ def _define_submodules():
     """
 
     logger = logging.getLogger(__file__ + "define_submodules")
-    package_path = Path(ecl2df.__file__).parent
+    package_path = Path(res2df.__file__).parent
 
     submodules = {}
     submod_paths = list(package_path.glob("*.py"))
@@ -135,12 +135,12 @@ def convert_options(options):
 
 
 def tidy(frame):
-    """Utility function to tidy up mess from ecl2df for rft
+    """Utility function to tidy up mess from res2df for rft
 
     Args:
         frame (pd.DataFrame): the dataframe fixed with no WELLETC
     """
-    # Ecl2df creates three files for rft data, see unwanted list below
+    # res2df creates three files for rft data, see unwanted list below
     logger = logging.getLogger(__file__ + ".tidy")
     unwanteds = ["seg.csv", "con.csv", "icd.csv"]
     cwd = Path().cwd()

src/fmu/sumo/sim2sumo/sim2sumo.py

@@ -6,7 +6,7 @@
 import logging
 import argparse
 import pandas as pd
-import ecl2df as sim2df
+import res2df
 import pyarrow as pa
 import yaml
 from fmu.dataio import ExportData
@@ -83,7 +83,7 @@ def get_results(
         logger.debug("Exporting with arguments %s", right_kwargs)
         try:
             output = extract_df(
-                sim2df.EclFiles(datafile_path),
+                res2df.ResdataFiles(datafile_path),
                 **convert_options(right_kwargs),
             )
             if submod == "rft":