File metadata and Forecast reference Time Scalar to reduce post processing from lfric core

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"/>
 

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"/>
 

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"/>
 

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"/>
 

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"/>
 

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 -->

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 -->

applications/lfric_atm/metadata/grid_def_main.xml

@@ -3,112 +3,134 @@
   <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 -->
   <grid id="one_time_snow_layer_tile_grid">
     <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>

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>

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>
+</simulation>

dependencies.yaml

@@ -30,8 +30,8 @@ lfric_apps:
     ref:
 
 lfric_core:
-    source: [email protected]:MetOffice/lfric_core.git
-    ref: 5d4d72f0e35f00e71b1757df6beadec21ece97f0
+    source: [email protected]:mo-marqh/lfric_core.git
+    ref: 4ed0042622ab2b102d145534a2ce6da529a74a84
 
 moci:
     source: [email protected]:MetOffice/moci.git

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"/>
 

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"/>
 

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"/>
 

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"/>
 

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>

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"/>

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"/>

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"/>

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"/>

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"/>

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"/>

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"/>

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"/>