equinor · andreas-el · Jan 3, 2023 · Dec 12, 2022 · Jan 3, 2023
diff --git a/docs/getting_started/configuration/poly_new/guide.rst b/docs/getting_started/configuration/poly_new/guide.rst
@@ -116,7 +116,7 @@ We need to have each iteration run in a different folder, so that they won't
 step on each others toes. Add to the config (``poly.ert``) file the following
 line::
 
-    RUNPATH poly_out/realization-%d/iter-%d
+    RUNPATH poly_out/realization-<IENS>/iter-<ITER>
 
 The second ``%d`` in the runpath is replaced by the iteration number of the
 algorithm. This is needed since the algorithm may run several iterations during

diff --git a/docs/getting_started/configuration/poly_new/with_observations/poly.ert b/docs/getting_started/configuration/poly_new/with_observations/poly.ert
@@ -4,7 +4,7 @@ NUM_REALIZATIONS 100
 QUEUE_SYSTEM LOCAL
 QUEUE_OPTION LOCAL MAX_RUNNING 50
 
-RUNPATH poly_out/realization-%d/iter_%d
+RUNPATH poly_out/realization-<IENS>/iter-<ITER>
 
 GEN_KW COEFFS coeff.tmpl coeffs.json coeff_priors
 

diff --git a/docs/getting_started/configuration/poly_new/with_observations/poly_final.ert b/docs/getting_started/configuration/poly_new/with_observations/poly_final.ert
@@ -4,7 +4,7 @@ NUM_REALIZATIONS 100
 QUEUE_SYSTEM LOCAL
 QUEUE_OPTION LOCAL MAX_RUNNING 50
 
-RUNPATH poly_out/realization-%d/iter-%d
+RUNPATH poly_out/realization-<IENS>/iter-<ITER>
 
 GEN_KW COEFFS coeff.tmpl coeffs.json coeff_priors
 

diff --git a/docs/getting_started/configuration/poly_new/with_parameters/poly.ert b/docs/getting_started/configuration/poly_new/with_parameters/poly.ert
@@ -4,7 +4,7 @@ NUM_REALIZATIONS 100
 QUEUE_SYSTEM LOCAL
 QUEUE_OPTION LOCAL MAX_RUNNING 50
 
-RUNPATH poly_out/realization-%d/iter-%d
+RUNPATH poly_out/realization-<IENS>/iter-<ITER>
 
 GEN_KW COEFFS coeff.tmpl coeffs.json coeff_priors
 

diff --git a/docs/getting_started/configuration/poly_new/with_results/poly.ert b/docs/getting_started/configuration/poly_new/with_results/poly.ert
@@ -4,7 +4,7 @@ NUM_REALIZATIONS 100
 QUEUE_SYSTEM LOCAL
 QUEUE_OPTION LOCAL MAX_RUNNING 50
 
-RUNPATH poly_out/realization-%d/iter-%d
+RUNPATH poly_out/realization-<IENS>/iter-<ITER>
 
 GEN_KW COEFFS coeff.tmpl coeffs.json coeff_priors
 

diff --git a/docs/getting_started/configuration/poly_new/with_simple_script/poly.ert b/docs/getting_started/configuration/poly_new/with_simple_script/poly.ert
@@ -3,7 +3,7 @@ NUM_REALIZATIONS 5
 
 QUEUE_SYSTEM LOCAL
 
-RUNPATH poly_out/realization-%d/iter-%d
+RUNPATH poly_out/realization-<IENS>/iter-<ITER>
 
 INSTALL_JOB poly_eval POLY_EVAL 
 SIMULATION_JOB poly_eval
diff --git a/docs/reference/configuration/keywords.rst b/docs/reference/configuration/keywords.rst
@@ -66,7 +66,7 @@ Keyword name                                                            Required
 :ref:`QUEUE_SYSTEM <queue_system>`                                      NO                                      LOCAL_DRIVER                                System used for running simulation jobs
 :ref:`REFCASE <refcase>`                                                NO                                                                      Reference case used for observations and plotting (See HISTORY_SOURCE and SUMMARY)
 :ref:`RESULT_PATH  <result_path>`                                       NO                                      results/step_%d                 Define where ERT should store results
-:ref:`RUNPATH <runpath>`                                                NO                                      simulations/realization%d       Directory to run simulations
+:ref:`RUNPATH <runpath>`                                                NO                                      realization-<IENS>/iter-<ITER>  Directory to run simulations; simulations/realization-<IENS>/iter-<ITER>
 :ref:`RUNPATH_FILE <runpath_file>`                                      NO                                      .ert_runpath_list               Name of file with path for all forward models that ERT has run. To be used by user defined scripts to find the realizations
 :ref:`RUN_TEMPLATE <run_template>`                                      NO                                                                      Install arbitrary files in the runpath directory
 :ref:`SCHEDULE_PREDICTION_FILE <schedule_prediction_file>`              NO                                                                      Deprecated: Schedule prediction file
