From a2eeb3be4641254075715d29871438b57498f2af Mon Sep 17 00:00:00 2001 From: Daniel Berge Sollien Date: Fri, 10 Nov 2023 10:49:55 +0100 Subject: [PATCH 01/19] Move to pure pyproject.toml setup --- pyproject.toml | 39 ++++++++++++++++++++++++++++++- setup.cfg | 63 -------------------------------------------------- setup.py | 4 ---- 3 files changed, 38 insertions(+), 68 deletions(-) delete mode 100644 setup.cfg delete mode 100644 setup.py diff --git a/pyproject.toml b/pyproject.toml index e9831a1c..5dcbeba8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,44 @@ requires = ["setuptools", "setuptools-scm", "wheel"] build-backend = "setuptools.build_meta" [tool.setuptools_scm] -write_to = "src/fmu/sumo/sim2sumo/version.py" + +[tool.isort] +profile = "black" [tool.black] line-length = 79 + +[project] +name = "fmu-sumo-sim2sumo" +requires-python = ">=3.8" +dynamic = ["version"] +dependencies = [ + "sumo-wrapper-python>=1.0.3", + "fmu-sumo-uploader", + "fmu-dataio", + "opm<=2022.4,>=2020.10.2", + "ecl2df", + "pandas<2.0", + "arrow", +] + +[project.optional-dependencies] +test = ["pytest"] +dev = ["pytest", "black", "flake8"] + +# [tool.setuptools] +# package-dir = { "" = "src" } +# include-package-data = true +# platforms = ["any"] +# +# [tool.setuptools.packages.find] +# where = ["src"] + +[bdist_wheel] +universal = 1 + +[aliases] +test = "pytest" + +[project.scripts] +sim2sumo = "fmu.sumo.sim2sumo.sim2sumo:main" diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index f9028d36..00000000 --- a/setup.cfg +++ /dev/null @@ -1,63 +0,0 @@ -[metadata] -name = fmu-sumo-sim2sumo -description = a Python library for extracting results from reservoir simulators to sumo -long_description = file: README.rst -long_description_content_type = text/markdown; charset=UTF-8 -url = https://github.com/equinor/fmu-sumo-sim2sumo -author = Equinor -author_email=dbs@equinor.com, -license = apache 2.0 -license_file = LICENCE -classifiers = - Development Status :: 5 - Development/Experimental - Environment :: Console - Environment :: MacOS X - Intended Audience :: Science/Research - License :: OSI Approved :: BSD License - Natural Language :: English - Operating System :: POSIX :: Linux - Operating System :: MacOS :: MacOS X - Programming Language :: Python :: 3.8 - Programming Language :: Python :: 3.9 - # Topic :: Scientific/Engineering :: Bio-Informatics -project_urls = - # Documentation = https://screed.readthedocs.io - Source = https://github.com/equinor/fmu-sumo-sim2sumo - Tracker = https://github.com/equinor/fmu-sumo-sim2sumo/issues - - -[options] -zip_safe = False -package_dir = - = src -packages = find: -platforms = any -include_package_data = True -python_requires = >=3.8 -install_requires = - urllib3 <2.0 - ert - opm - ecl2df - fmu-sumo-uploader - fmu-dataio - pandas - pyarrow - sumo-wrapper-python -setup_requires = - setuptools_scm - -[bdist_wheel] -universal = 1 - -[aliases] -test=pytest - -[options.packages.find] -where = src - -[options.entry_points] -console_scripts = - sim2sumo = fmu.sumo.sim2sumo.sim2sumo:main -ert = - fmu_sumo_sim2sumo_jobs = fmu.sumo.sim2sumo.hook_implementations.jobs \ No newline at end of file diff --git a/setup.py b/setup.py deleted file mode 100644 index 7f1a1763..00000000 --- a/setup.py +++ /dev/null @@ -1,4 +0,0 @@ -from setuptools import setup - -if __name__ == "__main__": - setup() From 52e72de81cdc8d58376a96f4f675f354bbdf5d58 Mon Sep 17 00:00:00 2001 From: Daniel Sollien Date: Thu, 23 Nov 2023 10:01:17 +0100 Subject: [PATCH 02/19] Swap to run tests at five past 10 everyday --- .github/workflows/run_tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_tests.yaml b/.github/workflows/run_tests.yaml index 77325541..bb317210 100644 --- a/.github/workflows/run_tests.yaml +++ b/.github/workflows/run_tests.yaml @@ -4,7 +4,7 @@ on: pull_request: branches: [main] schedule: - - cron: "5 5 * * *" + - cron: "0 5 10 * * ?" jobs: build_pywheels: From cb0bde8708dc02a7ecad42e2c38368110f502f3d Mon Sep 17 00:00:00 2001 From: Daniel Sollien Date: Thu, 23 Nov 2023 10:11:50 +0100 Subject: [PATCH 03/19] Correct syntax --- .github/workflows/run_tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_tests.yaml b/.github/workflows/run_tests.yaml index bb317210..09666a49 100644 --- a/.github/workflows/run_tests.yaml +++ b/.github/workflows/run_tests.yaml @@ -4,7 +4,7 @@ on: pull_request: branches: [main] schedule: - - cron: "0 5 10 * * ?" + - cron: "15 10 * * *" jobs: build_pywheels: From 3c65165b0e0e247405dc0dbba4bbe0076318afb8 Mon Sep 17 00:00:00 2001 From: Daniel Sollien Date: Thu, 23 Nov 2023 10:20:27 +0100 Subject: [PATCH 04/19] Change time of scheduled test --- .github/workflows/run_tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_tests.yaml b/.github/workflows/run_tests.yaml index 09666a49..1f13d7f1 100644 --- a/.github/workflows/run_tests.yaml +++ b/.github/workflows/run_tests.yaml @@ -4,7 +4,7 @@ on: pull_request: branches: [main] schedule: - - cron: "15 10 * * *" + - cron: "25 10 * * *" jobs: build_pywheels: From 8a31d82082ff126c53cd368145df04b65d3a8de5 Mon Sep 17 00:00:00 2001 From: Daniel Sollien Date: Thu, 23 Nov 2023 16:52:52 +0100 Subject: [PATCH 05/19] revert to running nightly test --- .github/workflows/run_tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_tests.yaml b/.github/workflows/run_tests.yaml index 1f13d7f1..77325541 100644 --- a/.github/workflows/run_tests.yaml +++ b/.github/workflows/run_tests.yaml @@ -4,7 +4,7 @@ on: pull_request: branches: [main] schedule: - - cron: "25 10 * * *" + - cron: "5 5 * * *" jobs: build_pywheels: From f19d252c6933c1ee33ca35774414bfa939ee099d Mon Sep 17 00:00:00 2001 From: Daniel Berge Sollien Date: Mon, 27 Nov 2023 09:19:28 +0100 Subject: [PATCH 06/19] Comment out tool setuptools --- pyproject.toml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 5dcbeba8..8d066df0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools", "setuptools-scm", "wheel"] +requires = ["setuptools>=65.0", "setuptools-scm>=7.0"] build-backend = "setuptools.build_meta" [tool.setuptools_scm] @@ -18,7 +18,7 @@ dependencies = [ "sumo-wrapper-python>=1.0.3", "fmu-sumo-uploader", "fmu-dataio", - "opm<=2022.4,>=2020.10.2", + # "opm<=2022.4,>=2020.10.2", "ecl2df", "pandas<2.0", "arrow", @@ -32,7 +32,11 @@ dev = ["pytest", "black", "flake8"] # package-dir = { "" = "src" } # include-package-data = true # platforms = ["any"] +<<<<<<< HEAD # +======= + +>>>>>>> 0cc9c1c (Comment out tool setuptools) # [tool.setuptools.packages.find] # where = ["src"] From 1dc39ac7fbabec0c16cdb37606a679ad79fe585f Mon Sep 17 00:00:00 2001 From: Daniel Sollien Date: Mon, 27 Nov 2023 10:58:55 +0100 Subject: [PATCH 07/19] Add docs --- docs/sim2sumo.rst | 107 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) create mode 100644 docs/sim2sumo.rst diff --git a/docs/sim2sumo.rst b/docs/sim2sumo.rst new file mode 100644 index 00000000..850b8831 --- /dev/null +++ b/docs/sim2sumo.rst @@ -0,0 +1,107 @@ +Sumo Utilities +############# + +The ``fmu.sumo.utilities`` is a python package for integrating other tools into the FMU-SUMO ecosystem. +So far the only utility available is the utility sim2sumo which facilitates upload of results from +reservoir simulators such as eclipse and opm flow as csv or arrow format files. + +sim2sumo +-------- +.. note:: + + **sim2sumo** couples together three packages often used in the FMU sphere. + * **fmu-dataio** the FMU plugin for exporting data out of FMU workflows with rich metadata. + * **ecl2df**, a plugin not strictly tied down to FMU, but often used in this domain + * **fmu.sumo.uploader**, a plugin that uploads files exported to disc with metadata to sumo + +- User has necessary accesses + +.. note:: +Api Reference +------------- + +- `API reference `_ + + +Usage and examples +------------------ + +Config settings +------------------------------ + +sim2sumo is set up such that you provide a config file with the section sim2sumo defined. +The config file needs to be in yaml format. You can add this to the global_variables for the case, +or make your own file. The file needs to contain two parts: +1. The metadata needed for the upload to sumo, that is the three sections model, masterdata, and access +2. A section named sim2sumo. There are several ways to define this section sim2sumo. + +Simplest case +^^^^^^^^^^^^^^ +This is a snippet of the ``global_variables.yml`` containing enough data to upload to sumo with sum2sumo. + In real cases this file will be much longer. When the entire section for sum2sumo is equal to ''sim2sumo: true'' + sim2sumo will extract from all simulation runs in a folder called eclipse/model/ relative to where you are running from, + and at the same time export all datatypes available. See the example file below. + +.. toggle:: + + .. literalinclude:: ../tests/data/reek/realization-0/iter-0/fmuconfig/output/global_variables.yml + :language: yaml + +| +Case where eclipse datafile is explicitly defined +^^^^^^^^^^^^^^ +This is a snippet of the ``global_variables.yml`` file which holds the static metadata described in the +`previous section <./preparations.html>`__. In real cases this file will be much longer. + +.. toggle:: + + .. literalinclude:: ../tests/data/reek/realization-0/iter-0/fmuconfig/output/global_variables_w_eclpath.yml + :language: yaml + +| +Case where eclipse datafile, what types to export, and options to use are explicitly defind +^^^^^^^^^^^^^^ +This is a snippet of the ``global_variables.yml`` file which holds the static metadata described in the +`previous section <./preparations.html>`__. In real cases this file will be much longer. + +.. toggle:: + + .. literalinclude:: ../tests/data/reek/realization-0/iter-0/fmuconfig/output/global_variables_w_eclpath_and_extras.yml + :language: yaml + +| + +Exporting data from eclipse with metadata +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +This code exports summary data results from simulation +.. code-block:: + + from fmu.sumo.utilities.sim2sumo as s2s + + DATAFILE = "eclipse/model/2_REEK-0.DATA" + CONFIG_PATH = "fmuconfig/output/global_variables.yml" + SUBMODULE = "summary" + s2s.export_csv(DATAFILE, SUBMODULE, CONFIG_PATH) + +As a FORWARD_MODEL in ERT +^^^^^^^^^^^^^^^^^^^^^^^^^ + +.. code-block:: + + FORWARD_MODEL SIM2SUMO + + +Example above uploads all surfaces dumped to ``share/results/maps``. You don't need to have more +than one instance of this job, it will generate and upload the data specified in the corresponding +config file. + +.. note:: + + + +.. note:: + + + + + From 39b3598449162a77cefe2e76b3582bc4e1ea1fa8 Mon Sep 17 00:00:00 2001 From: Daniel Sollien Date: Mon, 27 Nov 2023 11:10:38 +0100 Subject: [PATCH 08/19] Remove forgotten remnant of conflict --- pyproject.toml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 8d066df0..f485e542 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,11 +32,7 @@ dev = ["pytest", "black", "flake8"] # package-dir = { "" = "src" } # include-package-data = true # platforms = ["any"] -<<<<<<< HEAD # -======= - ->>>>>>> 0cc9c1c (Comment out tool setuptools) # [tool.setuptools.packages.find] # where = ["src"] From 167742cffc414cea68c2cd5c9c3079a41b145e61 Mon Sep 17 00:00:00 2001 From: Daniel Berge Sollien Date: Mon, 27 Nov 2023 12:36:42 +0100 Subject: [PATCH 09/19] Uncomment opm --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index f485e542..2d723899 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,7 +18,7 @@ dependencies = [ "sumo-wrapper-python>=1.0.3", "fmu-sumo-uploader", "fmu-dataio", - # "opm<=2022.4,>=2020.10.2", + "opm<=2022.4,>=2020.10.2", "ecl2df", "pandas<2.0", "arrow", From e33de24323bc2ceca06b9d35e665effe67cd4b4a Mon Sep 17 00:00:00 2001 From: Daniel Berge Sollien Date: Thu, 21 Dec 2023 13:14:29 +0100 Subject: [PATCH 10/19] Make find explicit, but short --- pyproject.toml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 2d723899..58111123 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,13 +28,8 @@ dependencies = [ test = ["pytest"] dev = ["pytest", "black", "flake8"] -# [tool.setuptools] -# package-dir = { "" = "src" } -# include-package-data = true -# platforms = ["any"] -# -# [tool.setuptools.packages.find] -# where = ["src"] +[tool.setuptools.packages.find] +where = ["src"] [bdist_wheel] universal = 1 From 6eb0895b682142b8d98bc5cab93eecd07a47689e Mon Sep 17 00:00:00 2001 From: Daniel Berge Sollien Date: Thu, 21 Dec 2023 13:15:01 +0100 Subject: [PATCH 11/19] Add nokomodo optional-dependency --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 58111123..4f6fd748 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,6 +27,7 @@ dependencies = [ [project.optional-dependencies] test = ["pytest"] dev = ["pytest", "black", "flake8"] +nokomodo = ["ert"] [tool.setuptools.packages.find] where = ["src"] From 9e548ebe6a8e63b69d72823f643732d3e4f31307 Mon Sep 17 00:00:00 2001 From: Daniel Berge Sollien Date: Thu, 21 Dec 2023 13:18:41 +0100 Subject: [PATCH 12/19] Add entry-points.ert --- pyproject.toml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 4f6fd748..15fb6bf3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,11 +32,12 @@ nokomodo = ["ert"] [tool.setuptools.packages.find] where = ["src"] -[bdist_wheel] -universal = 1 [aliases] test = "pytest" [project.scripts] sim2sumo = "fmu.sumo.sim2sumo.sim2sumo:main" + +[project.entry-points.ert] +fmu_sumo_sim2sumo_jobs = fmu.sumo.sim2sumo.hook_implementations.jobs From c31e0f70b0ac3daaa163f75e5abd19b04696e0aa Mon Sep 17 00:00:00 2001 From: Daniel Berge Sollien Date: Thu, 21 Dec 2023 13:19:29 +0100 Subject: [PATCH 13/19] Remove alias --- pyproject.toml | 3 --- 1 file changed, 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 15fb6bf3..e0891af4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -33,9 +33,6 @@ nokomodo = ["ert"] where = ["src"] -[aliases] -test = "pytest" - [project.scripts] sim2sumo = "fmu.sumo.sim2sumo.sim2sumo:main" From c50126565227ca48ddca5a4f7d5098723621962e Mon Sep 17 00:00:00 2001 From: Daniel Berge Sollien Date: Thu, 21 Dec 2023 13:27:08 +0100 Subject: [PATCH 14/19] Find version in dunder init --- src/fmu/sumo/sim2sumo/__init__.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/fmu/sumo/sim2sumo/__init__.py b/src/fmu/sumo/sim2sumo/__init__.py index 8db66d3d..abcc9afd 100644 --- a/src/fmu/sumo/sim2sumo/__init__.py +++ b/src/fmu/sumo/sim2sumo/__init__.py @@ -1 +1,6 @@ -__path__ = __import__("pkgutil").extend_path(__path__, __name__) +try: + from ._version import version + + __version__ = version +except ImportError: + __version__ = "0.0.0" \ No newline at end of file From ced4b3343577bd38f6a8ca3264c6ca1aa83ee670 Mon Sep 17 00:00:00 2001 From: Daniel Berge Sollien Date: Thu, 21 Dec 2023 13:46:36 +0100 Subject: [PATCH 15/19] Convert from ecl2df/sim2sumo to res2df --- README.md | 2 +- pyproject.toml | 2 +- src/fmu/sumo/sim2sumo/_special_treatments.py | 14 +++++++------- src/fmu/sumo/sim2sumo/sim2sumo.py | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 109fb9f3..ce9ad3e6 100644 --- a/README.md +++ b/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). diff --git a/pyproject.toml b/pyproject.toml index e0891af4..95a38e44 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,7 +19,7 @@ dependencies = [ "fmu-sumo-uploader", "fmu-dataio", "opm<=2022.4,>=2020.10.2", - "ecl2df", + "res2df", "pandas<2.0", "arrow", ] diff --git a/src/fmu/sumo/sim2sumo/_special_treatments.py b/src/fmu/sumo/sim2sumo/_special_treatments.py index aabc3a11..93424ad0 100644 --- a/src/fmu/sumo/sim2sumo/_special_treatments.py +++ b/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() diff --git a/src/fmu/sumo/sim2sumo/sim2sumo.py b/src/fmu/sumo/sim2sumo/sim2sumo.py index c0e4c814..f9d61989 100644 --- a/src/fmu/sumo/sim2sumo/sim2sumo.py +++ b/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.EclFiles(datafile_path), **convert_options(right_kwargs), ) if submod == "rft": From e23599f7aa04e72c071eb5623f8cdfce8a668b94 Mon Sep 17 00:00:00 2001 From: Daniel Berge Sollien Date: Thu, 21 Dec 2023 14:26:25 +0100 Subject: [PATCH 16/19] Checkout pyproject.toml from main --- pyproject.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 95a38e44..508d8bf9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,10 +16,10 @@ requires-python = ">=3.8" dynamic = ["version"] dependencies = [ "sumo-wrapper-python>=1.0.3", - "fmu-sumo-uploader", + "fmu-sumo-uploader @ git+https://github.com/equinor/fmu-sumo-uploader.git@main", "fmu-dataio", "opm<=2022.4,>=2020.10.2", - "res2df", + "ecl2df", "pandas<2.0", "arrow", ] @@ -37,4 +37,4 @@ where = ["src"] sim2sumo = "fmu.sumo.sim2sumo.sim2sumo:main" [project.entry-points.ert] -fmu_sumo_sim2sumo_jobs = fmu.sumo.sim2sumo.hook_implementations.jobs +fmu_sumo_sim2sumo_jobs = "fmu.sumo.sim2sumo.hook_implementations.jobs" From 4ec99383091cc5e7e6f7242f5450af708a9bafdf Mon Sep 17 00:00:00 2001 From: Daniel Berge Sollien Date: Thu, 21 Dec 2023 15:45:44 +0100 Subject: [PATCH 17/19] Remove pinning versions for setuptools --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 508d8bf9..b1b07c41 100644 --- a/pyproject.toml +++ b/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] From f126f4d36d1ee78d5b9be318f04ea3f11c932f5d Mon Sep 17 00:00:00 2001 From: Daniel Berge Sollien Date: Thu, 21 Dec 2023 15:46:54 +0100 Subject: [PATCH 18/19] Convert from EclFiles to ResdataFiles --- src/fmu/sumo/sim2sumo/sim2sumo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fmu/sumo/sim2sumo/sim2sumo.py b/src/fmu/sumo/sim2sumo/sim2sumo.py index f9d61989..07ddc5f7 100644 --- a/src/fmu/sumo/sim2sumo/sim2sumo.py +++ b/src/fmu/sumo/sim2sumo/sim2sumo.py @@ -83,7 +83,7 @@ def get_results( logger.debug("Exporting with arguments %s", right_kwargs) try: output = extract_df( - res2df.EclFiles(datafile_path), + res2df.ResdataFiles(datafile_path), **convert_options(right_kwargs), ) if submod == "rft": From 181098cb3f46b44f89fb4aedc4cc0a03816d3a2a Mon Sep 17 00:00:00 2001 From: Daniel Berge Sollien Date: Thu, 21 Dec 2023 15:56:52 +0100 Subject: [PATCH 19/19] Move dependency to res2df --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index b1b07c41..b4e0973e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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", ]