diff --git a/esmvaltool/utils/recipe_test_workflow/recipe_test_workflow/app/install_env_file/bin/install_env_file.sh b/esmvaltool/utils/recipe_test_workflow/recipe_test_workflow/app/install_env_file/bin/install_env_file.sh index cf33015956..ed238e6be6 100755 --- a/esmvaltool/utils/recipe_test_workflow/recipe_test_workflow/app/install_env_file/bin/install_env_file.sh +++ b/esmvaltool/utils/recipe_test_workflow/recipe_test_workflow/app/install_env_file/bin/install_env_file.sh @@ -3,15 +3,15 @@ BASH_XTRACEFD=1 set -eux -# Copy the site specific environment file to the 'bin' directory in the +# Copy the site specific environment file to the 'share/bin' directory in the # installed Cylc workflow (this directory is automatically added to the # ${PATH} by Cylc). SOURCE_PATH="${CYLC_WORKFLOW_RUN_DIR}/site/${SITE}-env" -TARGET_DIR="${CYLC_WORKFLOW_RUN_DIR}/bin" +TARGET_DIR="${CYLC_WORKFLOW_SHARE_DIR}/bin" ENV_FILE="rtw-env" -# Create the 'bin' directory in the installed workflow. +# Create the 'share/bin' directory in the installed workflow. mkdir "${TARGET_DIR}" -# Copy the environment file to the 'bin' directory. +# Copy the environment file to the 'share/bin' directory. cp "${SOURCE_PATH}" "${TARGET_DIR}/${ENV_FILE}" diff --git a/esmvaltool/utils/recipe_test_workflow/recipe_test_workflow/flow.cylc b/esmvaltool/utils/recipe_test_workflow/recipe_test_workflow/flow.cylc index 55cbda9e08..8d569bc093 100644 --- a/esmvaltool/utils/recipe_test_workflow/recipe_test_workflow/flow.cylc +++ b/esmvaltool/utils/recipe_test_workflow/recipe_test_workflow/flow.cylc @@ -31,9 +31,9 @@ env-script = "eval $(rose task-env)" [[[environment]]] ENV_NAME = {{ ENV_NAME }} - USER_CONFIG_DIR = ${CYLC_WORKFLOW_RUN_DIR}/etc + USER_CONFIG_DIR = ${ROSE_DATAC} USER_CONFIG_PATH = ${USER_CONFIG_DIR}/config-user.yml - OUTPUT_DIR = ${CYLC_WORKFLOW_SHARE_DIR}/cycle/${CYLC_TASK_CYCLE_POINT} + OUTPUT_DIR = ${ROSE_DATAC} ESMVALCORE_DIR = "" ESMVALTOOL_DIR = "" PYTHONPATH_PREPEND = "" diff --git a/esmvaltool/utils/recipe_test_workflow/recipe_test_workflow/site/metoffice.cylc b/esmvaltool/utils/recipe_test_workflow/recipe_test_workflow/site/metoffice.cylc index 3c50af91c0..c967a0b3b1 100644 --- a/esmvaltool/utils/recipe_test_workflow/recipe_test_workflow/site/metoffice.cylc +++ b/esmvaltool/utils/recipe_test_workflow/recipe_test_workflow/site/metoffice.cylc @@ -2,8 +2,8 @@ [runtime] [[root]] [[[environment]]] - ESMVALCORE_DIR = ${CYLC_WORKFLOW_RUN_DIR}/lib/ESMValCore - ESMVALTOOL_DIR = ${CYLC_WORKFLOW_RUN_DIR}/lib/ESMValTool + ESMVALCORE_DIR = ${CYLC_WORKFLOW_RUN_DIR}/share/lib/python/ESMValCore + ESMVALTOOL_DIR = ${CYLC_WORKFLOW_RUN_DIR}/share/lib/python/ESMValTool PYTHONPATH_PREPEND = ${ESMVALCORE_DIR}:${ESMVALTOOL_DIR} # COMPUTE provides defaults for computation-heavy tasks.