From 9309fa54a7324211224fb6962ce3ea2cea276d08 Mon Sep 17 00:00:00 2001
From: mo-marqh <87382490+mo-marqh@users.noreply.github.com>
Date: Mon, 1 Dec 2025 13:01:18 +0000
Subject: [PATCH 1/2] Provide forecast reference time scalar in XIOS XML
 interface. XIOS3 compatibility

---
 applications/gungho_model/example/iodef.xml   |  3 +++
 .../gungho_model/example/iodef_climate.xml    |  3 +++
 .../gungho_model/example/iodef_lam.xml        |  3 +++
 .../gungho_model/example/iodef_nwp.xml        |  3 +++
 .../example_forecast/iodef.xml                |  3 +++
 applications/jules/example/iodef.xml          |  1 +
 applications/lfric_atm/example/iodef.xml      |  2 ++
 .../lfric_atm/metadata/grid_def_main.xml      | 27 +++++++++++++++++++
 .../lfric_atm/metadata/scalar_def_main.xml    |  3 +++
 applications/ngarch/example/iodef.xml         |  5 +++-
 .../app/gungho_model/file/iodef_climate.xml   |  3 +++
 rose-stem/app/gungho_model/file/iodef_lam.xml |  3 +++
 rose-stem/app/gungho_model/file/iodef_nwp.xml |  3 +++
 rose-stem/app/jedi_forecast/file/iodef.xml    |  3 +++
 rose-stem/app/jules/file/iodef.xml            |  1 +
 .../app/lfric_atm/file/iodef_gal_clim.xml     |  3 +++
 .../lfric_atm/file/iodef_gal_clim_chem.xml    |  3 +++
 .../app/lfric_atm/file/iodef_gal_nwp.xml      |  3 +++
 .../file/iodef_gal_nwp_coarse_aero.xml        |  3 +++
 .../lfric_atm/file/iodef_gal_nwp_cycling.xml  |  3 +++
 .../app/lfric_atm/file/iodef_gal_nwp_hres.xml |  3 +++
 .../app/lfric_atm/file/iodef_idealised.xml    |  3 +++
 .../file/iodef_idealised_flexchem.xml         |  3 +++
 .../app/lfric_atm/file/iodef_ls_and_jedi.xml  |  3 +++
 rose-stem/app/lfric_atm/file/iodef_ral.xml    |  3 +++
 .../lfric_atm/file/iodef_ral_ls_and_jedi.xml  |  3 +++
 rose-stem/app/lfric_atm/file/iodef_test.xml   |  3 +++
 rose-stem/app/ngarch/file/iodef.xml           |  3 +++
 .../file/iodef_aquaplanet_lbc_stash_list.xml  | 11 ++++++++
 29 files changed, 115 insertions(+), 1 deletion(-)
 create mode 100644 applications/lfric_atm/metadata/scalar_def_main.xml

diff --git a/applications/gungho_model/example/iodef.xml b/applications/gungho_model/example/iodef.xml
index 9f260051..1ae62d8a 100644
--- a/applications/gungho_model/example/iodef.xml
+++ b/applications/gungho_model/example/iodef.xml
@@ -10,6 +10,9 @@
   <!-- Include variable definitions -->
   <variable_definition src="../../lfric_atm/metadata/variable_def_main.xml"/>
 
+  <!-- Include scalar definitions -->
+  <scalar_definition src="../../lfric_atm/metadata/scalar_def_main.xml"/>
+
   <!-- Include axis definitions -->
   <axis_definition src="../../lfric_atm/metadata/axis_def_main.xml"/>
 
diff --git a/applications/gungho_model/example/iodef_climate.xml b/applications/gungho_model/example/iodef_climate.xml
index e4bc3a88..280d02fb 100644
--- a/applications/gungho_model/example/iodef_climate.xml
+++ b/applications/gungho_model/example/iodef_climate.xml
@@ -10,6 +10,9 @@
   <!-- Include variable definitions -->
   <variable_definition src="$METADATA/variable_def_main.xml"/>
 
+  <!-- Include scalar definitions -->
+  <scalar_definition src="$METADATA/scalar_def_main.xml"/>
+
   <!-- Include axis definitions -->
   <axis_definition src="$METADATA/axis_def_main.xml"/>
 
