diff --git a/rose-stem/flow.cylc b/rose-stem/flow.cylc index 7ad67733..a01732fa 100644 --- a/rose-stem/flow.cylc +++ b/rose-stem/flow.cylc @@ -8,7 +8,15 @@ {% endif %} {% do LOG.info("Site: " + SITE) %} -{% set SOURCE_DIRECTORY = ROSE_ORIG_HOST~":"~CYLC_WORKFLOW_SRC_DIR~"/.." %} +{# Do not include rose orig host at some sites as you may trip up with ssh keys #} +{# Far easier to just rsync without a hostname and copy the files directly #} +{% if SITE == 'jasmin' %} + {% set SOURCE_DIRECTORY = CYLC_WORKFLOW_SRC_DIR~"/.." %} +{% else %} + {% set SOURCE_DIRECTORY = ROSE_ORIG_HOST~":"~CYLC_WORKFLOW_SRC_DIR~"/.." %} +{% endif %} + + {# Include log message for suite_report #} {% do LOG.info("JULES SOURCE CLONE="~SOURCE_DIRECTORY) %} diff --git a/rose-stem/include/jasmin/runtime.cylc b/rose-stem/include/jasmin/runtime.cylc index d50cd637..0d5a843c 100644 --- a/rose-stem/include/jasmin/runtime.cylc +++ b/rose-stem/include/jasmin/runtime.cylc @@ -5,7 +5,7 @@ # (normally found in runtime-common.cylc, Done to enforce loading of # Python 3 on JASMIN which is required by UMDP3 checker) [[SCRIPTS]] - env-script = "module load jaspy/3.7/r20210320" + env-script = "module load jaspy" {% if REMOTE_JASMIN %} [[REMOTE]] @@ -55,17 +55,18 @@ execution time limit = PT2M [[extract_source]] - inherit = SOURCE_EXTRACTION, JASMIN_LOTUS + inherit = SOURCE_EXTRACTION [[JASMIN_FCM_MAKE]] inherit = None, JASMIN_LOTUS, EXTRACT [[[environment]]] JULES_PLATFORM = jasmin-lotus-intel - {% if REMOTE_JASMIN %} - JULES_SOURCE = {{ REMOTE_JULES_SOURCE }} - {% else %} - JULES_SOURCE = {{ SOURCE_JULES }} - {% endif %} + JULES_SOURCE = ${CYLC_SUITE_SHARE_DIR}/source/jules +{# {% if REMOTE_JASMIN %} #} +{# JULES_SOURCE = {{ REMOTE_JULES_SOURCE }} #} +{# {% else %} #} +{# JULES_SOURCE = {{ SOURCE_JULES }} #} +{# {% endif %} #} [[[job]]] execution time limit = PT20M [[[directives]]]