Skip to content

Commit 51bcde8

Browse files
andreas-elandreas-el
committed
Replace jobname specifiers with <ITER> and <IENS>
1 parent cabf9c3 commit 51bcde8

File tree

31 files changed

+40
-39
lines changed

31 files changed

+40
-39
lines changed

‎docs/getting_started/configuration/poly_new/guide.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ We need to have each iteration run in a different folder, so that they won't
116116
step on each others toes. Add to the config (``poly.ert``) file the following
117117
line::
118118

119-
RUNPATH poly_out/realization-%d/iter-%d
119+
RUNPATH poly_out/realization-<IENS>/iter-<ITER>
120120

121121
The second ``%d`` in the runpath is replaced by the iteration number of the
122122
algorithm. This is needed since the algorithm may run several iterations during

‎docs/getting_started/configuration/poly_new/with_observations/poly.ert

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ NUM_REALIZATIONS 100
44
QUEUE_SYSTEM LOCAL
55
QUEUE_OPTION LOCAL MAX_RUNNING 50
66

7-
RUNPATH poly_out/realization-%d/iter_%d
7+
RUNPATH poly_out/realization-<IENS>/iter-<ITER>
88

99
GEN_KW COEFFS coeff.tmpl coeffs.json coeff_priors
1010

‎docs/getting_started/configuration/poly_new/with_observations/poly_final.ert

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ NUM_REALIZATIONS 100
44
QUEUE_SYSTEM LOCAL
55
QUEUE_OPTION LOCAL MAX_RUNNING 50
66

7-
RUNPATH poly_out/realization-%d/iter-%d
7+
RUNPATH poly_out/realization-<IENS>/iter-<ITER>
88

99
GEN_KW COEFFS coeff.tmpl coeffs.json coeff_priors
1010

‎docs/getting_started/configuration/poly_new/with_parameters/poly.ert

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ NUM_REALIZATIONS 100
44
QUEUE_SYSTEM LOCAL
55
QUEUE_OPTION LOCAL MAX_RUNNING 50
66

7-
RUNPATH poly_out/realization-%d/iter-%d
7+
RUNPATH poly_out/realization-<IENS>/iter-<ITER>
88

99
GEN_KW COEFFS coeff.tmpl coeffs.json coeff_priors
1010

‎docs/getting_started/configuration/poly_new/with_results/poly.ert

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ NUM_REALIZATIONS 100
44
QUEUE_SYSTEM LOCAL
55
QUEUE_OPTION LOCAL MAX_RUNNING 50
66

7-
RUNPATH poly_out/realization-%d/iter-%d
7+
RUNPATH poly_out/realization-<IENS>/iter-<ITER>
88

99
GEN_KW COEFFS coeff.tmpl coeffs.json coeff_priors
1010

‎docs/getting_started/configuration/poly_new/with_simple_script/poly.ert

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ NUM_REALIZATIONS 5
33

44
QUEUE_SYSTEM LOCAL
55

6-
RUNPATH poly_out/realization-%d/iter-%d
6+
RUNPATH poly_out/realization-<IENS>/iter-<ITER>
77

88
INSTALL_JOB poly_eval POLY_EVAL
99
SIMULATION_JOB poly_eval

‎docs/reference/queue/local_queue.ert

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ JOBNAME queue_test_%d
33
QUEUE_SYSTEM LOCAL
44
QUEUE_OPTION LOCAL MAX_RUNNING 50
55

6-
RUNPATH local_testing/realization-%d/iter-%d
6+
RUNPATH local_testing/realization-<IENS>/iter-<ITER>
77

88
NUM_REALIZATIONS 100
99
MIN_REALIZATIONS 1

‎docs/reference/queue/lsf_queue.ert

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ QUEUE_OPTION LSF LSF_SERVER be-grid01 -- Change this to a server you have access
88
QUEUE_OPTION LSF LSF_QUEUE mr
99
QUEUE_OPTION LSF PROJECT_CODE user:$USER
1010

11-
RUNPATH lsf_testing/realization-%d/iter-%d
11+
RUNPATH lsf_testing/realization-<IENS>/iter-<ITER>
1212

1313
NUM_REALIZATIONS 1
1414
MIN_REALIZATIONS 1