diff --git a/applications/gungho_model/example/iodef_lam.xml b/applications/gungho_model/example/iodef_lam.xml
index 8c341742..9adc8935 100644
--- a/applications/gungho_model/example/iodef_lam.xml
+++ b/applications/gungho_model/example/iodef_lam.xml
@@ -10,6 +10,9 @@
   <!-- Include variable definitions -->
   <variable_definition src="$METADATA/variable_def_main.xml"/>
 
+  <!-- Include scalar definitions -->
+  <scalar_definition src="$METADATA/scalar_def_main.xml"/>
+
   <!-- Include axis definitions -->
   <axis_definition src="$METADATA/axis_def_main.xml"/>
 
diff --git a/applications/gungho_model/example/iodef_nwp.xml b/applications/gungho_model/example/iodef_nwp.xml
index 6c8a69c7..e0e89ff7 100644
--- a/applications/gungho_model/example/iodef_nwp.xml
+++ b/applications/gungho_model/example/iodef_nwp.xml
@@ -10,6 +10,9 @@
   <!-- Include variable definitions -->
   <variable_definition src="$METADATA/variable_def_main.xml"/>
 
+  <!-- Include scalar definitions -->
+  <scalar_definition src="$METADATA/scalar_def_main.xml"/>
+
   <!-- Include axis definitions -->
   <axis_definition src="$METADATA/axis_def_main.xml"/>
 
diff --git a/applications/jedi_lfric_tests/example_forecast/iodef.xml b/applications/jedi_lfric_tests/example_forecast/iodef.xml
index 5af66f24..964418ea 100644
--- a/applications/jedi_lfric_tests/example_forecast/iodef.xml
+++ b/applications/jedi_lfric_tests/example_forecast/iodef.xml
@@ -6,6 +6,9 @@
   <!-- Include variable definitions -->
   <variable_definition src="../../lfric_atm/metadata/variable_def_main.xml"/>
 
+  <!-- Include scalar definitions -->
+  <scalar_definition src="../../lfric_atm/metadata/scalar_def_main.xml"/>
+
   <!-- Include axis definitions -->
   <axis_definition src="../../lfric_atm/metadata/axis_def_main.xml"/>
 
diff --git a/applications/jules/example/iodef.xml b/applications/jules/example/iodef.xml
index 2c047aa1..f5ed433b 100644
--- a/applications/jules/example/iodef.xml
+++ b/applications/jules/example/iodef.xml
@@ -5,6 +5,7 @@
 
   <context id = "gungho_atm">
 
+    <scalar_definition src="../../lfric_atm/metadata/scalar_def_main.xml"/>
     <variable_definition src="../../lfric_atm/metadata/variable_def_main.xml"/>
     <axis_definition src="../../lfric_atm/metadata/axis_def_main.xml"/>
     <!-- Pressure level axes definitions -->
diff --git a/applications/lfric_atm/example/iodef.xml b/applications/lfric_atm/example/iodef.xml
index fc0a6ddb..9f9f1b42 100644
--- a/applications/lfric_atm/example/iodef.xml
+++ b/applications/lfric_atm/example/iodef.xml
@@ -5,6 +5,8 @@
 
   <context id = "gungho_atm">
 
+    <scalar_definition src="../metadata/scalar_def_main.xml"/>
+
     <variable_definition src="../metadata/variable_def_main.xml"/>
     <axis_definition src="../metadata/axis_def_main.xml"/>
     <!-- Pressure level axes definitions -->
diff --git a/applications/lfric_atm/metadata/grid_def_main.xml b/applications/lfric_atm/metadata/grid_def_main.xml
index bf68a5bc..5031186d 100644
--- a/applications/lfric_atm/metadata/grid_def_main.xml
+++ b/applications/lfric_atm/metadata/grid_def_main.xml
@@ -3,96 +3,115 @@
   <grid id="node_grid">
     <domain domain_ref="node"/>
     <axis axis_ref="vert_axis_full_levels"/>
+    <scalar scalar_ref="frt"/>
   </grid>
   <grid id="half_level_face_grid">
     <domain domain_ref="face"/>
     <axis axis_ref="vert_axis_half_levels"/>
+    <scalar scalar_ref="frt"/>
   </grid>
   <grid id="full_level_face_grid">
     <domain domain_ref="face"/>
     <axis axis_ref="vert_axis_full_levels"/>
