diff --git a/applications/gungho_model/example/iodef.xml b/applications/gungho_model/example/iodef.xml
index 9f2600514..1ae62d8a0 100644
--- a/applications/gungho_model/example/iodef.xml
+++ b/applications/gungho_model/example/iodef.xml
@@ -10,6 +10,9 @@
+
+
+
diff --git a/applications/gungho_model/example/iodef_climate.xml b/applications/gungho_model/example/iodef_climate.xml
index e4bc3a888..280d02fb3 100644
--- a/applications/gungho_model/example/iodef_climate.xml
+++ b/applications/gungho_model/example/iodef_climate.xml
@@ -10,6 +10,9 @@
+
+
+
diff --git a/applications/gungho_model/example/iodef_lam.xml b/applications/gungho_model/example/iodef_lam.xml
index 8c3417421..9adc89351 100644
--- a/applications/gungho_model/example/iodef_lam.xml
+++ b/applications/gungho_model/example/iodef_lam.xml
@@ -10,6 +10,9 @@
+
+
+
diff --git a/applications/gungho_model/example/iodef_nwp.xml b/applications/gungho_model/example/iodef_nwp.xml
index 6c8a69c76..e0e89ff7e 100644
--- a/applications/gungho_model/example/iodef_nwp.xml
+++ b/applications/gungho_model/example/iodef_nwp.xml
@@ -10,6 +10,9 @@
+
+
+
diff --git a/applications/jedi_lfric_tests/example_forecast/iodef.xml b/applications/jedi_lfric_tests/example_forecast/iodef.xml
index 5af66f247..964418ea7 100644
--- a/applications/jedi_lfric_tests/example_forecast/iodef.xml
+++ b/applications/jedi_lfric_tests/example_forecast/iodef.xml
@@ -6,6 +6,9 @@
+
+
+
diff --git a/applications/jules/example/iodef.xml b/applications/jules/example/iodef.xml
index 2c047aa1d..f5ed433b4 100644
--- a/applications/jules/example/iodef.xml
+++ b/applications/jules/example/iodef.xml
@@ -5,6 +5,7 @@
+
diff --git a/applications/lfric_atm/example/iodef.xml b/applications/lfric_atm/example/iodef.xml
index fc0a6ddb2..9f9f1b420 100644
--- a/applications/lfric_atm/example/iodef.xml
+++ b/applications/lfric_atm/example/iodef.xml
@@ -5,6 +5,8 @@
+
+
diff --git a/applications/lfric_atm/metadata/grid_def_main.xml b/applications/lfric_atm/metadata/grid_def_main.xml
index bf68a5bcf..5031186d5 100644
--- a/applications/lfric_atm/metadata/grid_def_main.xml
+++ b/applications/lfric_atm/metadata/grid_def_main.xml
@@ -3,96 +3,115 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -100,15 +119,18 @@
+
+
+
@@ -119,18 +141,21 @@
+
+
+
@@ -139,11 +164,13 @@
+
+
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 000000000..4ec5784bc
--- /dev/null
+++ b/applications/lfric_atm/metadata/scalar_def_main.xml
@@ -0,0 +1,3 @@
+
+
+
diff --git a/applications/ngarch/example/iodef.xml b/applications/ngarch/example/iodef.xml
index 48ffab882..bac57fc86 100644
--- a/applications/ngarch/example/iodef.xml
+++ b/applications/ngarch/example/iodef.xml
@@ -6,6 +6,9 @@
+
+
+
@@ -107,4 +110,4 @@
-
\ No newline at end of file
+
diff --git a/dependencies.yaml b/dependencies.yaml
index 473a2c6ee..cf3f9cb26 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
diff --git a/rose-stem/app/gungho_model/file/iodef_climate.xml b/rose-stem/app/gungho_model/file/iodef_climate.xml
index e4bc3a888..280d02fb3 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 @@
+
+
+
diff --git a/rose-stem/app/gungho_model/file/iodef_lam.xml b/rose-stem/app/gungho_model/file/iodef_lam.xml
index 8c3417421..9adc89351 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 @@
+
+
+
diff --git a/rose-stem/app/gungho_model/file/iodef_nwp.xml b/rose-stem/app/gungho_model/file/iodef_nwp.xml
index 6c8a69c76..e0e89ff7e 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 @@
+
+
+
diff --git a/rose-stem/app/jedi_forecast/file/iodef.xml b/rose-stem/app/jedi_forecast/file/iodef.xml
index 5af66f247..52c9089fb 100644
--- a/rose-stem/app/jedi_forecast/file/iodef.xml
+++ b/rose-stem/app/jedi_forecast/file/iodef.xml
@@ -6,6 +6,9 @@
+
+
+
diff --git a/rose-stem/app/jules/file/iodef.xml b/rose-stem/app/jules/file/iodef.xml
index 2c047aa1d..ecf44b34f 100644
--- a/rose-stem/app/jules/file/iodef.xml
+++ b/rose-stem/app/jules/file/iodef.xml
@@ -6,6 +6,7 @@
+
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 17279df2c..5888b3dbd 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 @@
+
+
+
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 c16adb171..31ffa39b9 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 @@
+
+
+
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 4497d5ae5..846718c69 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 @@
+
+
+
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 67e34a204..13caaaeca 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 @@
+
+
+
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 9dd58f867..729d72632 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 @@
+
+
+
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 17b6b1319..15098409a 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 @@
+
+
+
diff --git a/rose-stem/app/lfric_atm/file/iodef_idealised.xml b/rose-stem/app/lfric_atm/file/iodef_idealised.xml
index 9ec63cf7b..c3694b0ec 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 @@
+
+
+
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 e3e6318f5..2120e455b 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 @@
+
+
+
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 fed2ed7ed..9fc3f6ea4 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 @@
+
+
+
diff --git a/rose-stem/app/lfric_atm/file/iodef_ral.xml b/rose-stem/app/lfric_atm/file/iodef_ral.xml
index 3fec01cfa..ee9d90da0 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 @@
+
+
+
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 fd5ee8c68..c10381353 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 @@
+
+
+
diff --git a/rose-stem/app/lfric_atm/file/iodef_test.xml b/rose-stem/app/lfric_atm/file/iodef_test.xml
index 6d584583c..cfdd0ab08 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 @@
+
+
+
diff --git a/rose-stem/app/ngarch/file/iodef.xml b/rose-stem/app/ngarch/file/iodef.xml
index 1c3923716..9c21615f4 100644
--- a/rose-stem/app/ngarch/file/iodef.xml
+++ b/rose-stem/app/ngarch/file/iodef.xml
@@ -7,6 +7,9 @@
+
+
+
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 1e3db353c..0a1db0f92 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 @@
+
+
+
+
@@ -18,30 +22,37 @@
+
+
+
+
+
+
+