@@ -461,25 +461,25 @@ possible to do with ERT.
 .. topic:: RUNPATH
 
         The RUNPATH keyword should give the name of the folders where the ECLIPSE
-        simulations are executed. It should contain at least one %d specifier, which
-        will be replaced by the realization number when ERT creates the folders.
-        Optionally, it can contain one more %d specifier, which will be replaced by
-        the iteration number.
+        simulations are executed. It should contain <IENS> and <ITER>, which
+        will be replaced by the realization number and iteration number when ERT creates the folders.
+        By default, RUNPATH is set to "simulations/realization-<IENS>/iter-<ITER>".
 
-        By default, RUNPATH is set to "simulations/realization-%d".
+        Deprecated syntax still allow use of two %d specifers. Use of less than two %d is prohibited.
+        The behaviour is identical to the default substitution.
 
-        *Example A:*
+        *Example:*
 
         ::
 
-                -- Giving a RUNPATH with just one %d specifer.
-                RUNPATH /mnt/my_scratch_disk/realization-%d
+                -- Using <IENS> & <ITER> specifiers for RUNPATH.
+                RUNPATH /mnt/my_scratch_disk/realization-<IENS>/iter-<ITER>
 
-        *Example B:*
+        *Example deprecated syntax:*
 
         ::
 
-                -- Giving a RUNPATH with two %d specifers.
+                -- Using RUNPATH with two %d specifers.
                 RUNPATH /mnt/my_scratch_disk/realization-%d/iteration-%d
 
         The RUNPATH keyword is optional.

diff --git a/docs/reference/queue/local_queue.ert b/docs/reference/queue/local_queue.ert
@@ -3,7 +3,7 @@ JOBNAME queue_test_%d
 QUEUE_SYSTEM LOCAL
 QUEUE_OPTION LOCAL MAX_RUNNING 50
 
-RUNPATH local_testing/realization-%d/iter-%d
+RUNPATH local_testing/realization-<IENS>/iter-<ITER>
 
 NUM_REALIZATIONS 100
 MIN_REALIZATIONS 1

diff --git a/docs/reference/queue/lsf_queue.ert b/docs/reference/queue/lsf_queue.ert
@@ -8,7 +8,7 @@ QUEUE_OPTION LSF LSF_SERVER be-grid01 -- Change this to a server you have access
 QUEUE_OPTION LSF LSF_QUEUE mr
 QUEUE_OPTION LSF PROJECT_CODE user:$USER
 
-RUNPATH lsf_testing/realization-%d/iter-%d
+RUNPATH lsf_testing/realization-<IENS>/iter-<ITER>
 
 NUM_REALIZATIONS 1
 MIN_REALIZATIONS 1

diff --git a/src/ert/_c_wrappers/enkf/model_config.py b/src/ert/_c_wrappers/enkf/model_config.py
@@ -12,7 +12,7 @@
 
 class ModelConfig:
     DEFAULT_HISTORY_SOURCE = HistorySourceEnum.REFCASE_HISTORY
-    DEFAULT_RUNPATH = "simulations/realization-%d/iter-%d"
+    DEFAULT_RUNPATH = "simulations/realization-<IENS>/iter-<ITER>"
     DEFAULT_GEN_KW_EXPORT_NAME = "parameters"
     DEFAULT_ENSPATH = "storage"
 
@@ -40,11 +40,21 @@ def __init__(
             else self.DEFAULT_HISTORY_SOURCE
         )
 