+    <scalar scalar_ref="frt"/>
   </grid>
   <grid id="half_level_edge_grid">
     <domain domain_ref="edge"/>
     <axis axis_ref="vert_axis_half_levels"/>
+    <scalar scalar_ref="frt"/>
   </grid>
   <grid id="full_level_face_grid_aero_modes">
     <domain domain_ref="face"/>
     <axis axis_ref="vert_axis_full_levels"/>
     <axis axis_ref="aero_modes"/>
+    <scalar scalar_ref="frt"/>
   </grid>
   <grid id="full_level_face_grid_sw_bands_aero_modes">
     <domain domain_ref="face"/>
     <axis axis_ref="vert_axis_full_levels"/>
     <axis axis_ref="sw_bands_aero_modes"/>
+    <scalar scalar_ref="frt"/>
   </grid>
   <grid id="full_level_face_grid_lw_bands_aero_modes">
     <domain domain_ref="face"/>
     <axis axis_ref="vert_axis_full_levels"/>
     <axis axis_ref="lw_bands_aero_modes"/>
+    <scalar scalar_ref="frt"/>
   </grid>
   <grid id="full_level_face_grid_photolysis_pathways">
     <domain domain_ref="face"/>
     <axis axis_ref="vert_axis_full_levels"/>
     <axis axis_ref="photolysis_pathways"/>
+    <scalar scalar_ref="frt"/>
   </grid>
   <grid id="full_level_face_grid_photol_species">
     <domain domain_ref="face"/>
     <axis axis_ref="vert_axis_full_levels"/>
     <axis axis_ref="photol_species"/>
+    <scalar scalar_ref="frt"/>
   </grid>  
   <grid id="3D_monthly_grid">
     <domain domain_ref="face"/>
     <axis axis_ref="vert_axis_full_levels"/>
     <axis axis_ref="monthly_climatology"/>
+    <scalar scalar_ref="frt"/>
   </grid>
   <grid id="full_level_face_time_grid">
     <domain domain_ref="face"/>
     <axis axis_ref="vert_axis_full_levels"/>
     <axis axis_ref="lbc_axis"/>
+    <scalar scalar_ref="frt"/>
   </grid>
   <grid id="half_level_face_time_grid">
     <domain domain_ref="face"/>
     <axis axis_ref="vert_axis_half_levels"/>
     <axis axis_ref="lbc_axis"/>
+    <scalar scalar_ref="frt"/>
   </grid>
   <grid id="half_level_edge_time_grid">
     <domain domain_ref="edge"/>
     <axis axis_ref="vert_axis_half_levels"/>
     <axis axis_ref="lbc_axis"/>
+    <scalar scalar_ref="frt"/>
   </grid>
   <!-- N.B. time axis must be before multidata axis -->
   <grid id="pft_monthly_grid">
     <domain domain_ref="face"/>
     <axis axis_ref="monthly_climatology"/>
     <axis axis_ref="plant_func_types"/>
+    <scalar scalar_ref="frt"/>
   </grid>
   <grid id="full_level_face_grid_cloud_subcols">
     <domain domain_ref="face"/>
     <axis axis_ref="vert_axis_full_levels"/>
     <axis axis_ref="cloud_subcols"/>
+    <scalar scalar_ref="frt"/>
   </grid>
   <grid id="full_level_face_grid_sw_bands">
     <domain domain_ref="face"/>
     <axis axis_ref="vert_axis_full_levels"/>
     <axis axis_ref="sw_bands"/>
+    <scalar scalar_ref="frt"/>
   </grid>
   <grid id="full_level_face_grid_lw_bands">
     <domain domain_ref="face"/>
     <axis axis_ref="vert_axis_full_levels"/>
     <axis axis_ref="lw_bands"/>
+    <scalar scalar_ref="frt"/>
   </grid>
   <grid id="full_level_face_grid_sw_bands_monthly">
     <domain domain_ref="face"/>
     <axis axis_ref="vert_axis_full_levels"/>
     <axis axis_ref="monthly_climatology"/>
     <axis axis_ref="sw_bands"/>
+    <scalar scalar_ref="frt"/>
   </grid>
   <grid id="full_level_face_grid_lw_bands_monthly">
     <domain domain_ref="face"/>
     <axis axis_ref="vert_axis_full_levels"/>
     <axis axis_ref="monthly_climatology"/>
     <axis axis_ref="lw_bands"/>
