diff --git a/applications/gungho_model/example/iodef.xml b/applications/gungho_model/example/iodef.xml
index 200d45eae..7462a3e36 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 429b0160e..f47dcedb4 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 c85d7503a..a05415956 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 cc2410726..b0bc69ceb 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 7a100a000..4075d3e99 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 b649bf0f4..f2ce76669 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 96653326d..0d27e3459 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 954b013f9..3f8188b31 100644
--- a/applications/lfric_atm/metadata/grid_def_main.xml
+++ b/applications/lfric_atm/metadata/grid_def_main.xml
@@ -3,96 +3,115 @@
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -100,6 +119,7 @@
+
@@ -110,10 +130,12 @@
+
+
@@ -127,18 +149,21 @@
+
+
+
@@ -147,11 +172,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 b0827d902..4e9dfadd3 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 d3374f058..43e116925 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: 018e40c707091a4b08cb67cba5f5c4ab49303481
+ source: git@github.com:mo-marqh/lfric_core.git
+ ref: 59137504f09c8f4e28d555afde4319e5f3c81653
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 429b0160e..f47dcedb4 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 c85d7503a..a05415956 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 cc2410726..b0bc69ceb 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 7a100a000..30050354a 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 b649bf0f4..a15d6753b 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 56891cca4..a79eb6581 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 ea7ace037..e49dab5aa 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 43673f050..89706a6f3 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 8eb90dd84..f63ecbae1 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 e9ced2344..8a734bd98 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 df5e2ad13..9216b1ff8 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 0c1c15767..e21e3488a 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 b5516c69a..c7aedd2bb 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 c9252c608..307e78214 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 773a01820..a2743b0c0 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 f801f9c2d..b04d73fb9 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 32e19c499..eefdc5357 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 bc54bb678..2559cbaa0 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 73560214c..72a256a2d 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 @@
+
+
+
+
+
+
+