Merge branch 'main' into change-name-and-tagname-for-grids

src/fmu/sumo/sim2sumo/_special_treatments.py

@@ -109,34 +109,11 @@ def _define_submodules():
     return tuple(submodules.keys()), submodules
 
 
-def find_md_log(submod, options):
-    """Search options for md_log_file
-
-    Args:
-        submod (str): submodule
-        options (dict): the dictionary to check
-
-    Returns:
-        str|None: whatever contained in md_log_file
-    """
-    if submod != "rft":
-        return None
-    # Special treatment of argument md_log_file
-    md_log_file = options.get("md_log_file", None)
-    try:
-        del options["md_log_file"]
-    except KeyError:
-        pass  # No md log provided
-
-    return md_log_file
-
-
-def complete_rft(frame, md_log_file):
+def tidy(frame):
     """Utility function to tidy up mess from res2df for rft
 
     Args:
         frame (pd.DataFrame): the dataframe fixed with no WELLETC
-        md_log_file (str): file with md log file
     """
     # res2df creates three files for rft data, see unwanted list below
     logger = logging.getLogger(__file__ + ".tidy")
@@ -153,9 +130,6 @@ def complete_rft(frame, md_log_file):
     if "WELLETC" in frame.columns:
         frame.drop(["WELLETC"], axis=1, inplace=True)
 
-    if md_log_file is not None:
-        frame = add_md_to_rft(frame, md_log_file)
-
     return frame
 
 
@@ -187,35 +161,3 @@ def vfp_to_arrow_dict(datafile, options):
             resdatafiles.get_deck(), keyword=keyword, vfpnumbers_str=vfpnumbers
         )
     return vfp_dict
-
-
-def add_md_to_rft(rft_table, md_file_path):
-    """Merge md data with rft table
-
-    Args:
-        rft_table (pd.DataFrame): the rft dataframe
-        md_file_path (str): path to file with md data
-
-    Raises:
-        FileNotFoundError: if md_file_path does not point to existing file
-
-    Returns:
-        pd.Dataframe: the merged results
-    """
-    try:
-        md_table = pd.read_csv(md_file_path)
-    except FileNotFoundError as fnfe:
-        raise FileNotFoundError(
-            f"There is no md file called {md_file_path}"
-        ) from fnfe
-
-    xtgeo_index_names = ["I_INDEX", "J_INDEX", "K_INDEX"]
-    rft_index_names = ["CONIPOS", "CONJPOS", "CONKPOS"]
-    # for grid indeces xtgeo starts from 0, res2df from 1
-    md_table[xtgeo_index_names] += 1
-    md_table[xtgeo_index_names] = md_table[xtgeo_index_names].astype(int)
-    xtgeo_to_rft_names = dict(zip(xtgeo_index_names, rft_index_names))
-    md_table.rename(xtgeo_to_rft_names, axis=1, inplace=True)
-    rft_table = pd.merge(rft_table, md_table, on=rft_index_names, how="left")
-
-    return rft_table

src/fmu/sumo/sim2sumo/common.py

@@ -71,7 +71,7 @@ def filter_options(submod, kwargs):
     filtered = {
         key: value
         for key, value in kwargs.items()
-        if (key in submod_options) or key in ["arrow", "md_log_file"]
+        if (key in submod_options) or key == "arrow"
     }
     filtered["arrow"] = kwargs.get(
         "arrow", True

src/fmu/sumo/sim2sumo/grid3d.py

@@ -132,7 +132,6 @@ def upload_init(init_path, xtgeoegrid, config, dispatcher):
     init_props = list(
         eclrun.find_gridprop_from_init_file(init_path, "all", xtgeoegrid)
     )
-    count = 0
     for init_prop in init_props:
         if init_prop["name"] in unwanted:
             logger.warning("%s will not be exported", init_prop["name"])
@@ -152,9 +151,6 @@ def upload_init(init_path, xtgeoegrid, config, dispatcher):
             )
             continue
         dispatcher.add(sumo_file)
-        count += 1
-    logger.info("%s properties set for upload", count)
-    return count
 
 
 def upload_restart(restart_path, xtgeoegrid, time_steps, config, dispatcher):
@@ -169,7 +165,6 @@ def upload_restart(restart_path, xtgeoegrid, time_steps, config, dispatcher):
         int: number of objects to export
     """
     logger = logging.getLogger(__name__ + ".upload_restart")
-    count = 0
     prop_names = ("SWAT", "SGAS", "SOIL", "PRESSURE", "SFIPOIL", "SFIPGAS")
     for prop_name in prop_names:
         for time_step in time_steps:
@@ -194,10 +189,6 @@ def upload_restart(restart_path, xtgeoegrid, time_steps, config, dispatcher):
                     )
                     continue
                 dispatcher.add(sumo_file)
-                count += 1
-    logger.info("%s properties uploaded", count)
-
-    return count
 
 
 def upload_simulation_runs(datafiles, config, dispatcher):
@@ -220,7 +211,6 @@ def upload_simulation_run(datafile, config, dispatcher):
     Args:
         datafile (str): path to datafile
     """
-    logger = logging.getLogger(__name__ + ".upload_simulation_run")
     datafile_path = Path(datafile).resolve()
     init_path = str(datafile_path.with_suffix(".INIT"))
     restart_path = str(datafile_path.with_suffix(".UNRST"))
@@ -233,11 +223,8 @@ def upload_simulation_run(datafile, config, dispatcher):
     dispatcher.add(sumo_file)
     time_steps = get_timesteps(restart_path, egrid)
 
-    count = upload_init(init_path, xtgeoegrid, config, dispatcher)
-    count += upload_restart(
-        restart_path, xtgeoegrid, time_steps, config, dispatcher
-    )
-    logger.info("Exported %s properties", count)
+    upload_init(init_path, xtgeoegrid, config, dispatcher)
+    upload_restart(restart_path, xtgeoegrid, time_steps, config, dispatcher)
 
 
 def get_timesteps(restart_path, egrid):

src/fmu/sumo/sim2sumo/tables.py

@@ -17,10 +17,9 @@
 
 from ._special_treatments import (
     SUBMOD_DICT,
-    complete_rft,
+    tidy,
     convert_to_arrow,
     vfp_to_arrow_dict,
-    find_md_log,
 )
 
 from pathlib import Path
@@ -148,9 +147,6 @@ def get_table(
     except KeyError:
         pass  # No arrow key to delete
     output = None
-    # TODO: see if there is a cleaner way with rft, see functions
-    # find_md_log, and complete_rft, but needs really to be fixed in res2df
-    md_log_file = find_md_log(submod, kwargs)
     try:
         logger.info(
             "Extracting data from %s with func %s for %s",
@@ -163,7 +159,7 @@ def get_table(
             **kwargs,
         )
         if submod == "rft":
-            output = complete_rft(output, md_log_file)
+            output = tidy(output)
         if arrow:
             try:
                 convert_func = SUBMOD_DICT[submod]["arrow_convertor"]

tests/conftest.py

@@ -65,11 +65,6 @@ def _fix_rft_reek():
     )
 
 
-@pytest.fixture(scope="session", name="drogonrft")
-def _fix_rft_drogon():
-    return pd.read_csv(Path(__file__).parent / "data/drogon/rft.csv")
-
-
 @pytest.fixture(scope="session", name="config")
 def _fix_config():
     return yaml_load(CONFIG_PATH)