+    <scalar scalar_ref="frt"/>
   </grid>
 
   <!-- for SURF ancillary style files -->
@@ -100,15 +119,18 @@
     <domain domain_ref="face"/>
     <axis axis_ref="snow_layers_and_tiles"/>
     <axis axis_ref="one_time_axis"/>
+    <scalar scalar_ref="frt"/>
   </grid>
   <grid id="one_time_tile_grid">
     <domain domain_ref="face"/>
     <axis axis_ref="land_tiles"/>
     <axis axis_ref="one_time_axis"/>
+    <scalar scalar_ref="frt"/>
   </grid>
 
   <grid id="scalar_grid">
     <axis axis_ref="scalar_axis"/>
+    <scalar scalar_ref="frt"/>
   </grid>
   <grid id="random_seed_grid">
     <axis axis_ref="random_seed_size"/>
@@ -119,18 +141,21 @@
     <axis axis_ref="vert_axis_full_levels" >
       <zoom_axis begin="0" n="1"/>
     </axis>
+    <scalar scalar_ref="frt"/>
   </grid>
   <grid id="full_level_1_face_zoom">
     <domain domain_ref="face"/>
     <axis axis_ref="vert_axis_full_levels" >
       <zoom_axis begin="1" n="1"/>
     </axis>
+    <scalar scalar_ref="frt"/>
   </grid>
   <grid id="half_level_1_face_zoom">
     <domain domain_ref="face"/>
     <axis axis_ref="vert_axis_half_levels" >
       <zoom_axis begin="0" n="1"/>
     </axis>
+    <scalar scalar_ref="frt"/>
   </grid>
 
   <!-- Reduce filters -->
@@ -139,11 +164,13 @@
     <scalar id="zmax">
       <reduce_axis operation="max" />
     </scalar>
+    <scalar scalar_ref="frt"/>
   </grid>
   <grid id="vert_sum_face_grid">
     <domain domain_ref="face"/>
     <scalar>
       <reduce_axis operation="sum" />
     </scalar>
+    <scalar scalar_ref="frt"/>
   </grid>
 </grid_definition>
diff --git a/applications/lfric_atm/metadata/scalar_def_main.xml b/applications/lfric_atm/metadata/scalar_def_main.xml
new file mode 100644
index 00000000..4ec5784b
--- /dev/null
+++ b/applications/lfric_atm/metadata/scalar_def_main.xml
@@ -0,0 +1,3 @@
+<scalar_definition>
+  <scalar id="frt" name="forecast_reference_time" standard_name="forecast_reference_time"/>
+</scalar_definition>
diff --git a/applications/ngarch/example/iodef.xml b/applications/ngarch/example/iodef.xml
index 48ffab88..bac57fc8 100644
--- a/applications/ngarch/example/iodef.xml
+++ b/applications/ngarch/example/iodef.xml
@@ -6,6 +6,9 @@
   <!-- In this version we have ONE context  -->
   <context id="gungho_atm">
 
+    <!-- Include scalar definitions -->
+    <scalar_definition src="./metadata/scalar_def_main.xml"/>
+
     <!-- Include variable definitions -->
     <variable_definition src="./metadata/variable_def_main.xml" />
 
@@ -107,4 +110,4 @@
     </variable_definition>
   </context>
 
-</simulation>
\ No newline at end of file
+</simulation>
diff --git a/rose-stem/app/gungho_model/file/iodef_climate.xml b/rose-stem/app/gungho_model/file/iodef_climate.xml
index e4bc3a88..280d02fb 100644
--- a/rose-stem/app/gungho_model/file/iodef_climate.xml
+++ b/rose-stem/app/gungho_model/file/iodef_climate.xml
@@ -10,6 +10,9 @@
   <!-- Include variable definitions -->
   <variable_definition src="$METADATA/variable_def_main.xml"/>
 
+  <!-- Include scalar definitions -->
+  <scalar_definition src="$METADATA/scalar_def_main.xml"/>
+
   <!-- Include axis definitions -->
   <axis_definition src="$METADATA/axis_def_main.xml"/>
 
