Skip to content

Use <CONFIG_PATH> instead of . for RUNPATH #530

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alifbe merged 1 commit into from
Apr 24, 2023
Merged

Use <CONFIG_PATH> instead of . for RUNPATH #530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tests/test_check_swatinit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -759,7 +759,7 @@ def test_ert_integration(tmp_path):
"ECLBASE DUMMY.DATA",
"QUEUE_SYSTEM LOCAL",
"NUM_REALIZATIONS 1",
"RUNPATH .",
"RUNPATH <CONFIG_PATH>",
"",
f"FORWARD_MODEL CHECK_SWATINIT(<DATAFILE>={REEK_DATAFILE})",
]
Expand All @@ -778,7 +778,7 @@ def test_ert_integration(tmp_path):
"ECLBASE DUMMY.DATA",
"QUEUE_SYSTEM LOCAL",
"NUM_REALIZATIONS 1",
"RUNPATH .",
"RUNPATH <CONFIG_PATH>",
"",
(
f"FORWARD_MODEL CHECK_SWATINIT(<DATAFILE>={REEK_DATAFILE}, "
Expand Down
2 changes: 1 addition & 1 deletion tests/test_csv2ofmvol.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ def test_ert_hook(datadir):
"ECLBASE FOO.DATA",
"QUEUE_SYSTEM LOCAL",
"NUM_REALIZATIONS 1",
"RUNPATH .",
"RUNPATH <CONFIG_PATH>",
"FORWARD_MODEL CSV2OFMVOL(<CSVFILES>=prod*.csv, <OUTPUT>=proddata.vol)",
]

Expand Down
2 changes: 1 addition & 1 deletion tests/test_csv_merge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ def test_ert_hook(tmp_path):
"ECLBASE FOO.DATA",
"QUEUE_SYSTEM LOCAL",
"NUM_REALIZATIONS 1",
"RUNPATH .",
"RUNPATH <CONFIG_PATH>",
"",
"LOAD_WORKFLOW MERGE_FOO",
"HOOK_WORKFLOW MERGE_FOO POST_SIMULATION",
Expand Down
8 changes: 4 additions & 4 deletions tests/test_csv_stack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ def test_ert_forward_model(tmp_path):
"ECLBASE FOO.DATA",
"QUEUE_SYSTEM LOCAL",
"NUM_REALIZATIONS 1",
"RUNPATH .",
"RUNPATH <CONFIG_PATH>",
"FORWARD_MODEL CSV_STACK(<CSVFILE>=stackme.csv, <OUTPUT>=stacked.csv)",
]

Expand Down Expand Up @@ -289,7 +289,7 @@ def test_ert_forward_model_keepminimal(tmp_path):
"ECLBASE FOO.DATA",
"QUEUE_SYSTEM LOCAL",
"NUM_REALIZATIONS 1",
"RUNPATH .",
"RUNPATH <CONFIG_PATH>",
(
"FORWARD_MODEL CSV_STACK("
'<CSVFILE>=stackme.csv, <OUTPUT>=stacked.csv, <OPTION>="--keepminimal")'
Expand Down Expand Up @@ -320,7 +320,7 @@ def test_ert_forward_model_keepconstants(tmp_path):
"ECLBASE FOO.DATA",
"QUEUE_SYSTEM LOCAL",
"NUM_REALIZATIONS 1",
"RUNPATH .",
"RUNPATH <CONFIG_PATH>",
(
"FORWARD_MODEL CSV_STACK("
'<CSVFILE>=stackme.csv, <OUTPUT>=stacked.csv, <OPTION>="--keepconstantcolumns")' # noqa
Expand Down Expand Up @@ -363,7 +363,7 @@ def test_csv_stack_ert_workflow(tmp_path):
"DEFINE <CASEDIR> some_ensemble",
"QUEUE_SYSTEM LOCAL",
"NUM_REALIZATIONS 1",
"RUNPATH .",
"RUNPATH <CONFIG_PATH>",
"",
"LOAD_WORKFLOW CSV_STACK_WELLS",
"HOOK_WORKFLOW CSV_STACK_WELLS POST_SIMULATION",
Expand Down
2 changes: 1 addition & 1 deletion tests/test_fmuobs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ def test_ert_workflow_hook(verbose, tmp_path):
"ECLBASE FOO.DATA",
"QUEUE_SYSTEM LOCAL",
"NUM_REALIZATIONS 1",
"RUNPATH .",
"RUNPATH <CONFIG_PATH>",
"LOAD_WORKFLOW wf_fmuobs",
"HOOK_WORKFLOW wf_fmuobs PRE_SIMULATION",
]
Expand Down
2 changes: 1 addition & 1 deletion tests/test_merge_rft_ertobs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ def test_ert_hook(drogondata):
"ECLBASE DROGON.DATA",
"QUEUE_SYSTEM LOCAL",
"NUM_REALIZATIONS 1",
"RUNPATH .",
"RUNPATH <CONFIG_PATH>",
(
"FORWARD_MODEL MERGE_RFT_ERTOBS("
"<GENDATACSV>=gendata_rft.csv, <OBSDIR>=rft, <OUTPUT>=mergedrft.csv)"
Expand Down
2 changes: 1 addition & 1 deletion tests/test_ofmvol2csv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ def test_ert_hook(datadir):
"ECLBASE FOOBAR.DATA",
"QUEUE_SYSTEM LOCAL",
"NUM_REALIZATIONS 1",
"RUNPATH .",
"RUNPATH <CONFIG_PATH>",
"FORWARD_MODEL OFMVOL2CSV(<VOLFILES>=file*.vol, <OUTPUT>=proddata.csv)",
]

Expand Down
4 changes: 2 additions & 2 deletions tests/test_prtvol2csv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ def test_ert_forward_model(tmp_path):
"ECLBASE FOO.DATA",
"QUEUE_SYSTEM LOCAL",
"NUM_REALIZATIONS 1",
"RUNPATH .",
"RUNPATH <CONFIG_PATH>",
"",
(
"FORWARD_MODEL PRTVOL2CSV("
Expand Down Expand Up @@ -488,7 +488,7 @@ def test_ert_forward_model_backwards_compat_deprecation(tmp_path):
"ECLBASE FOO.DATA",
"QUEUE_SYSTEM LOCAL",
"NUM_REALIZATIONS 1",
"RUNPATH .",
"RUNPATH <CONFIG_PATH>",
"",
(
"FORWARD_MODEL PRTVOL2CSV("
Expand Down
2 changes: 1 addition & 1 deletion tests/test_ri_wellmod.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ def test_ert_forward_model(tmp_path):
"ECLBASE FOO.DATA",
"QUEUE_SYSTEM LOCAL",
"NUM_REALIZATIONS 1",
"RUNPATH .",
"RUNPATH <CONFIG_PATH>",
"FORWARD_MODEL RI_WELLMOD("
+ f"<RI_PROJECT>={proj_name},"
+ f"<ECLBASE>={init_case_name},"
Expand Down
2 changes: 1 addition & 1 deletion tests/test_sunsch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -918,7 +918,7 @@ def test_ert_forward_model(testdata):
"ECLBASE FOO.DATA",
"QUEUE_SYSTEM LOCAL",
"NUM_REALIZATIONS 1",
"RUNPATH .",
"RUNPATH <CONFIG_PATH>",
"",
"FORWARD_MODEL SUNSCH(<config>=config_v2.yml)",
]
Expand Down