-        self.runpath_format_string = (
-            runpath_format_string
-            if runpath_format_string is not None
-            else self.DEFAULT_RUNPATH
-        )
+        if runpath_format_string is None:
+            self.runpath_format_string = self.DEFAULT_RUNPATH
+        elif "%d" in runpath_format_string:
+            self.runpath_format_string = runpath_format_string
+            logger.warning(
+                "RUNPATH keyword should use syntax "
+                f"`{self.DEFAULT_RUNPATH}` "
+                "instead of deprecated syntax "
+                f"`{runpath_format_string}`"
+            )
+        elif not any(x in runpath_format_string for x in ["<ITER>, <IENS>"]):
+            self.runpath_format_string = runpath_format_string
+            logger.error(
+                "RUNPATH keyword should use syntax " f"`{self.DEFAULT_RUNPATH}`."
+            )
 
         self.jobname_format_string = jobname_format_string
         self.gen_kw_export_name = (

diff --git a/src/ert/gui/tools/load_results/load_results_panel.py b/src/ert/gui/tools/load_results/load_results_panel.py
@@ -1,5 +1,3 @@
-import os
-
 from PyQt5.QtWidgets import QMessageBox
 from qtpy.QtWidgets import QComboBox, QFormLayout, QTextEdit, QWidget
 
@@ -50,7 +48,7 @@ def __init__(self, facade: LibresFacade):
         self._active_realizations_field.setValidator(RangeStringArgument())
         layout.addRow("Realizations to load:", self._active_realizations_field)
 
-        self._iterations_model = ValueModel(self.iteration_count)
+        self._iterations_model = ValueModel(self.facade.get_number_of_iterations())
         self._iterations_field = StringBox(
             self._iterations_model, "load_results_manually/iterations"
         )
@@ -59,23 +57,6 @@ def __init__(self, facade: LibresFacade):
 
         self.setLayout(layout)
 
-    @property
-    def iteration_count(self) -> int:
-        try:
-            self.facade.run_path % (0, 0)
-        except TypeError:
-            return 0
-
-        iteration = 0
-        valid_directory = True
-        while valid_directory:
-            formatted = self.facade.run_path % (0, iteration + 1)
-            valid_directory = os.path.exists(formatted)
-            if valid_directory:
-                iteration += 1
-
-        return iteration
-
     def readCurrentRunPath(self):
         current_case = self.facade.get_current_case_name()
         run_path = self.facade.run_path

diff --git a/src/ert/gui/tools/load_results/load_results_tool.py b/src/ert/gui/tools/load_results/load_results_tool.py
@@ -14,7 +14,6 @@ def __init__(self, facade):
         )
         self.__import_widget = None
         self.__dialog = None
-        self.setEnabled(self.is_valid_run_path())
 
     def trigger(self):
         if self.__import_widget is None:
@@ -34,16 +33,4 @@ def load(self, _):
         self.__dialog.accept()
 
     def is_valid_run_path(self) -> bool:
-        """A run path is considered valid if we can
-        insert realisation and iteration numbers"""
-        try:
-            # pylint: disable=pointless-statement
-            self.facade.run_path % (0, 0)
-            return True
-        except TypeError:
-            try:
-                # pylint: disable=pointless-statement
-                self.facade.run_path % 0
-                return True
-            except TypeError:
-                return False
+        return self.facade.is_valid_runpath()
diff --git a/src/ert/libres_facade.py b/src/ert/libres_facade.py
@@ -159,6 +159,14 @@ def get_number_of_iterations(self) -> int:
     def have_observations(self) -> bool:
         return self._enkf_main.have_observations()
 
+    def is_valid_runpath(self) -> bool:
+        iter_0_paths = set(self.get_run_paths([True] * self.get_ensemble_size(), 0))
+        iter_1_paths = set(self.get_run_paths([True] * self.get_ensemble_size(), 1))
+        return (
+            len(iter_0_paths) == self.get_ensemble_size()
+            and iter_0_paths != iter_1_paths
+        )
+
     @property
     def run_path(self) -> str:
         return self._enkf_main.getModelConfig().runpath_format_string

diff --git a/test-data/batch_sim/batch_sim.ert b/test-data/batch_sim/batch_sim.ert
@@ -5,7 +5,7 @@ NUM_REALIZATIONS 25
 
 DEFINE <STORAGE> storage/<CONFIG_FILE_BASE>
 
-RUNPATH <STORAGE>/runpath/<CASE_NAME>/realization-%d/iter-%d
+RUNPATH <STORAGE>/runpath/<CASE_NAME>/realization-<IENS>/iter-<ITER>
 ENSPATH <STORAGE>/ensemble
 JOBNAME SNAKE_OIL_FIELD
 

diff --git a/test-data/batch_sim/batch_sim_sleep_and_fail.ert b/test-data/batch_sim/batch_sim_sleep_and_fail.ert
@@ -3,7 +3,7 @@ QUEUE_OPTION LOCAL MAX_RUNNING 10
 
 NUM_REALIZATIONS 10
 
-RUNPATH runpath/realization-%d/iter-%d
+RUNPATH runpath/realization-<IENS>/iter-<ITER>
 JOBNAME SNAKE_OIL_FIELD
 
 INSTALL_JOB SQUARE_PARAMS jobs/SQUARE_PARAMS