diff --git a/rose-stem/app/gungho_model/file/iodef_lam.xml b/rose-stem/app/gungho_model/file/iodef_lam.xml
index 8c341742..9adc8935 100644
--- a/rose-stem/app/gungho_model/file/iodef_lam.xml
+++ b/rose-stem/app/gungho_model/file/iodef_lam.xml
@@ -10,6 +10,9 @@
   <!-- Include variable definitions -->
   <variable_definition src="$METADATA/variable_def_main.xml"/>
 
+  <!-- Include scalar definitions -->
+  <scalar_definition src="$METADATA/scalar_def_main.xml"/>
+
   <!-- Include axis definitions -->
   <axis_definition src="$METADATA/axis_def_main.xml"/>
 
diff --git a/rose-stem/app/gungho_model/file/iodef_nwp.xml b/rose-stem/app/gungho_model/file/iodef_nwp.xml
index 6c8a69c7..e0e89ff7 100644
--- a/rose-stem/app/gungho_model/file/iodef_nwp.xml
+++ b/rose-stem/app/gungho_model/file/iodef_nwp.xml
@@ -10,6 +10,9 @@
   <!-- Include variable definitions -->
   <variable_definition src="$METADATA/variable_def_main.xml"/>
 
+  <!-- Include scalar definitions -->
+  <scalar_definition src="$METADATA/scalar_def_main.xml"/>
+
   <!-- Include axis definitions -->
   <axis_definition src="$METADATA/axis_def_main.xml"/>
 
diff --git a/rose-stem/app/jedi_forecast/file/iodef.xml b/rose-stem/app/jedi_forecast/file/iodef.xml
index 5af66f24..52c9089f 100644
--- a/rose-stem/app/jedi_forecast/file/iodef.xml
+++ b/rose-stem/app/jedi_forecast/file/iodef.xml
@@ -6,6 +6,9 @@
   <!-- Include variable definitions -->
   <variable_definition src="../../lfric_atm/metadata/variable_def_main.xml"/>
 
+  <!-- Include scalar definitions -->
+  <scalar_definition src="$METADATA/scalar_def_main.xml"/>
+
   <!-- Include axis definitions -->
   <axis_definition src="../../lfric_atm/metadata/axis_def_main.xml"/>
 
diff --git a/rose-stem/app/jules/file/iodef.xml b/rose-stem/app/jules/file/iodef.xml
index 2c047aa1..ecf44b34 100644
--- a/rose-stem/app/jules/file/iodef.xml
+++ b/rose-stem/app/jules/file/iodef.xml
@@ -6,6 +6,7 @@
   <context id = "gungho_atm">
 
     <variable_definition src="../../lfric_atm/metadata/variable_def_main.xml"/>
+    <scalar_definition src="../../lfric_atm/metadata/scalar_def_main.xml"/>
     <axis_definition src="../../lfric_atm/metadata/axis_def_main.xml"/>
     <!-- Pressure level axes definitions -->
     <axis_definition>
diff --git a/rose-stem/app/lfric_atm/file/iodef_gal_clim.xml b/rose-stem/app/lfric_atm/file/iodef_gal_clim.xml
index 17279df2..5888b3db 100644
--- a/rose-stem/app/lfric_atm/file/iodef_gal_clim.xml
+++ b/rose-stem/app/lfric_atm/file/iodef_gal_clim.xml
@@ -9,6 +9,9 @@
     <!-- Include variable definitions -->
     <variable_definition src="$METADATA/variable_def_main.xml"/>
 
+    <!-- Include scalar definitions -->
+    <scalar_definition src="$METADATA/scalar_def_main.xml"/>
+
     <!-- Include axis definitions -->
     <axis_definition src="$METADATA/axis_def_main.xml"/>
     <axis_definition src="./axis_def_plev.xml"/>
diff --git a/rose-stem/app/lfric_atm/file/iodef_gal_clim_chem.xml b/rose-stem/app/lfric_atm/file/iodef_gal_clim_chem.xml
index c16adb17..31ffa39b 100644
--- a/rose-stem/app/lfric_atm/file/iodef_gal_clim_chem.xml
+++ b/rose-stem/app/lfric_atm/file/iodef_gal_clim_chem.xml
@@ -9,6 +9,9 @@
     <!-- Include variable definitions -->
     <variable_definition src="$METADATA/variable_def_main.xml"/>
 
