diff --git a/setup.py b/setup.py index 4115b0317..f5044f4c5 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ "cwrap>=1.6", "ecl>=2.9", "ecl2df>=0.8.1", - "ert>=2.17", + "ert~=2.21b0", "fmu-ensemble>=1.2", "hyperopt>=0.2.5", "jinja2>=2.10", @@ -23,6 +23,7 @@ "pyscal>=0.7.4", "pyvista>=0.23", "pyyaml>=5.2", + "semeio~=1.0b0", "scikit-learn>=0.22", "scipy>=1.4", "webviz-config>=0.0.42", diff --git a/src/flownet/ert/_create_ert_setup.py b/src/flownet/ert/_create_ert_setup.py index 6c4a971ea..b5d241ccf 100644 --- a/src/flownet/ert/_create_ert_setup.py +++ b/src/flownet/ert/_create_ert_setup.py @@ -291,6 +291,16 @@ def create_ert_setup( # pylint: disable=too-many-arguments with open(os.path.join(output_folder, "pipfreeze.output"), "w") as fh: subprocess.call(["pip", "freeze"], stdout=fh) + shutil.copyfile( + _MODULE_FOLDER / ".." / "static" / "MISFIT_PREPROCESSOR_WORKFLOW", + output_folder / "MISFIT_PREPROCESSOR_WORKFLOW", + ) + + shutil.copyfile( + _MODULE_FOLDER / ".." / "static" / "misfit_preprocessor_config.yml", + output_folder / "misfit_preprocessor_config.yml", + ) + for section in ["RUNSPEC", "PROPS", "SOLUTION", "SCHEDULE"]: static_source_path = pathlib.Path(static_path) / f"{section}.inc" if static_source_path.is_file(): diff --git a/src/flownet/ert/_run_subprocess.py b/src/flownet/ert/_run_subprocess.py index 825055955..60624f0a4 100644 --- a/src/flownet/ert/_run_subprocess.py +++ b/src/flownet/ert/_run_subprocess.py @@ -5,7 +5,7 @@ import psutil -TIMEOUT = 900 # Kill ERT if no new output to stdout for 15 minutes. +TIMEOUT = 3600 # Kill ERT if no new output to stdout for 15 minutes. def run_ert_subprocess(command: str, cwd: pathlib.Path, runpath: str) -> None: diff --git a/src/flownet/static/MISFIT_PREPROCESSOR_WORKFLOW b/src/flownet/static/MISFIT_PREPROCESSOR_WORKFLOW new file mode 100644 index 000000000..fdc9dc5c8 --- /dev/null +++ b/src/flownet/static/MISFIT_PREPROCESSOR_WORKFLOW @@ -0,0 +1 @@ +MISFIT_PREPROCESSOR misfit_preprocessor_config.yml diff --git a/src/flownet/static/misfit_preprocessor_config.yml b/src/flownet/static/misfit_preprocessor_config.yml new file mode 100644 index 000000000..1e76d6775 --- /dev/null +++ b/src/flownet/static/misfit_preprocessor_config.yml @@ -0,0 +1,4 @@ +workflow: + type: auto_scale + clustering: + type: limited_kmeans diff --git a/src/flownet/templates/ahm_config.ert.jinja2 b/src/flownet/templates/ahm_config.ert.jinja2 index 36103c368..a1d923c5c 100644 --- a/src/flownet/templates/ahm_config.ert.jinja2 +++ b/src/flownet/templates/ahm_config.ert.jinja2 @@ -25,6 +25,8 @@ LOAD_WORKFLOW SAVE_ITERATION_ANALYTICS_WORKFLOW_{{ loop.index - 1 }} HOOK_WORKFLOW SAVE_ITERATION_ANALYTICS_WORKFLOW_{{ loop.index - 1 }} POST_SIMULATION {% endfor %} {%- endif %} +LOAD_WORKFLOW MISFIT_PREPROCESSOR_WORKFLOW +HOOK_WORKFLOW MISFIT_PREPROCESSOR_WORKFLOW PRE_FIRST_UPDATE GEN_KW FLOWNET_PARAMETERS ./EMPTYFILE ./EMPTYFILE ./parameters.ertparam