Skip to content
This repository has been archived by the owner on Jul 19, 2021. It is now read-only.

Commit

Permalink
Move all forward_model style config files to old_style folder, replac…
Browse files Browse the repository at this point in the history
…ed them with lowercase files
  • Loading branch information
DanSava committed Aug 30, 2019
1 parent 0b29eed commit 18a1953
Show file tree
Hide file tree
Showing 19 changed files with 18 additions and 33 deletions.
19 changes: 0 additions & 19 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -185,28 +185,9 @@ endif()
foreach(share_dir workflows gui forward-models)
install(DIRECTORY "share/ert/${share_dir}" DESTINATION ${SHARE_DIR})
endforeach()

install_example("share/ert/site-config" ${SHARE_DIR})
install(PROGRAMS bin/job_dispatch.py DESTINATION bin )

# Install (symlinks) compatibility version of jobs (only on case sensitive OSs)
# Case-sensitivity is checked by looking for an existing file. It is arguably
# hacky but I could not find any better way to do it
if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMAKELISTS.TXT")
foreach (job eclipse100 eclipse300 flow)
string(TOUPPER ${job} uc_job)
set(ln_target ${CMAKE_INSTALL_PREFIX}/${SHARE_DIR}/forward-models/res/${job}_compatibility)
set(ln_name ${CMAKE_INSTALL_PREFIX}/${SHARE_DIR}/forward-models/res/${uc_job})
INSTALL(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${ln_target} ${ln_name})")
endforeach()
foreach (script careful_copy_file copy_directory copy_file delete_directory delete_file make_directory move_file symlink make_symlink)
string(TOUPPER ${script} uc_scrip)
set(ln_target ${CMAKE_INSTALL_PREFIX}/${SHARE_DIR}/forward-models/shell/${script}_compatibility)
set(ln_name ${CMAKE_INSTALL_PREFIX}/${SHARE_DIR}/forward-models/shell/${uc_scrip})
INSTALL(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${ln_target} ${ln_name})")
endforeach()
endif()

foreach (script ecl100 ecl300 flow rms)
install(PROGRAMS "share/ert/forward-models/res/script/${script}" DESTINATION "${SHARE_DIR}/forward-models/res/script")
endforeach()
Expand Down
3 changes: 2 additions & 1 deletion python/tests/res/enkf/test_site_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ def test_constructors(self):
[
ERT_SHARE_PATH + '/forward-models/res',
ERT_SHARE_PATH + '/forward-models/shell',
ERT_SHARE_PATH + '/forward-models/templating'
ERT_SHARE_PATH + '/forward-models/templating',
ERT_SHARE_PATH + '/forward-models/old_style'
],

"SETENV":
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
STDOUT careful_copy_file.stdout
STDERR careful_copy_file.stderr
EXECUTABLE script/careful_copy_file
EXECUTABLE ../shell/script/careful_copy_file
ARGLIST <FROM> <TO>

MIN_ARG 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
STDERR copy_directory.stderr
STDOUT copy_directory.stdout
EXECUTABLE script/copy_directory
EXECUTABLE ../shell/script/copy_directory
ARGLIST <FROM> <TO>

MIN_ARG 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
STDOUT copy_file.stdout
STDERR copy_file.stderr
EXECUTABLE script/copy_file
EXECUTABLE ../shell/script/copy_file
ARGLIST <FROM> <TO>

MIN_ARG 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
STDERR delete_dir.stderr
STDOUT delete_dir.stdout

EXECUTABLE script/delete_directory
EXECUTABLE ../shell/script/delete_directory
ARGLIST <DIRECTORY>

MIN_ARG 1
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
STDERR delete_file.stderr
STDOUT delete_file.stdout

EXECUTABLE script/delete_file
EXECUTABLE ../shell/script/delete_file
ARGLIST <FILES>

MIN_ARG 1
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
EXECUTABLE script/ecl100
EXECUTABLE ../res/script/ecl100
DEFAULT <VERSION> version
DEFAULT <NUM_CPU> 1
DEFAULT <OPTS> ""
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
EXECUTABLE script/ecl300
EXECUTABLE ../res/script/ecl300
DEFAULT <VERSION> version
DEFAULT <NUM_CPU> 1
DEFAULT <OPTS> ""
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
EXECUTABLE script/flow
EXECUTABLE ../res/script/flow
DEFAULT <VERSION> default
DEFAULT <NUM_CPU> 1
DEFAULT <OPTS> ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ STDERR make_directory.stderr
STDOUT make_directory.stdout

ARGLIST <DIRECTORY>
EXECUTABLE script/make_directory
EXECUTABLE ../shell/script/make_directory

MIN_ARG 1
MAX_ARG 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
STDERR make_symlink.stderr
STDOUT make_symlink.stdout

EXECUTABLE script/symlink
EXECUTABLE ../shell/script/symlink
ARGLIST <TARGET> <LINKNAME>

MIN_ARG 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
STDERR move_file.stderr
STDOUT move_file.stdout

EXECUTABLE script/move_file
EXECUTABLE ../shell/script/move_file
ARGLIST <FROM> <TO>

MIN_ARG 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
EXECUTABLE script/rms
EXECUTABLE ../res/script/rms

DEFAULT <RMS_IMPORT_PATH> ./
DEFAULT <RMS_EXPORT_PATH> ./
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
STDERR make_symlink.stderr
STDOUT make_symlink.stdout

EXECUTABLE script/symlink
EXECUTABLE ../shell/script/symlink
ARGLIST <TARGET> <LINKNAME>

MIN_ARG 2
Expand Down
1 change: 1 addition & 0 deletions share/ert/forward-models/old_style/TEMPLATE_RENDER
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
EXECUTABLE ../templating/script/template_render
1 change: 1 addition & 0 deletions share/ert/forward-models/res/rms
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
EXECUTABLE script/rms
1 change: 1 addition & 0 deletions share/ert/site-config
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ JOB_SCRIPT ../../bin/job_dispatch.py
INSTALL_JOB_DIRECTORY forward-models/res
INSTALL_JOB_DIRECTORY forward-models/shell
INSTALL_JOB_DIRECTORY forward-models/templating
INSTALL_JOB_DIRECTORY forward-models/old_style

QUEUE_OPTION LOCAL MAX_RUNNING 1

Expand Down

0 comments on commit 18a1953

Please sign in to comment.