+    <!-- Include scalar definitions -->
+    <scalar_definition src="$METADATA/scalar_def_main.xml"/>
+
     <!-- Include axis definitions -->
     <axis_definition src="$METADATA/axis_def_main.xml"/>
     <axis_definition src="./axis_def_plev.xml"/>
diff --git a/rose-stem/app/lfric_atm/file/iodef_gal_nwp.xml b/rose-stem/app/lfric_atm/file/iodef_gal_nwp.xml
index 4497d5ae..846718c6 100644
--- a/rose-stem/app/lfric_atm/file/iodef_gal_nwp.xml
+++ b/rose-stem/app/lfric_atm/file/iodef_gal_nwp.xml
@@ -9,6 +9,9 @@
     <!-- Include variable definitions -->
     <variable_definition src="$METADATA/variable_def_main.xml"/>
 
+    <!-- Include scalar definitions -->
+    <scalar_definition src="$METADATA/scalar_def_main.xml"/>
+
     <!-- Include axis definitions -->
     <axis_definition src="$METADATA/axis_def_main.xml"/>
     <axis_definition src="./axis_def_plev.xml"/>
diff --git a/rose-stem/app/lfric_atm/file/iodef_gal_nwp_coarse_aero.xml b/rose-stem/app/lfric_atm/file/iodef_gal_nwp_coarse_aero.xml
index 67e34a20..13caaaec 100644
--- a/rose-stem/app/lfric_atm/file/iodef_gal_nwp_coarse_aero.xml
+++ b/rose-stem/app/lfric_atm/file/iodef_gal_nwp_coarse_aero.xml
@@ -9,6 +9,9 @@
     <!-- Include variable definitions -->
     <variable_definition src="$METADATA/variable_def_main.xml"/>
 
+    <!-- Include scalar definitions -->
+    <scalar_definition src="$METADATA/scalar_def_main.xml"/>
+
     <!-- Include axis definitions -->
     <axis_definition src="$METADATA/axis_def_main.xml"/>
     <axis_definition src="./axis_def_plev.xml"/>
diff --git a/rose-stem/app/lfric_atm/file/iodef_gal_nwp_cycling.xml b/rose-stem/app/lfric_atm/file/iodef_gal_nwp_cycling.xml
index 9dd58f86..729d7263 100644
--- a/rose-stem/app/lfric_atm/file/iodef_gal_nwp_cycling.xml
+++ b/rose-stem/app/lfric_atm/file/iodef_gal_nwp_cycling.xml
@@ -9,6 +9,9 @@
     <!-- Include variable definitions -->
     <variable_definition src="$METADATA/variable_def_main.xml"/>
 
+    <!-- Include scalar definitions -->
+    <scalar_definition src="$METADATA/scalar_def_main.xml"/>
+
     <!-- Include axis definitions -->
     <axis_definition src="$METADATA/axis_def_main.xml"/>
     <axis_definition src="./axis_def_plev.xml"/>
diff --git a/rose-stem/app/lfric_atm/file/iodef_gal_nwp_hres.xml b/rose-stem/app/lfric_atm/file/iodef_gal_nwp_hres.xml
index 17b6b131..15098409 100644
--- a/rose-stem/app/lfric_atm/file/iodef_gal_nwp_hres.xml
+++ b/rose-stem/app/lfric_atm/file/iodef_gal_nwp_hres.xml
@@ -9,6 +9,9 @@
     <!-- Include variable definitions -->
     <variable_definition src="$METADATA/variable_def_main.xml"/>
 
+    <!-- Include scalar definitions -->
+    <scalar_definition src="$METADATA/scalar_def_main.xml"/>
+
     <!-- Include axis definitions -->
     <axis_definition src="$METADATA/axis_def_main.xml"/>
     <axis_definition src="./axis_def_plev.xml"/>
diff --git a/rose-stem/app/lfric_atm/file/iodef_idealised.xml b/rose-stem/app/lfric_atm/file/iodef_idealised.xml
index 9ec63cf7..c3694b0e 100644
--- a/rose-stem/app/lfric_atm/file/iodef_idealised.xml
+++ b/rose-stem/app/lfric_atm/file/iodef_idealised.xml
@@ -9,6 +9,9 @@
     <!-- Include variable definitions -->
     <variable_definition src="$METADATA/variable_def_main.xml"/>
 