diff --git a/test-data/batch_sim/sleepy_time.ert b/test-data/batch_sim/sleepy_time.ert
@@ -3,7 +3,7 @@ QUEUE_OPTION LOCAL MAX_RUNNING 10
 
 NUM_REALIZATIONS 10
 
-RUNPATH runpath/realization-%d-<GEO_ID>/iter-%d
+RUNPATH runpath/realization-<IENS>-<GEO_ID>/iter-<ITER>
 JOBNAME OLE_LUKKOYE
 
 INSTALL_JOB SLEEP jobs/SLEEP

diff --git a/test-data/configuration_tests/ecl_config.ert b/test-data/configuration_tests/ecl_config.ert
@@ -4,7 +4,7 @@ REFCASE                         input/refcase/SNAKE_OIL_FIELD
 GRID                            input/CASE.EGRID
 SCHEDULE_PREDICTION_FILE        input/schedule.sch
 
-RUNPATH /tmp/simulations/run%d
+RUNPATH /tmp/simulations/realization-<IENS>/iter-<ITER>
 NUM_REALIZATIONS 10
 MIN_REALIZATIONS 10
 

diff --git a/test-data/configuration_tests/ensemble_config.ert b/test-data/configuration_tests/ensemble_config.ert
@@ -1,5 +1,5 @@
 JOBNAME  Job%d
-RUNPATH /tmp/simulations/run%d
+RUNPATH /tmp/simulations/realization-<IENS>/iter-<ITER>
 NUM_REALIZATIONS 10
 MIN_REALIZATIONS 10
 

diff --git a/test-data/configuration_tests/model_config.ert b/test-data/configuration_tests/model_config.ert
@@ -10,7 +10,7 @@ INSTALL_JOB SNAKE_OIL_DIFF input/jobs/SNAKE_OIL_DIFF
 -- ModelConfig specific input
 
 JOBNAME model_config_test
-RUNPATH /tmp/simulations/run%d
+RUNPATH /tmp/simulations/realization-<IENS>/iter-<ITER>
 NUM_REALIZATIONS 10
 ENSPATH  Ensemble
 

diff --git a/test-data/configuration_tests/sched_file_as_history_source.ert b/test-data/configuration_tests/sched_file_as_history_source.ert
@@ -12,7 +12,7 @@ INSTALL_JOB SNAKE_OIL_DIFF input/jobs/SNAKE_OIL_DIFF
 -- ModelConfig specific input
 
 JOBNAME model_config_test
-RUNPATH /tmp/simulations/run%d
+RUNPATH /tmp/simulations/realization-<IENS>/iter-<ITER>
 NUM_REALIZATIONS 10
 ENSPATH  Ensemble
 

diff --git a/test-data/poly_example/poly-ies.ert b/test-data/poly_example/poly-ies.ert
@@ -3,7 +3,7 @@ JOBNAME poly_%d
 QUEUE_SYSTEM LOCAL
 QUEUE_OPTION LOCAL MAX_RUNNING 50
 
-RUNPATH poly_out/realization-%d/iter-%d
+RUNPATH poly_out/realization-<IENS>/iter-<ITER>
 
 OBS_CONFIG observations
 TIME_MAP time_map

diff --git a/test-data/poly_example/poly.ert b/test-data/poly_example/poly.ert
@@ -3,7 +3,7 @@ JOBNAME poly_%d
 QUEUE_SYSTEM LOCAL
 QUEUE_OPTION LOCAL MAX_RUNNING 50
 
-RUNPATH poly_out/realization-%d/iter-%d
+RUNPATH poly_out/realization-<IENS>/iter-<ITER>
 
 OBS_CONFIG observations
 TIME_MAP time_map

diff --git a/test-data/poly_template/poly.ert.j2 b/test-data/poly_template/poly.ert.j2
@@ -2,7 +2,7 @@
 QUEUE_SYSTEM LOCAL
 QUEUE_OPTION LOCAL MAX_RUNNING 50
 
-RUNPATH poly_out/realization-%d/iter-%d
+RUNPATH poly_out/realization-<IENS>/iter-<ITER>
 
 OBS_CONFIG observations
 

diff --git a/test-data/simple_config/analysis_config b/test-data/simple_config/analysis_config
@@ -1,5 +1,5 @@
 JOBNAME  Job%d
-RUNPATH /tmp/simulations/run%d
+RUNPATH /tmp/simulations/realization-<IENS>/iter-<ITER>
 NUM_REALIZATIONS 10
 MIN_REALIZATIONS 10
 JOB_SCRIPT script.sh

diff --git a/test-data/simple_config/minimum_config b/test-data/simple_config/minimum_config
@@ -1,5 +1,5 @@
 JOBNAME  Job%d