‎test-data/batch_sim/batch_sim.ert

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ NUM_REALIZATIONS 25
55

66
DEFINE <STORAGE> storage/<CONFIG_FILE_BASE>
77

8-
RUNPATH <STORAGE>/runpath/<CASE_NAME>/realization-%d/iter-%d
8+
RUNPATH <STORAGE>/runpath/<CASE_NAME>/realization-<IENS>/iter-<ITER>
99
ENSPATH <STORAGE>/ensemble
1010
JOBNAME SNAKE_OIL_FIELD
1111

‎test-data/batch_sim/batch_sim_sleep_and_fail.ert

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ QUEUE_OPTION LOCAL MAX_RUNNING 10
33

44
NUM_REALIZATIONS 10
55

6-
RUNPATH runpath/realization-%d/iter-%d
6+
RUNPATH runpath/realization-<IENS>/iter-<ITER>
77
JOBNAME SNAKE_OIL_FIELD
88

99
INSTALL_JOB SQUARE_PARAMS jobs/SQUARE_PARAMS

‎test-data/batch_sim/sleepy_time.ert

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ QUEUE_OPTION LOCAL MAX_RUNNING 10
33

44
NUM_REALIZATIONS 10
55

6-
RUNPATH runpath/realization-%d-<GEO_ID>/iter-%d
6+
RUNPATH runpath/realization-<IENS>-<GEO_ID>/iter-<ITER>
77
JOBNAME OLE_LUKKOYE
88

99
INSTALL_JOB SLEEP jobs/SLEEP

‎test-data/configuration_tests/ecl_config.ert

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ REFCASE input/refcase/SNAKE_OIL_FIELD
44
GRID input/CASE.EGRID
55
SCHEDULE_PREDICTION_FILE input/schedule.sch
66

7-
RUNPATH /tmp/simulations/run%d
7+
RUNPATH /tmp/simulations/realization-<IENS>/iter-<ITER>
88
NUM_REALIZATIONS 10
99
MIN_REALIZATIONS 10
1010

‎test-data/configuration_tests/ensemble_config.ert

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
JOBNAME Job%d
2-
RUNPATH /tmp/simulations/run%d
2+
RUNPATH /tmp/simulations/realization-<IENS>/iter-<ITER>
33
NUM_REALIZATIONS 10
44
MIN_REALIZATIONS 10
55

‎test-data/configuration_tests/model_config.ert

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ INSTALL_JOB SNAKE_OIL_DIFF input/jobs/SNAKE_OIL_DIFF
1010
-- ModelConfig specific input
1111

1212
JOBNAME model_config_test
13-
RUNPATH /tmp/simulations/run%d
13+
RUNPATH /tmp/simulations/realization-<IENS>/iter-<ITER>
1414
NUM_REALIZATIONS 10
1515
ENSPATH Ensemble
1616

‎test-data/configuration_tests/sched_file_as_history_source.ert

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ INSTALL_JOB SNAKE_OIL_DIFF input/jobs/SNAKE_OIL_DIFF
1212
-- ModelConfig specific input
1313

1414
JOBNAME model_config_test
15-
RUNPATH /tmp/simulations/run%d
15+
RUNPATH /tmp/simulations/realization-<IENS>/iter-<ITER>
1616
NUM_REALIZATIONS 10
1717
ENSPATH Ensemble
1818

‎test-data/poly_example/poly-ies.ert

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ JOBNAME poly_%d
33
QUEUE_SYSTEM LOCAL
44
QUEUE_OPTION LOCAL MAX_RUNNING 50
55

6-
RUNPATH poly_out/realization-%d/iter-%d
6+
RUNPATH poly_out/realization-<IENS>/iter-<ITER>
77

88
OBS_CONFIG observations
99
TIME_MAP time_map

‎test-data/poly_example/poly.ert

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ JOBNAME poly_%d
33
QUEUE_SYSTEM LOCAL
44
QUEUE_OPTION LOCAL MAX_RUNNING 50
55

6-
RUNPATH poly_out/realization-%d/iter-%d
6+
RUNPATH poly_out/realization-<IENS>/iter-<ITER>
77

88
OBS_CONFIG observations
99
TIME_MAP time_map