+    <!-- Include scalar definitions -->
+    <scalar_definition src="$METADATA/scalar_def_main.xml"/>
+
     <!-- Include axis definitions -->
     <axis_definition src="$METADATA/axis_def_main.xml"/>
     <axis_definition src="./axis_def_plev.xml"/>
diff --git a/rose-stem/app/lfric_atm/file/iodef_idealised_flexchem.xml b/rose-stem/app/lfric_atm/file/iodef_idealised_flexchem.xml
index e3e6318f..2120e455 100644
--- a/rose-stem/app/lfric_atm/file/iodef_idealised_flexchem.xml
+++ b/rose-stem/app/lfric_atm/file/iodef_idealised_flexchem.xml
@@ -9,6 +9,9 @@
     <!-- Include variable definitions -->
     <variable_definition src="$METADATA/variable_def_main.xml"/>
 
+    <!-- Include scalar definitions -->
+    <scalar_definition src="$METADATA/scalar_def_main.xml"/>
+
     <!-- Include axis definitions -->
     <axis_definition src="$METADATA/axis_def_main.xml"/>
     <axis_definition src="./axis_def_plev.xml"/>
diff --git a/rose-stem/app/lfric_atm/file/iodef_ls_and_jedi.xml b/rose-stem/app/lfric_atm/file/iodef_ls_and_jedi.xml
index fed2ed7e..9fc3f6ea 100644
--- a/rose-stem/app/lfric_atm/file/iodef_ls_and_jedi.xml
+++ b/rose-stem/app/lfric_atm/file/iodef_ls_and_jedi.xml
@@ -9,6 +9,9 @@
     <!-- Include variable definitions -->
     <variable_definition src="$METADATA/variable_def_main.xml"/>
 
+    <!-- Include scalar definitions -->
+    <scalar_definition src="$METADATA/scalar_def_main.xml"/>
+
     <!-- Include axis definitions -->
     <axis_definition src="$METADATA/axis_def_main.xml"/>
     <axis_definition src="./axis_def_plev.xml"/>
diff --git a/rose-stem/app/lfric_atm/file/iodef_ral.xml b/rose-stem/app/lfric_atm/file/iodef_ral.xml
index 3fec01cf..ee9d90da 100644
--- a/rose-stem/app/lfric_atm/file/iodef_ral.xml
+++ b/rose-stem/app/lfric_atm/file/iodef_ral.xml
@@ -9,6 +9,9 @@
     <!-- Include variable definitions -->
     <variable_definition src="$METADATA/variable_def_main.xml"/>
 
+    <!-- Include scalar definitions -->
+    <scalar_definition src="$METADATA/scalar_def_main.xml"/>
+
     <!-- Include axis definitions -->
     <axis_definition src="$METADATA/axis_def_main.xml"/>
     <axis_definition src="./axis_def_plev.xml"/>
diff --git a/rose-stem/app/lfric_atm/file/iodef_ral_ls_and_jedi.xml b/rose-stem/app/lfric_atm/file/iodef_ral_ls_and_jedi.xml
index fd5ee8c6..c1038135 100644
--- a/rose-stem/app/lfric_atm/file/iodef_ral_ls_and_jedi.xml
+++ b/rose-stem/app/lfric_atm/file/iodef_ral_ls_and_jedi.xml
@@ -9,6 +9,9 @@
     <!-- Include variable definitions -->
     <variable_definition src="$METADATA/variable_def_main.xml"/>
 
+    <!-- Include scalar definitions -->
+    <scalar_definition src="$METADATA/scalar_def_main.xml"/>
+
     <!-- Include axis definitions -->
     <axis_definition src="$METADATA/axis_def_main.xml"/>
     <axis_definition src="./axis_def_plev.xml"/>
diff --git a/rose-stem/app/lfric_atm/file/iodef_test.xml b/rose-stem/app/lfric_atm/file/iodef_test.xml
index 6d584583..cfdd0ab0 100644
--- a/rose-stem/app/lfric_atm/file/iodef_test.xml
+++ b/rose-stem/app/lfric_atm/file/iodef_test.xml
@@ -9,6 +9,9 @@
     <!-- Include variable definitions -->
     <variable_definition src="$METADATA/variable_def_main.xml"/>
 
+    <!-- Include scalar definitions -->
+    <scalar_definition src="$METADATA/scalar_def_main.xml"/>
+
     <!-- Include axis definitions -->
     <axis_definition src="$METADATA/axis_def_main.xml"/>
     <axis_definition src="./axis_def_plev.xml"/>
