From 9e371501273c8be00c141f07cf6de98519f39fb2 Mon Sep 17 00:00:00 2001
From: MetBenjaminWent <benjamin.went@metoffice.gov.uk>
Date: Wed, 11 Feb 2026 13:11:34 +0000
Subject: [PATCH 1/3] Lift adjustable psyclone command options into adjustable
 flag

---
 .../build/psyclone/psyclone_psykal.mk         | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/infrastructure/build/psyclone/psyclone_psykal.mk b/infrastructure/build/psyclone/psyclone_psykal.mk
index fed281665..f67c06251 100644
--- a/infrastructure/build/psyclone/psyclone_psykal.mk
+++ b/infrastructure/build/psyclone/psyclone_psykal.mk
@@ -11,6 +11,11 @@
 # Set the DSL Method in use to collect the correct transformation files.
 DSL = psykal
 #
+
+# Set default psyclone command additional options
+PSYCLONE_PSYKAL_EXTRAS := -l all
+#
+
 ALGORITHM_F_FILES := $(patsubst $(SOURCE_DIR)/%.X90, \
                                 $(WORKING_DIR)/%.f90, \
                                 $(shell find $(SOURCE_DIR) -name '*.X90' -print))
@@ -46,12 +51,14 @@ $(WORKING_DIR)/%.f90 $(WORKING_DIR)/%_psy.f90: \
 $(WORKING_DIR)/%.x90 $$(OPTIMISATION_PATH)/$(DSL)/$$*.py | $$(dir $$@)
 	$(call MESSAGE,PSyclone - local optimisation,$(subst $(SOURCE_DIR)/,,$<))
 	$QPYTHONPATH=$(LFRIC_BUILD)/psyclone:$$PYTHONPATH psyclone -api lfric \
-	           -l all -d $(WORKING_DIR) \
+	           -d $(WORKING_DIR) \
 	           --config $(PSYCLONE_CONFIG_FILE) \
 	           -s $(OPTIMISATION_PATH)/$(DSL)/$*.py \
 	           -okern $(WORKING_DIR)/kernel \
 	           -oalg $(WORKING_DIR)/$*.f90 \
-	           -opsy $(WORKING_DIR)/$*_psy.f90 $<
+	           -opsy $(WORKING_DIR)/$*_psy.f90 \
+			   $(PSYCLONE_PSYKAL_EXTRAS) \
+			   $<
 
 # Where a global optimisation script exists, use it.
 #
@@ -59,12 +66,14 @@ $(WORKING_DIR)/%.f90 $(WORKING_DIR)/%_psy.f90: \
 $(WORKING_DIR)/%.x90 $(OPTIMISATION_PATH)/$(DSL)/global.py | $$(dir $$@)
 	$(call MESSAGE,PSyclone - global optimisation,$(subst $(SOURCE_DIR)/,,$<))
 	$QPYTHONPATH=$(LFRIC_BUILD)/psyclone:$$PYTHONPATH psyclone -api lfric \
-	           -l all -d $(WORKING_DIR) \
+	           -d $(WORKING_DIR) \
 	           --config $(PSYCLONE_CONFIG_FILE) \
 	           -s $(OPTIMISATION_PATH)/$(DSL)/global.py \
 	           -okern $(WORKING_DIR)/kernel \
 	           -oalg  $(WORKING_DIR)/$*.f90 \
-	           -opsy $(WORKING_DIR)/$*_psy.f90 $<
+	           -opsy $(WORKING_DIR)/$*_psy.f90 \
+			   $(PSYCLONE_PSYKAL_EXTRAS) \
+			   $<
 
 # Where no optimisation script exists, don't use it.
 #
@@ -76,7 +85,9 @@ $(WORKING_DIR)/%.x90 | $$(dir $$@)
 	           --config $(PSYCLONE_CONFIG_FILE) \
 	           -okern $(WORKING_DIR)/kernel \
 	           -oalg  $(WORKING_DIR)/$*.f90 \