-RUNPATH /tmp/simulations/run%d
+RUNPATH /tmp/simulations/realization-<IENS>/iter-<ITER>
 NUM_REALIZATIONS 10
 MIN_REALIZATIONS 10
 JOB_SCRIPT script.sh

diff --git a/test-data/simple_config/slurm_config b/test-data/simple_config/slurm_config
@@ -1,5 +1,5 @@
 JOBNAME  Job%d
-RUNPATH /tmp/simulations/run%d
+RUNPATH /tmp/simulations/realization-<IENS>/iter-<ITER>
 NUM_REALIZATIONS 10
 MIN_REALIZATIONS 10
 JOB_SCRIPT script.sh

diff --git a/test-data/snake_oil/snake_oil.ert b/test-data/snake_oil/snake_oil.ert
@@ -8,7 +8,7 @@ ANALYSIS_SET_VAR STD_ENKF IES_INVERSION 1
 DEFINE <STORAGE> storage/<CONFIG_FILE_BASE>
 RANDOM_SEED 3593114179000630026631423308983283277868
 
-RUNPATH <STORAGE>/runpath/realization-%d/iter-%d
+RUNPATH <STORAGE>/runpath/realization-<IENS>/iter-<ITER>
 ENSPATH <STORAGE>/ensemble
 ECLBASE SNAKE_OIL_FIELD
 SUMMARY *

diff --git a/test-data/snake_oil_field/snake_oil.ert b/test-data/snake_oil_field/snake_oil.ert
@@ -7,7 +7,7 @@ GRID grid/CASE.EGRID
 DEFINE <STORAGE> storage/<CONFIG_FILE_BASE>
 RANDOM_SEED 3593114179000630026631423308983283277868
 
-RUNPATH <STORAGE>/runpath/realization-%d/iter-%d
+RUNPATH <STORAGE>/runpath/realization-<IENS>/iter-<ITER>
 ENSPATH <STORAGE>/ensemble
 ECLBASE SNAKE_OIL_FIELD
 SUMMARY *

diff --git a/test-data/snake_oil_field/snake_oil_field.ert b/test-data/snake_oil_field/snake_oil_field.ert
@@ -6,7 +6,7 @@ GRID grid/CASE.EGRID
 DEFINE <STORAGE> storage/<CONFIG_FILE_BASE>
 RANDOM_SEED 3593114179000630026631423308983283277868
 
-RUNPATH <STORAGE>/runpath/realization-%d/iter-%d
+RUNPATH <STORAGE>/runpath/realization-<IENS>/iter-<ITER>
 ENSPATH <STORAGE>/ensemble
 ECLBASE SNAKE_OIL_FIELD
 SUMMARY *

diff --git a/test-data/snake_oil_field/snake_oil_surface.ert b/test-data/snake_oil_field/snake_oil_surface.ert
@@ -7,7 +7,7 @@ DEFINE <STORAGE> storage/<CONFIG_FILE_BASE>
 
 RANDOM_SEED 3593114179000630026631423308983283277868
 
-RUNPATH <STORAGE>/runpath/realization-%d/iter-%d
+RUNPATH <STORAGE>/runpath/realization-<IENS>/iter-<ITER>
 ENSPATH <STORAGE>/ensemble
 ECLBASE SNAKE_OIL_FIELD
 SUMMARY *

diff --git a/test-data/snake_oil_structure/ert/model/user_config.ert b/test-data/snake_oil_structure/ert/model/user_config.ert
@@ -19,7 +19,7 @@ DEFINE  <ECLIPSE_NAME>  XYZ
 ---------------------------------------------------
 DATA_FILE           ../../eclipse/model/SNAKE_OIL.DATA                    -- Location of the Eclipse .DATA-file
 GRID                ../../eclipse/include/grid/CASE.EGRID                 -- Name of the Eclipse .GRID-file
-RUNPATH             <SCRATCH>/<USER>/<CASE_DIR>/realization-%d/iter-%d    -- Runpath for simulations (first %d will be replaced with realization number, second %d with iteration number
+RUNPATH             <SCRATCH>/<USER>/<CASE_DIR>/realization-<IENS>/iter-<ITER>    -- Runpath for simulations (<IENS> will be replaced with realization number, <ITER> with iteration number)
 ECLBASE             eclipse/model/<ECLIPSE_NAME>-%d                       -- Name used for the ECLIPSE simulations (%d will be replaced with the realization number)
 ENSPATH             ../output/storage/<CASE_DIR>                          -- Storage of internal ert data
 RUNPATH_FILE        ../output/run_path_file/.ert-runpath-list_<CASE_DIR>  -- Ert runpath file for workflows