‎test-data/poly_template/poly.ert.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
QUEUE_SYSTEM LOCAL
33
QUEUE_OPTION LOCAL MAX_RUNNING 50
44

5-
RUNPATH poly_out/realization-%d/iter-%d
5+
RUNPATH poly_out/realization-<IENS>/iter-<ITER>
66

77
OBS_CONFIG observations
88

‎test-data/simple_config/analysis_config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
JOBNAME Job%d
2-
RUNPATH /tmp/simulations/run%d
2+
RUNPATH /tmp/simulations/realization-<IENS>/iter-<ITER>
33
NUM_REALIZATIONS 10
44
MIN_REALIZATIONS 10
55
JOB_SCRIPT script.sh

‎test-data/simple_config/minimum_config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
JOBNAME Job%d
2-
RUNPATH /tmp/simulations/run%d
2+
RUNPATH /tmp/simulations/realization-<IENS>/iter-<ITER>
33
NUM_REALIZATIONS 10
44
MIN_REALIZATIONS 10
55
JOB_SCRIPT script.sh

‎test-data/simple_config/slurm_config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
JOBNAME Job%d
2-
RUNPATH /tmp/simulations/run%d
2+
RUNPATH /tmp/simulations/realization-<IENS>/iter-<ITER>
33
NUM_REALIZATIONS 10
44
MIN_REALIZATIONS 10
55
JOB_SCRIPT script.sh

‎test-data/snake_oil/snake_oil.ert

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ANALYSIS_SET_VAR STD_ENKF IES_INVERSION 1
88
DEFINE <STORAGE> storage/<CONFIG_FILE_BASE>
99
RANDOM_SEED 3593114179000630026631423308983283277868
1010

11-
RUNPATH <STORAGE>/runpath/realization-%d/iter-%d
11+
RUNPATH <STORAGE>/runpath/realization-<IENS>/iter-<ITER>
1212
ENSPATH <STORAGE>/ensemble
1313
ECLBASE SNAKE_OIL_FIELD
1414
SUMMARY *

‎test-data/snake_oil_field/snake_oil.ert

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ GRID grid/CASE.EGRID
77
DEFINE <STORAGE> storage/<CONFIG_FILE_BASE>
88
RANDOM_SEED 3593114179000630026631423308983283277868
99

10-
RUNPATH <STORAGE>/runpath/realization-%d/iter-%d
10+
RUNPATH <STORAGE>/runpath/realization-<IENS>/iter-<ITER>
1111
ENSPATH <STORAGE>/ensemble
1212
ECLBASE SNAKE_OIL_FIELD
1313
SUMMARY *

‎test-data/snake_oil_field/snake_oil_field.ert

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ GRID grid/CASE.EGRID
66
DEFINE <STORAGE> storage/<CONFIG_FILE_BASE>
77
RANDOM_SEED 3593114179000630026631423308983283277868
88

9-
RUNPATH <STORAGE>/runpath/realization-%d/iter-%d
9+
RUNPATH <STORAGE>/runpath/realization-<IENS>/iter-<ITER>
1010
ENSPATH <STORAGE>/ensemble
1111
ECLBASE SNAKE_OIL_FIELD
1212
SUMMARY *

‎test-data/snake_oil_field/snake_oil_surface.ert

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ DEFINE <STORAGE> storage/<CONFIG_FILE_BASE>
77

88
RANDOM_SEED 3593114179000630026631423308983283277868
99

10-
RUNPATH <STORAGE>/runpath/realization-%d/iter-%d
10+
RUNPATH <STORAGE>/runpath/realization-<IENS>/iter-<ITER>
1111
ENSPATH <STORAGE>/ensemble
1212
ECLBASE SNAKE_OIL_FIELD
1313
SUMMARY *

‎test-data/snake_oil_structure/ert/model/user_config.ert

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ DEFINE <ECLIPSE_NAME> XYZ
1919
---------------------------------------------------
2020
DATA_FILE ../../eclipse/model/SNAKE_OIL.DATA -- Location of the Eclipse .DATA-file
2121
GRID ../../eclipse/include/grid/CASE.EGRID -- Name of the Eclipse .GRID-file
22-
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
22+
RUNPATH <SCRATCH>/<USER>/<CASE_DIR>/realization-<IENS>/iter-<ITER> -- Runpath for simulations (<IENS> will be replaced with realization number, <ITER> with iteration number)
2323
ECLBASE eclipse/model/<ECLIPSE_NAME>-%d -- Name used for the ECLIPSE simulations (%d will be replaced with the realization number)
2424
ENSPATH ../output/storage/<CASE_DIR> -- Storage of internal ert data
2525
RUNPATH_FILE ../output/run_path_file/.ert-runpath-list_<CASE_DIR> -- Ert runpath file for workflows