-	           -opsy $(WORKING_DIR)/$*_psy.f90 $<
+	           -opsy $(WORKING_DIR)/$*_psy.f90 \
+			   $(PSYCLONE_PSYKAL_EXTRAS) \
+			   $<
 
 .PRECIOUS: $(WORKING_DIR)/%.x90
 # Perform preprocessing for big X90 files.

From 1b8de6aac72517ecf38f7671eba87f9bd9c35dcc Mon Sep 17 00:00:00 2001
From: MetBenjaminWent <benjamin.went@metoffice.gov.uk>
Date: Wed, 11 Feb 2026 13:22:42 +0000
Subject: [PATCH 2/3] Change init to occur if not already set

---
 infrastructure/build/psyclone/psyclone_psykal.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/infrastructure/build/psyclone/psyclone_psykal.mk b/infrastructure/build/psyclone/psyclone_psykal.mk
index f67c06251..3e3591fd5 100644
--- a/infrastructure/build/psyclone/psyclone_psykal.mk
+++ b/infrastructure/build/psyclone/psyclone_psykal.mk
@@ -13,7 +13,7 @@ DSL = psykal
 #
 
 # Set default psyclone command additional options
-PSYCLONE_PSYKAL_EXTRAS := -l all
+PSYCLONE_PSYKAL_EXTRAS ?= -l all
 #
 
 ALGORITHM_F_FILES := $(patsubst $(SOURCE_DIR)/%.X90, \

From 303d9d0f517580c46b3710924c2fa75c530e0e4f Mon Sep 17 00:00:00 2001
From: MetBenjaminWent <benjamin.went@metoffice.gov.uk>
Date: Thu, 12 Feb 2026 13:22:37 +0000
Subject: [PATCH 3/3] Correct formatting

---
 infrastructure/build/psyclone/psyclone_psykal.mk | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/infrastructure/build/psyclone/psyclone_psykal.mk b/infrastructure/build/psyclone/psyclone_psykal.mk
index 3e3591fd5..2d5afead4 100644
--- a/infrastructure/build/psyclone/psyclone_psykal.mk
+++ b/infrastructure/build/psyclone/psyclone_psykal.mk
@@ -57,8 +57,8 @@ $(WORKING_DIR)/%.x90 $$(OPTIMISATION_PATH)/$(DSL)/$$*.py | $$(dir $$@)
 	           -okern $(WORKING_DIR)/kernel \
 	           -oalg $(WORKING_DIR)/$*.f90 \
 	           -opsy $(WORKING_DIR)/$*_psy.f90 \
-			   $(PSYCLONE_PSYKAL_EXTRAS) \
-			   $<
+	           $(PSYCLONE_PSYKAL_EXTRAS) \
+	           $<
 
 # Where a global optimisation script exists, use it.
 #
@@ -72,8 +72,8 @@ $(WORKING_DIR)/%.x90 $(OPTIMISATION_PATH)/$(DSL)/global.py | $$(dir $$@)
 	           -okern $(WORKING_DIR)/kernel \
 	           -oalg  $(WORKING_DIR)/$*.f90 \
 	           -opsy $(WORKING_DIR)/$*_psy.f90 \
-			   $(PSYCLONE_PSYKAL_EXTRAS) \
-			   $<
+	           $(PSYCLONE_PSYKAL_EXTRAS) \
+	           $<
 
 # Where no optimisation script exists, don't use it.
 #
@@ -86,8 +86,8 @@ $(WORKING_DIR)/%.x90 | $$(dir $$@)
 	           -okern $(WORKING_DIR)/kernel \
 	           -oalg  $(WORKING_DIR)/$*.f90 \
 	           -opsy $(WORKING_DIR)/$*_psy.f90 \
-			   $(PSYCLONE_PSYKAL_EXTRAS) \
-			   $<
+	           $(PSYCLONE_PSYKAL_EXTRAS) \
+	           $<
 
 .PRECIOUS: $(WORKING_DIR)/%.x90
 # Perform preprocessing for big X90 files.