From da3aed8d1e22c8d5c52c23696bc521f63705d432 Mon Sep 17 00:00:00 2001
From: David Case <dcase@cylc2.jasmin.ac.uk>
Date: Fri, 5 Dec 2025 16:10:12 +0000
Subject: [PATCH 1/2] Initial changes to allow rsync without puma2->puma2 ssh
 and point make to source

---
 rose-stem/flow.cylc                   | 10 +++++++++-
 rose-stem/include/jasmin/runtime.cylc | 13 +++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

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..abd8b2b2 100644
--- a/rose-stem/include/jasmin/runtime.cylc
+++ b/rose-stem/include/jasmin/runtime.cylc
@@ -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]]]

From 821b407bf7c0de6bd9c89fa232e6aace6e0d0272 Mon Sep 17 00:00:00 2001
From: David Case <dcase@cylc2.jasmin.ac.uk>
Date: Fri, 5 Dec 2025 16:14:53 +0000
Subject: [PATCH 2/2] use general jaspy

---
 rose-stem/include/jasmin/runtime.cylc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rose-stem/include/jasmin/runtime.cylc b/rose-stem/include/jasmin/runtime.cylc
index abd8b2b2..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]]