‎tests/test_config_parsing/test_res_config.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def test_res_config_parses_date():
8080
"""
8181
NUM_REALIZATIONS 1
8282
DEFINE <STORAGE> storage/<CONFIG_FILE_BASE>-<DATE>
83-
RUNPATH <STORAGE>/runpath/realization-%d/iter-%d
83+
RUNPATH <STORAGE>/runpath/realization-<IENS>/iter-<ITER>
8484
ENSPATH <STORAGE>/ensemble
8585
"""
8686
)
@@ -90,7 +90,7 @@ def test_res_config_parses_date():
9090

9191
date_string = date.today().isoformat()
9292
expected_storage = os.path.abspath(f"storage/{test_config_file_base}-{date_string}")
93-
expected_run_path = f"{expected_storage}/runpath/realization-%d/iter-%d"
93+
expected_run_path = f"{expected_storage}/runpath/realization-<IENS>/iter-<ITER>"
9494
expected_ens_path = f"{expected_storage}/ensemble"
9595
assert res_config.model_config.ens_path == expected_ens_path
9696
assert res_config.model_config.runpath_format_string == expected_run_path

‎tests/unit_tests/c_wrappers/res/enkf/test_programmatic_res_config.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def fixture_minimum_config_dict():
1818
"QUEUE_SYSTEM": {
1919
"JOBNAME": "Job%d",
2020
},
21-
"RUNPATH": "/tmp/simulations/run%d",
21+
"RUNPATH": "/tmp/simulations/realizations-<IENS>/iter-<ITER>",
2222
"NUM_REALIZATIONS": 10,
2323
"MIN_REALIZATIONS": 10,
2424
"JOB_SCRIPT": "script.sh",
@@ -66,7 +66,7 @@ def test_errors():
6666
"QUEUE_SYSTEM": {
6767
"JOBNAME": "Job%d",
6868
},
69-
"RUNPATH": "/tmp/simulations/run%d",
69+
"RUNPATH": "/tmp/simulations/realizations-<IENS>/iter-<ITER>",
7070
"NUM_REALIZATIONS": "/should/be/an/integer",
7171
"JOB_SCRIPT": "script.sh",
7272
"ENSPATH": "Ensemble",

‎tests/unit_tests/c_wrappers/res/enkf/test_res_config.py

+8-7
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
}
2929