diff --git a/rose-stem/app/ngarch/file/iodef.xml b/rose-stem/app/ngarch/file/iodef.xml
index 1c392371..9c21615f 100644
--- a/rose-stem/app/ngarch/file/iodef.xml
+++ b/rose-stem/app/ngarch/file/iodef.xml
@@ -7,6 +7,9 @@
 
     <variable_definition src="$METADATA/variable_def_main.xml"/>
     <axis_definition src="$METADATA/axis_def_main.xml"/>
+    <!-- Include scalar definitions -->
+    <scalar_definition src="$METADATA/scalar_def_main.xml"/>
+
     <!-- Pressure level axes definitions -->
     <axis_definition>
       <axis id="pressure_levels" name="pressure_levels" n_glo="29" value="(0,28)[100000 95000 92500 90000 85000 70000 60000 50000 40000 30000 25000 20000 15000 10000 7000 5000 3000 2000 1000 700 500 300 200 100 70 50 30 20 10]"/>
diff --git a/rose-stem/app/um2lfric/file/iodef_aquaplanet_lbc_stash_list.xml b/rose-stem/app/um2lfric/file/iodef_aquaplanet_lbc_stash_list.xml
index 1e3db353..0a1db0f9 100644
--- a/rose-stem/app/um2lfric/file/iodef_aquaplanet_lbc_stash_list.xml
+++ b/rose-stem/app/um2lfric/file/iodef_aquaplanet_lbc_stash_list.xml
@@ -5,6 +5,10 @@
 
   <context id = "gungho_atm">
 
+    <scalar_definition>
+      <scalar id="frt" name="forecast_reference_time" standard_name="forecast_reference_time"/>
+    </scalar_definition>
+
     <axis_definition>
       <axis id="vert_axis_half_levels" name="half_levels"/>
       <axis id="vert_axis_full_levels" name="full_levels"/>
@@ -18,30 +22,37 @@
       <grid id="node_grid">
         <domain domain_ref="node"/>
         <axis axis_ref="vert_axis_full_levels"/>
+	<scalar scalar_ref="frt"/>
       </grid>
       <grid id="half_level_face_grid">
         <domain domain_ref="face"/>
         <axis axis_ref="vert_axis_half_levels"/>
+	<scalar scalar_ref="frt"/>
       </grid>
       <grid id="full_level_face_grid">
         <domain domain_ref="face"/>
         <axis axis_ref="vert_axis_full_levels"/>
+	<scalar scalar_ref="frt"/>
       </grid>
       <grid id="half_level_edge_grid">
         <domain domain_ref="edge"/>
         <axis axis_ref="vert_axis_half_levels"/>
+	<scalar scalar_ref="frt"/>
       </grid>
       <grid id="soil_levels_face_grid">
         <domain domain_ref="face"/>
         <axis axis_ref="soil_levels"/>
+	<scalar scalar_ref="frt"/>
       </grid>
       <grid id="land_tiles_face_grid">
         <domain domain_ref="face"/>
         <axis axis_ref="land_tiles"/>
+	<scalar scalar_ref="frt"/>
       </grid>
       <grid id="snow_layers_face_grid">
         <domain domain_ref="face"/>
         <axis axis_ref="snow_layers_and_tiles"/>
+	<scalar scalar_ref="frt"/>
       </grid>
     </grid_definition>
 

From 9ca20755abcf0b5404b3a70a8785c560598f777b Mon Sep 17 00:00:00 2001
From: mo-marqh <87382490+mo-marqh@users.noreply.github.com>
Date: Tue, 6 Jan 2026 15:17:28 +0000
Subject: [PATCH 2/2] linked branch dependency

---
 dependencies.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dependencies.yaml b/dependencies.yaml
index 473a2c6e..cf3f9cb2 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -30,8 +30,8 @@ lfric_apps:
     ref:
 
 lfric_core:
-    source: git@github.com:MetOffice/lfric_core.git
-    ref: 5d4d72f0e35f00e71b1757df6beadec21ece97f0
+    source: git@github.com:mo-marqh/lfric_core.git
+    ref: 4ed0042622ab2b102d145534a2ce6da529a74a84
 
 moci:
     source: git@github.com:MetOffice/moci.git