diff --git a/applications/adjoint_tests/example/iodef.xml b/applications/adjoint_tests/example/iodef.xml index 4e14df122..1f81ac267 100644 --- a/applications/adjoint_tests/example/iodef.xml +++ b/applications/adjoint_tests/example/iodef.xml @@ -246,6 +246,7 @@ + @@ -256,6 +257,7 @@ + @@ -297,6 +299,7 @@ + @@ -306,16 +309,20 @@ + + + + @@ -327,7 +334,8 @@ - + + diff --git a/applications/gravity_wave/example/iodef.xml b/applications/gravity_wave/example/iodef.xml index b7156638d..fa2b10191 100644 --- a/applications/gravity_wave/example/iodef.xml +++ b/applications/gravity_wave/example/iodef.xml @@ -74,9 +74,11 @@ + + diff --git a/applications/gungho_model/lam_example/baroclinic/iodef.xml b/applications/gungho_model/lam_example/baroclinic/iodef.xml index df6dbb0b9..0ccadd924 100644 --- a/applications/gungho_model/lam_example/baroclinic/iodef.xml +++ b/applications/gungho_model/lam_example/baroclinic/iodef.xml @@ -238,6 +238,7 @@ + @@ -248,6 +249,7 @@ + @@ -333,6 +335,7 @@ + @@ -343,23 +346,28 @@ + + - + + - + + - + + diff --git a/applications/gungho_model/lam_example/straka/iodef.xml b/applications/gungho_model/lam_example/straka/iodef.xml index 4dc78bad4..ef3649196 100644 --- a/applications/gungho_model/lam_example/straka/iodef.xml +++ b/applications/gungho_model/lam_example/straka/iodef.xml @@ -238,6 +238,7 @@ + @@ -248,7 +249,8 @@ - + + @@ -333,6 +335,7 @@ + @@ -343,23 +346,28 @@ + + - + + - + + - + + diff --git a/applications/jedi_lfric_tests/example/iodef.xml b/applications/jedi_lfric_tests/example/iodef.xml index 90edb87ac..62fa39108 100644 --- a/applications/jedi_lfric_tests/example/iodef.xml +++ b/applications/jedi_lfric_tests/example/iodef.xml @@ -253,6 +253,7 @@ + @@ -263,6 +264,7 @@ + @@ -304,6 +306,7 @@ + @@ -313,16 +316,20 @@ + + + + @@ -336,7 +343,8 @@ - + + diff --git a/applications/jedi_lfric_tests/example_forecast/iodef.xml b/applications/jedi_lfric_tests/example_forecast/iodef.xml index 7a100a000..3b1b923fc 100644 --- a/applications/jedi_lfric_tests/example_forecast/iodef.xml +++ b/applications/jedi_lfric_tests/example_forecast/iodef.xml @@ -207,6 +207,7 @@ + @@ -217,12 +218,15 @@ + + + diff --git a/applications/jedi_lfric_tests/example_forecast_pseudo/iodef.xml b/applications/jedi_lfric_tests/example_forecast_pseudo/iodef.xml index 5aade9f56..2e3a557d4 100644 --- a/applications/jedi_lfric_tests/example_forecast_pseudo/iodef.xml +++ b/applications/jedi_lfric_tests/example_forecast_pseudo/iodef.xml @@ -36,7 +36,7 @@ - + diff --git a/applications/jedi_lfric_tests/example_id_tlm_tests/iodef.xml b/applications/jedi_lfric_tests/example_id_tlm_tests/iodef.xml index 4a65814b5..361672676 100644 --- a/applications/jedi_lfric_tests/example_id_tlm_tests/iodef.xml +++ b/applications/jedi_lfric_tests/example_id_tlm_tests/iodef.xml @@ -36,7 +36,7 @@ - + @@ -66,7 +66,7 @@ - + diff --git a/applications/jedi_lfric_tests/example_tlm_forecast_tl/iodef.xml b/applications/jedi_lfric_tests/example_tlm_forecast_tl/iodef.xml index 4a65814b5..361672676 100644 --- a/applications/jedi_lfric_tests/example_tlm_forecast_tl/iodef.xml +++ b/applications/jedi_lfric_tests/example_tlm_forecast_tl/iodef.xml @@ -36,7 +36,7 @@ - + @@ -66,7 +66,7 @@ - + diff --git a/applications/jedi_lfric_tests/example_tlm_tests/iodef.xml b/applications/jedi_lfric_tests/example_tlm_tests/iodef.xml index 4a65814b5..361672676 100644 --- a/applications/jedi_lfric_tests/example_tlm_tests/iodef.xml +++ b/applications/jedi_lfric_tests/example_tlm_tests/iodef.xml @@ -36,7 +36,7 @@ - + @@ -66,7 +66,7 @@ - + diff --git a/applications/lfric2lfric/example/iodef.xml b/applications/lfric2lfric/example/iodef.xml index 42fddc6f0..8f94ecfa0 100644 --- a/applications/lfric2lfric/example/iodef.xml +++ b/applications/lfric2lfric/example/iodef.xml @@ -17,14 +17,14 @@ - + - + @@ -33,7 +33,9 @@ + + @@ -71,7 +73,9 @@ + + diff --git a/applications/lfric_coupled/example/iodef.xml b/applications/lfric_coupled/example/iodef.xml index e84891cc3..9890b01cb 100644 --- a/applications/lfric_coupled/example/iodef.xml +++ b/applications/lfric_coupled/example/iodef.xml @@ -324,6 +324,7 @@ + @@ -334,6 +335,7 @@ + @@ -362,6 +364,7 @@ + @@ -379,10 +382,12 @@ + + @@ -390,44 +395,60 @@ + + + + + + + + + + + + + + + + @@ -438,26 +459,34 @@ + + + + + + + + @@ -476,6 +505,7 @@ + diff --git a/applications/linear_model/example/iodef.xml b/applications/linear_model/example/iodef.xml index e00c7e843..9a86bc592 100644 --- a/applications/linear_model/example/iodef.xml +++ b/applications/linear_model/example/iodef.xml @@ -245,6 +245,7 @@ + @@ -255,6 +256,7 @@ + @@ -333,6 +335,7 @@ + @@ -343,16 +346,20 @@ - + + + - + + + @@ -365,7 +372,8 @@ - + + diff --git a/applications/linear_model/example_file/iodef.xml b/applications/linear_model/example_file/iodef.xml index f8232d261..bdce63f8f 100644 --- a/applications/linear_model/example_file/iodef.xml +++ b/applications/linear_model/example_file/iodef.xml @@ -230,6 +230,7 @@ + @@ -240,7 +241,8 @@ - + + @@ -318,6 +320,7 @@ + @@ -328,16 +331,20 @@ - + + + - + + + @@ -350,7 +357,8 @@ - + + diff --git a/applications/name_transport/example/iodef.xml b/applications/name_transport/example/iodef.xml index aebf8ba46..4d44fe879 100644 --- a/applications/name_transport/example/iodef.xml +++ b/applications/name_transport/example/iodef.xml @@ -76,9 +76,11 @@ + + diff --git a/applications/ngarch/example/iodef.xml b/applications/ngarch/example/iodef.xml index b0827d902..2870568f4 100644 --- a/applications/ngarch/example/iodef.xml +++ b/applications/ngarch/example/iodef.xml @@ -44,6 +44,7 @@ + @@ -86,6 +87,7 @@ + diff --git a/applications/shallow_water/example/iodef.xml b/applications/shallow_water/example/iodef.xml index 14f51a55f..5244c0785 100644 --- a/applications/shallow_water/example/iodef.xml +++ b/applications/shallow_water/example/iodef.xml @@ -100,10 +100,12 @@ + + diff --git a/applications/transport/example/iodef.xml b/applications/transport/example/iodef.xml index 19554bb49..8f0cf11db 100644 --- a/applications/transport/example/iodef.xml +++ b/applications/transport/example/iodef.xml @@ -122,6 +122,7 @@ + @@ -134,6 +135,7 @@ + diff --git a/rose-stem/app/gravity_wave/file/iodef.xml b/rose-stem/app/gravity_wave/file/iodef.xml index b7156638d..fa2b10191 100644 --- a/rose-stem/app/gravity_wave/file/iodef.xml +++ b/rose-stem/app/gravity_wave/file/iodef.xml @@ -74,9 +74,11 @@ + + diff --git a/rose-stem/app/gungho_model/file/file_def_ancil.xml b/rose-stem/app/gungho_model/file/file_def_ancil.xml index 43c9e9e44..118703884 100644 --- a/rose-stem/app/gungho_model/file/file_def_ancil.xml +++ b/rose-stem/app/gungho_model/file/file_def_ancil.xml @@ -3,7 +3,7 @@ - + diff --git a/rose-stem/app/gungho_model/file/file_def_initial.xml b/rose-stem/app/gungho_model/file/file_def_initial.xml index 42cf3bfec..92255d125 100644 --- a/rose-stem/app/gungho_model/file/file_def_initial.xml +++ b/rose-stem/app/gungho_model/file/file_def_initial.xml @@ -1,7 +1,6 @@ - @@ -15,7 +14,6 @@ - - \ No newline at end of file + diff --git a/rose-stem/app/jedi_forecast/file/iodef.xml b/rose-stem/app/jedi_forecast/file/iodef.xml index 7a100a000..5f35653fa 100644 --- a/rose-stem/app/jedi_forecast/file/iodef.xml +++ b/rose-stem/app/jedi_forecast/file/iodef.xml @@ -207,6 +207,7 @@ + @@ -217,13 +218,16 @@ - + + + - + + @@ -264,7 +268,7 @@ - + diff --git a/rose-stem/app/jedi_forecast_pseudo/file/iodef.xml b/rose-stem/app/jedi_forecast_pseudo/file/iodef.xml index 5aade9f56..2e3a557d4 100644 --- a/rose-stem/app/jedi_forecast_pseudo/file/iodef.xml +++ b/rose-stem/app/jedi_forecast_pseudo/file/iodef.xml @@ -36,7 +36,7 @@ - + diff --git a/rose-stem/app/jedi_id_tlm_tests/file/iodef.xml b/rose-stem/app/jedi_id_tlm_tests/file/iodef.xml index 4a65814b5..5fec9d8ff 100644 --- a/rose-stem/app/jedi_id_tlm_tests/file/iodef.xml +++ b/rose-stem/app/jedi_id_tlm_tests/file/iodef.xml @@ -36,7 +36,7 @@ - + @@ -66,7 +66,7 @@ - + @@ -414,7 +414,9 @@ + + diff --git a/rose-stem/app/jedi_lfric_tests/file/iodef.xml b/rose-stem/app/jedi_lfric_tests/file/iodef.xml index dfb5b1345..17e9f85d8 100644 --- a/rose-stem/app/jedi_lfric_tests/file/iodef.xml +++ b/rose-stem/app/jedi_lfric_tests/file/iodef.xml @@ -253,6 +253,7 @@ + @@ -263,6 +264,7 @@ + @@ -304,6 +306,7 @@ + @@ -313,12 +316,15 @@ + + + diff --git a/rose-stem/app/jedi_tlm_forecast_tl/file/iodef.xml b/rose-stem/app/jedi_tlm_forecast_tl/file/iodef.xml index 4a65814b5..5fec9d8ff 100644 --- a/rose-stem/app/jedi_tlm_forecast_tl/file/iodef.xml +++ b/rose-stem/app/jedi_tlm_forecast_tl/file/iodef.xml @@ -36,7 +36,7 @@ - + @@ -66,7 +66,7 @@ - + @@ -414,7 +414,9 @@ + + diff --git a/rose-stem/app/jedi_tlm_tests/file/iodef.xml b/rose-stem/app/jedi_tlm_tests/file/iodef.xml index 4a65814b5..5fec9d8ff 100644 --- a/rose-stem/app/jedi_tlm_tests/file/iodef.xml +++ b/rose-stem/app/jedi_tlm_tests/file/iodef.xml @@ -36,7 +36,7 @@ - + @@ -66,7 +66,7 @@ - + @@ -414,7 +414,9 @@ + + diff --git a/rose-stem/app/lfric2lfric/file/iodef.xml b/rose-stem/app/lfric2lfric/file/iodef.xml index 0c4135087..cb32afeb4 100644 --- a/rose-stem/app/lfric2lfric/file/iodef.xml +++ b/rose-stem/app/lfric2lfric/file/iodef.xml @@ -17,6 +17,7 @@ + @@ -24,7 +25,7 @@ - + diff --git a/rose-stem/app/lfric2lfric/file/iodef_orography.xml b/rose-stem/app/lfric2lfric/file/iodef_orography.xml index f47e20e95..39b9f4a0c 100644 --- a/rose-stem/app/lfric2lfric/file/iodef_orography.xml +++ b/rose-stem/app/lfric2lfric/file/iodef_orography.xml @@ -17,6 +17,7 @@ + @@ -24,7 +25,7 @@ - + @@ -32,7 +33,9 @@ + + diff --git a/rose-stem/app/lfric2lfric/file/iodef_ral.xml b/rose-stem/app/lfric2lfric/file/iodef_ral.xml index 7f17ac192..d96cb79ff 100644 --- a/rose-stem/app/lfric2lfric/file/iodef_ral.xml +++ b/rose-stem/app/lfric2lfric/file/iodef_ral.xml @@ -17,7 +17,7 @@ - + @@ -189,7 +189,7 @@ - + diff --git a/rose-stem/app/lfric2lfric/file/iodef_ral3.xml b/rose-stem/app/lfric2lfric/file/iodef_ral3.xml index a75a2f338..5aecad602 100644 --- a/rose-stem/app/lfric2lfric/file/iodef_ral3.xml +++ b/rose-stem/app/lfric2lfric/file/iodef_ral3.xml @@ -17,6 +17,7 @@ + @@ -76,7 +77,7 @@ - + diff --git a/rose-stem/app/lfric2um/file/iodef.xml b/rose-stem/app/lfric2um/file/iodef.xml index d10d607d4..a0efdf81c 100644 --- a/rose-stem/app/lfric2um/file/iodef.xml +++ b/rose-stem/app/lfric2um/file/iodef.xml @@ -52,6 +52,7 @@ + @@ -69,6 +70,7 @@ + diff --git a/rose-stem/app/lfric2um/file/iodef_performance.xml b/rose-stem/app/lfric2um/file/iodef_performance.xml index 32803f8b9..d580c1713 100644 --- a/rose-stem/app/lfric2um/file/iodef_performance.xml +++ b/rose-stem/app/lfric2um/file/iodef_performance.xml @@ -52,6 +52,7 @@ + @@ -69,6 +70,7 @@ + diff --git a/rose-stem/app/lfric2um/file/iodef_um_lam.xml b/rose-stem/app/lfric2um/file/iodef_um_lam.xml index 8144df871..4428d912f 100644 --- a/rose-stem/app/lfric2um/file/iodef_um_lam.xml +++ b/rose-stem/app/lfric2um/file/iodef_um_lam.xml @@ -52,6 +52,7 @@ + @@ -63,6 +64,7 @@ + diff --git a/rose-stem/app/lfric_atm/file/file_def_ancil_gal.xml b/rose-stem/app/lfric_atm/file/file_def_ancil_gal.xml index 6bcb984da..d246dae5b 100644 --- a/rose-stem/app/lfric_atm/file/file_def_ancil_gal.xml +++ b/rose-stem/app/lfric_atm/file/file_def_ancil_gal.xml @@ -2,6 +2,7 @@ + @@ -10,19 +11,26 @@ + + + + + + + diff --git a/rose-stem/app/lfric_atm/file/file_def_ancil_hadisst.xml b/rose-stem/app/lfric_atm/file/file_def_ancil_hadisst.xml index 043e2911f..2f783cef3 100644 --- a/rose-stem/app/lfric_atm/file/file_def_ancil_hadisst.xml +++ b/rose-stem/app/lfric_atm/file/file_def_ancil_hadisst.xml @@ -2,14 +2,18 @@ + + + + diff --git a/rose-stem/app/lfric_atm/file/file_def_ancil_idealised.xml b/rose-stem/app/lfric_atm/file/file_def_ancil_idealised.xml index ac89d1ae0..96d9830e5 100644 --- a/rose-stem/app/lfric_atm/file/file_def_ancil_idealised.xml +++ b/rose-stem/app/lfric_atm/file/file_def_ancil_idealised.xml @@ -2,6 +2,7 @@ + @@ -16,10 +17,13 @@ + + + diff --git a/rose-stem/app/lfric_atm/file/file_def_ancil_main.xml b/rose-stem/app/lfric_atm/file/file_def_ancil_main.xml index b48fa864a..79d82e4c7 100644 --- a/rose-stem/app/lfric_atm/file/file_def_ancil_main.xml +++ b/rose-stem/app/lfric_atm/file/file_def_ancil_main.xml @@ -2,25 +2,34 @@ + + + + + + + + + @@ -30,32 +39,42 @@ + + + + + + + + + + @@ -74,68 +93,93 @@ + + - + + + - + + + - + + + - + + + - + + + - + + + - + + + - + + + - + + + - + + + - + + + - + + @@ -148,8 +192,10 @@ + + @@ -163,18 +209,24 @@ + + + + + + @@ -188,8 +240,10 @@ + + @@ -208,52 +262,71 @@ + + + + + + + + + + + + + + + + + + + @@ -266,36 +339,51 @@ + + + + + + + + + + + + + + + diff --git a/rose-stem/app/lfric_atm/file/file_def_ancil_ral.xml b/rose-stem/app/lfric_atm/file/file_def_ancil_ral.xml index d7b467187..97899d7bf 100644 --- a/rose-stem/app/lfric_atm/file/file_def_ancil_ral.xml +++ b/rose-stem/app/lfric_atm/file/file_def_ancil_ral.xml @@ -2,6 +2,7 @@ + @@ -12,19 +13,26 @@ + + + + + + + diff --git a/rose-stem/app/lfric_atm/file/file_def_ancil_reynolds.xml b/rose-stem/app/lfric_atm/file/file_def_ancil_reynolds.xml index 075a7525e..63ef2c739 100644 --- a/rose-stem/app/lfric_atm/file/file_def_ancil_reynolds.xml +++ b/rose-stem/app/lfric_atm/file/file_def_ancil_reynolds.xml @@ -2,13 +2,17 @@ + + + + diff --git a/rose-stem/app/lfric_atm/file/file_def_ancil_surf.xml b/rose-stem/app/lfric_atm/file/file_def_ancil_surf.xml index ef4833322..9abf8a141 100644 --- a/rose-stem/app/lfric_atm/file/file_def_ancil_surf.xml +++ b/rose-stem/app/lfric_atm/file/file_def_ancil_surf.xml @@ -2,14 +2,18 @@ + + + + diff --git a/rose-stem/app/lfric_atm/file/file_def_lbcs.xml b/rose-stem/app/lfric_atm/file/file_def_lbcs.xml index 61c303553..7b4de4ea9 100644 --- a/rose-stem/app/lfric_atm/file/file_def_lbcs.xml +++ b/rose-stem/app/lfric_atm/file/file_def_lbcs.xml @@ -2,6 +2,7 @@ + @@ -16,6 +17,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..ef8e603d8 100644 --- a/rose-stem/app/lfric_atm/file/iodef_gal_clim.xml +++ b/rose-stem/app/lfric_atm/file/iodef_gal_clim.xml @@ -43,6 +43,7 @@ + @@ -83,6 +84,7 @@ + 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..400278939 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 @@ -43,6 +43,7 @@ + @@ -165,6 +166,7 @@ + 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..0589cec2e 100644 --- a/rose-stem/app/lfric_atm/file/iodef_gal_nwp.xml +++ b/rose-stem/app/lfric_atm/file/iodef_gal_nwp.xml @@ -45,6 +45,7 @@ + @@ -87,6 +88,7 @@ + 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..d65d04336 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 @@ -45,6 +45,7 @@ + @@ -87,6 +88,7 @@ + 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..be864ef00 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 @@ -47,6 +47,7 @@ + @@ -89,6 +90,7 @@ + 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..03a729074 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 @@ -45,6 +45,7 @@ + @@ -87,6 +88,7 @@ + diff --git a/rose-stem/app/lfric_atm/file/iodef_idealised.xml b/rose-stem/app/lfric_atm/file/iodef_idealised.xml index 0c1c15767..09201e33f 100644 --- a/rose-stem/app/lfric_atm/file/iodef_idealised.xml +++ b/rose-stem/app/lfric_atm/file/iodef_idealised.xml @@ -41,6 +41,7 @@ + @@ -60,6 +61,7 @@ + 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..51935bae6 100644 --- a/rose-stem/app/lfric_atm/file/iodef_idealised_flexchem.xml +++ b/rose-stem/app/lfric_atm/file/iodef_idealised_flexchem.xml @@ -42,6 +42,7 @@ + @@ -61,6 +62,7 @@ + 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..a973d6b2d 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 @@ -43,6 +43,7 @@ + @@ -85,6 +86,7 @@ + diff --git a/rose-stem/app/lfric_atm/file/iodef_ral.xml b/rose-stem/app/lfric_atm/file/iodef_ral.xml index 773a01820..e732c187f 100644 --- a/rose-stem/app/lfric_atm/file/iodef_ral.xml +++ b/rose-stem/app/lfric_atm/file/iodef_ral.xml @@ -45,6 +45,7 @@ + @@ -86,6 +87,7 @@ + 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..eb07c9618 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 @@ -46,6 +46,7 @@ + @@ -87,6 +88,7 @@ + diff --git a/rose-stem/app/lfric_atm/file/iodef_test.xml b/rose-stem/app/lfric_atm/file/iodef_test.xml index 32e19c499..c3884b57f 100644 --- a/rose-stem/app/lfric_atm/file/iodef_test.xml +++ b/rose-stem/app/lfric_atm/file/iodef_test.xml @@ -43,6 +43,7 @@ + @@ -85,6 +86,7 @@ + diff --git a/rose-stem/app/lfric_atm/file/iodef_test1.xml b/rose-stem/app/lfric_atm/file/iodef_test1.xml index 79e093b55..34a8a6778 100644 --- a/rose-stem/app/lfric_atm/file/iodef_test1.xml +++ b/rose-stem/app/lfric_atm/file/iodef_test1.xml @@ -43,6 +43,7 @@ + @@ -85,6 +86,7 @@ + diff --git a/rose-stem/app/lfric_coupled_atmosphere/file/iodef_basic_gal.xml b/rose-stem/app/lfric_coupled_atmosphere/file/iodef_basic_gal.xml index a98e7aa5a..34b6899ce 100644 --- a/rose-stem/app/lfric_coupled_atmosphere/file/iodef_basic_gal.xml +++ b/rose-stem/app/lfric_coupled_atmosphere/file/iodef_basic_gal.xml @@ -819,6 +819,7 @@ + @@ -829,6 +830,7 @@ + @@ -924,6 +926,7 @@ + @@ -963,10 +966,12 @@ + + @@ -976,44 +981,60 @@ + + + + + + + + + + + + + + + + @@ -1023,26 +1044,34 @@ + + + + + + + + @@ -1061,98 +1090,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/rose-stem/app/name_transport/file/iodef.xml b/rose-stem/app/name_transport/file/iodef.xml index a7328f5be..687bb9a73 100644 --- a/rose-stem/app/name_transport/file/iodef.xml +++ b/rose-stem/app/name_transport/file/iodef.xml @@ -75,10 +75,12 @@ + - + + diff --git a/rose-stem/app/scintelapi/file/iodef.xml b/rose-stem/app/scintelapi/file/iodef.xml index 9c0ec56e2..5274f09b5 100644 --- a/rose-stem/app/scintelapi/file/iodef.xml +++ b/rose-stem/app/scintelapi/file/iodef.xml @@ -57,6 +57,7 @@ + @@ -67,17 +68,22 @@ + + + + + diff --git a/rose-stem/app/scintelapi/file/iodef_basic.xml b/rose-stem/app/scintelapi/file/iodef_basic.xml index 18c8cc1ed..9493f1b80 100644 --- a/rose-stem/app/scintelapi/file/iodef_basic.xml +++ b/rose-stem/app/scintelapi/file/iodef_basic.xml @@ -58,6 +58,7 @@ + @@ -68,17 +69,22 @@ - + + + + + + diff --git a/rose-stem/app/scintelapi/file/iodef_mixingratio.xml b/rose-stem/app/scintelapi/file/iodef_mixingratio.xml index a853623e7..2a5cee0fb 100644 --- a/rose-stem/app/scintelapi/file/iodef_mixingratio.xml +++ b/rose-stem/app/scintelapi/file/iodef_mixingratio.xml @@ -47,6 +47,7 @@ + @@ -57,7 +58,8 @@ - + + diff --git a/rose-stem/app/shallow_water/file/iodef.xml b/rose-stem/app/shallow_water/file/iodef.xml index e25596689..ca3ac5269 100644 --- a/rose-stem/app/shallow_water/file/iodef.xml +++ b/rose-stem/app/shallow_water/file/iodef.xml @@ -112,6 +112,7 @@ + @@ -119,7 +120,8 @@ - + + diff --git a/rose-stem/app/transport/file/iodef.xml b/rose-stem/app/transport/file/iodef.xml index 19554bb49..580fde09d 100644 --- a/rose-stem/app/transport/file/iodef.xml +++ b/rose-stem/app/transport/file/iodef.xml @@ -122,6 +122,7 @@ + @@ -134,7 +135,8 @@ - + + diff --git a/rose-stem/app/transport/file/iodef_coarse_aero.xml b/rose-stem/app/transport/file/iodef_coarse_aero.xml index 90d33e368..6783193e1 100644 --- a/rose-stem/app/transport/file/iodef_coarse_aero.xml +++ b/rose-stem/app/transport/file/iodef_coarse_aero.xml @@ -138,6 +138,7 @@ + @@ -150,7 +151,8 @@ - + + diff --git a/rose-stem/app/um2lfric/file/iodef_basicgal_stash_list.xml b/rose-stem/app/um2lfric/file/iodef_basicgal_stash_list.xml index b3618b94f..58850c632 100644 --- a/rose-stem/app/um2lfric/file/iodef_basicgal_stash_list.xml +++ b/rose-stem/app/um2lfric/file/iodef_basicgal_stash_list.xml @@ -153,7 +153,9 @@ + + diff --git a/rose-stem/app/um2lfric/file/iodef_falklands_lam_stash_list.xml b/rose-stem/app/um2lfric/file/iodef_falklands_lam_stash_list.xml index c7bb9306c..fff09b80a 100644 --- a/rose-stem/app/um2lfric/file/iodef_falklands_lam_stash_list.xml +++ b/rose-stem/app/um2lfric/file/iodef_falklands_lam_stash_list.xml @@ -160,7 +160,9 @@ + + diff --git a/rose-stem/app/um2lfric/file/iodef_nwp_gal9_stash_list.xml b/rose-stem/app/um2lfric/file/iodef_nwp_gal9_stash_list.xml index 68787eee8..036901e08 100644 --- a/rose-stem/app/um2lfric/file/iodef_nwp_gal9_stash_list.xml +++ b/rose-stem/app/um2lfric/file/iodef_nwp_gal9_stash_list.xml @@ -165,7 +165,9 @@ + + diff --git a/rose-stem/app/um2lfric/file/iodef_protogal_chem_stash_list.xml b/rose-stem/app/um2lfric/file/iodef_protogal_chem_stash_list.xml index 7990b0677..e32927e15 100644 --- a/rose-stem/app/um2lfric/file/iodef_protogal_chem_stash_list.xml +++ b/rose-stem/app/um2lfric/file/iodef_protogal_chem_stash_list.xml @@ -421,7 +421,9 @@ + + diff --git a/rose-stem/app/um2lfric/file/iodef_protogal_stash_list.xml b/rose-stem/app/um2lfric/file/iodef_protogal_stash_list.xml index 294b86c17..b5283e6a4 100644 --- a/rose-stem/app/um2lfric/file/iodef_protogal_stash_list.xml +++ b/rose-stem/app/um2lfric/file/iodef_protogal_stash_list.xml @@ -193,7 +193,9 @@ + + diff --git a/rose-stem/site/meto/lfric_atm/tasks_lfric_atm_ex1a.cylc b/rose-stem/site/meto/lfric_atm/tasks_lfric_atm_ex1a.cylc index 776d176ed..32feb493b 100644 --- a/rose-stem/site/meto/lfric_atm/tasks_lfric_atm_ex1a.cylc +++ b/rose-stem/site/meto/lfric_atm/tasks_lfric_atm_ex1a.cylc @@ -19,13 +19,13 @@ {% elif task_ns.conf_name == "nwp_gal9_coarse_aero_threaded-C48_MG" %} {% do task_dict.update({ - "memory": [24, "GB"], + "memory": [36, "GB"], }) %} {% elif task_ns.conf_name == "nwp_gal9_debug-C48_MG" %} {% do task_dict.update({ - "memory": [36, "GB"], + "memory": [48, "GB"], }) %} {% elif task_ns.conf_name == "clim_gal9-C12" %} diff --git a/science/linear/integration-test/runge_kutta/iodef.xml b/science/linear/integration-test/runge_kutta/iodef.xml index 1c4e6d3c3..d9337ce67 100644 --- a/science/linear/integration-test/runge_kutta/iodef.xml +++ b/science/linear/integration-test/runge_kutta/iodef.xml @@ -155,6 +155,7 @@ + @@ -165,6 +166,7 @@ + @@ -236,6 +238,7 @@ + @@ -246,13 +249,16 @@ + + - + + diff --git a/science/linear/integration-test/semi_implicit/iodef.xml b/science/linear/integration-test/semi_implicit/iodef.xml index 341d11896..cefe8c022 100644 --- a/science/linear/integration-test/semi_implicit/iodef.xml +++ b/science/linear/integration-test/semi_implicit/iodef.xml @@ -154,6 +154,7 @@ + @@ -164,6 +165,7 @@ + @@ -235,6 +237,7 @@ + @@ -245,13 +248,16 @@ + + - + +