3030
snake_oil_structure_config = {
31-
"RUNPATH": "<SCRATCH>/<USER>/<CASE_DIR>/realization-%d/iter-%d",
31+
"RUNPATH": "<SCRATCH>/<USER>/<CASE_DIR>/realization-<IENS>/iter-<ITER>",
3232
"NUM_REALIZATIONS": 10,
3333
"MAX_RUNTIME": 23400,
3434
"MIN_REALIZATIONS": "50%",
@@ -147,7 +147,7 @@ def test_missing_directory():
147147
"QUEUE_SYSTEM": {
148148
"JOBNAME": "Job%d",
149149
},
150-
"RUNPATH": "/tmp/simulations/run%d",
150+
"RUNPATH": "/tmp/simulations/realization-<IENS>/iter-<ITER>",
151151
"NUM_REALIZATIONS": 1,
152152
"JOB_SCRIPT": "script.sh",
153153
"ENSPATH": "Ensemble",
@@ -309,7 +309,7 @@ def test_res_config_dict_constructor(setup_case):
309309
ConfigKeys.MIN_REALIZATIONS: 5,
310310
# "MIN_REALIZATIONS" : "50%", percentages need to be fixed or removed
311311
ConfigKeys.RUNPATH: os.path.join(
312-
os.getcwd(), "<SCRATCH>/<USER>/<CASE_DIR>/realization-%d/iter-%d"
312+
os.getcwd(), "<SCRATCH>/<USER>/<CASE_DIR>/realization-<IENS>/iter-<ITER>"
313313
),
314314
ConfigKeys.NUM_REALIZATIONS: 10, # model
315315
ConfigKeys.MAX_RUNTIME: 23400,
@@ -536,7 +536,8 @@ def test_that_job_script_can_be_set_in_site_config(monkeypatch, tmp_path):
536536
test_user_config = tmp_path / "user_config.ert"
537537

538538
test_user_config.write_text(
539-
"JOBNAME Job%d\nRUNPATH /tmp/simulations/run%d\nNUM_REALIZATIONS 10\n"
539+
"JOBNAME Job%d\nRUNPATH /tmp/simulations/realization-<IENS>/iter-<ITER>\n"
540+
"NUM_REALIZATIONS 10\n"
540541
)
541542

542543
res_config = ResConfig(str(test_user_config))
@@ -560,7 +561,7 @@ def test_that_unknown_queue_option_gives_error_message(
560561
test_user_config = tmp_path / "user_config.ert"
561562

562563
test_user_config.write_text(
563-
"JOBNAME Job%d\nRUNPATH /tmp/simulations/run%d\n"
564+
"JOBNAME Job%d\nRUNPATH /tmp/simulations/realization-<IENS>/iter-<ITER>\n"
564565
"NUM_REALIZATIONS 10\nQUEUE_OPTION UNKNOWN_QUEUE unsetoption\n"
565566
)
566567

@@ -587,7 +588,7 @@ def test_that_workflow_run_modes_can_be_selected(tmp_path, run_mode):
587588
os.chmod(my_script, st.st_mode | stat.S_IEXEC)
588589
test_user_config = tmp_path / "user_config.ert"
589590
test_user_config.write_text(
590-
"JOBNAME Job%d\nRUNPATH /tmp/simulations/run%d\n"
591+
"JOBNAME Job%d\nRUNPATH /tmp/simulations/realization-<IENS>/iter-<ITER>\n"
591592
"NUM_REALIZATIONS 10\n"
592593
f"LOAD_WORKFLOW {my_script} SCRIPT\n"
593594
f"HOOK_WORKFLOW SCRIPT {run_mode}\n"
@@ -651,7 +652,7 @@ def test_logging_snake_oil_config(caplog, source_root):
651652
DEFINE <ECLIPSE_NAME> XYZ
652653
DATA_FILE ../../eclipse/model/SNAKE_OIL.DATA
653654
GRID ../../eclipse/include/grid/CASE.EGRID
654-
RUNPATH <SCRATCH>/<USER>/<CASE_DIR>/realization-%d/iter-%d
655+
RUNPATH <SCRATCH>/<USER>/<CASE_DIR>/realization-<IENS>/iter-<ITER>
655656
ECLBASE eclipse/model/<ECLIPSE_NAME>-%d
656657
ENSPATH ../output/storage/<CASE_DIR>
657658
RUNPATH_FILE ../output/run_path_file/.ert-runpath-list_<CASE_DIR>

‎tests/unit_tests/lsf_queue/test_lsf_driver.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ def copy_lsf_poly_case(copy_poly_case):
158158
"QUEUE_OPTION LSF MAX_RUNNING 10\n",
159159
"QUEUE_OPTION LSF BJOBS_CMD ../mock_bjobs\n",
160160
"QUEUE_OPTION LSF BSUB_CMD ../mock_bsub\n",
161-
"RUNPATH poly_out/realization-%d/iter-%d\n",
161+
"RUNPATH poly_out/realization-<IENS>/iter-<ITER>\n",
162162
"OBS_CONFIG observations\n",
163163
"TIME_MAP time_map\n",
164164
"NUM_REALIZATIONS 10\n",

‎tests/unit_tests/shared/share/test_shell.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ def test_shell_scripts_integration(tmpdir):
363363
with open(ert_config_fname, "w", encoding="utf-8") as file_h:
364364
file_h.write(
365365
"""
366-
RUNPATH realization-%d/iter-%d
366+
RUNPATH realization-<IENS>/iter-<ITER>
367367
JOBNAME TEST
368368
QUEUE_SYSTEM LOCAL
369369
NUM_REALIZATIONS 1

0 commit comments

Comments
 (0)