diff --git a/applications/adjoint_tests/rose-meta/lfric-adjoint_tests/versions.py b/applications/adjoint_tests/rose-meta/lfric-adjoint_tests/versions.py index a1c801554..8bab40a9e 100644 --- a/applications/adjoint_tests/rose-meta/lfric-adjoint_tests/versions.py +++ b/applications/adjoint_tests/rose-meta/lfric-adjoint_tests/versions.py @@ -155,3 +155,19 @@ def upgrade(self, config, meta_config=None): ) return config, self.reports + + +class vn30_t214(MacroUpgrade): + """Upgrade macro for ticket #214 by mark Hedley.""" + + BEFORE_TAG = "vn3.0_t171" + AFTER_TAG = "vn3.0_t214" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + """Set segments configuration to true.""" + self.change_setting_value( + config, ["namelist:physics", "configure_segments"], ".true." + ) + + return config, self.reports diff --git a/applications/gravity_wave/rose-meta/lfric-gravity_wave/versions.py b/applications/gravity_wave/rose-meta/lfric-gravity_wave/versions.py index a1c801554..8bab40a9e 100644 --- a/applications/gravity_wave/rose-meta/lfric-gravity_wave/versions.py +++ b/applications/gravity_wave/rose-meta/lfric-gravity_wave/versions.py @@ -155,3 +155,19 @@ def upgrade(self, config, meta_config=None): ) return config, self.reports + + +class vn30_t214(MacroUpgrade): + """Upgrade macro for ticket #214 by mark Hedley.""" + + BEFORE_TAG = "vn3.0_t171" + AFTER_TAG = "vn3.0_t214" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + """Set segments configuration to true.""" + self.change_setting_value( + config, ["namelist:physics", "configure_segments"], ".true." + ) + + return config, self.reports diff --git a/applications/gungho_model/rose-meta/lfric-gungho_model/versions.py b/applications/gungho_model/rose-meta/lfric-gungho_model/versions.py index a1c801554..8bab40a9e 100644 --- a/applications/gungho_model/rose-meta/lfric-gungho_model/versions.py +++ b/applications/gungho_model/rose-meta/lfric-gungho_model/versions.py @@ -155,3 +155,19 @@ def upgrade(self, config, meta_config=None): ) return config, self.reports + + +class vn30_t214(MacroUpgrade): + """Upgrade macro for ticket #214 by mark Hedley.""" + + BEFORE_TAG = "vn3.0_t171" + AFTER_TAG = "vn3.0_t214" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + """Set segments configuration to true.""" + self.change_setting_value( + config, ["namelist:physics", "configure_segments"], ".true." + ) + + return config, self.reports diff --git a/applications/jedi_lfric_tests/rose-meta/jedi_common/versions.py b/applications/jedi_lfric_tests/rose-meta/jedi_common/versions.py index 4b795d2b5..1e18b9488 100644 --- a/applications/jedi_lfric_tests/rose-meta/jedi_common/versions.py +++ b/applications/jedi_lfric_tests/rose-meta/jedi_common/versions.py @@ -165,3 +165,19 @@ def upgrade(self, config, meta_config=None): ) return config, self.reports + + +class vn30_t214(MacroUpgrade): + """Upgrade macro for ticket #214 by mark Hedley.""" + + BEFORE_TAG = "vn3.0_t132" + AFTER_TAG = "vn3.0_t214" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + """Set segments configuration to true.""" + self.change_setting_value( + config, ["namelist:physics", "configure_segments"], ".true." + ) + + return config, self.reports diff --git a/applications/jedi_lfric_tests/rose-meta/jedi_forecast/versions.py b/applications/jedi_lfric_tests/rose-meta/jedi_forecast/versions.py index 3b9573106..cc4bf28dd 100644 --- a/applications/jedi_lfric_tests/rose-meta/jedi_forecast/versions.py +++ b/applications/jedi_lfric_tests/rose-meta/jedi_forecast/versions.py @@ -172,3 +172,19 @@ def upgrade(self, config, meta_config=None): ) return config, self.reports + + +class vn30_t214(MacroUpgrade): + """Upgrade macro for ticket #214 by mark Hedley.""" + + BEFORE_TAG = "vn3.0_t132" + AFTER_TAG = "vn3.0_t214" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + """Set segments configuration to true.""" + self.change_setting_value( + config, ["namelist:physics", "configure_segments"], ".true." + ) + + return config, self.reports diff --git a/applications/jedi_lfric_tests/rose-meta/jedi_forecast_pseudo/versions.py b/applications/jedi_lfric_tests/rose-meta/jedi_forecast_pseudo/versions.py index 3b9573106..cc4bf28dd 100644 --- a/applications/jedi_lfric_tests/rose-meta/jedi_forecast_pseudo/versions.py +++ b/applications/jedi_lfric_tests/rose-meta/jedi_forecast_pseudo/versions.py @@ -172,3 +172,19 @@ def upgrade(self, config, meta_config=None): ) return config, self.reports + + +class vn30_t214(MacroUpgrade): + """Upgrade macro for ticket #214 by mark Hedley.""" + + BEFORE_TAG = "vn3.0_t132" + AFTER_TAG = "vn3.0_t214" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + """Set segments configuration to true.""" + self.change_setting_value( + config, ["namelist:physics", "configure_segments"], ".true." + ) + + return config, self.reports diff --git a/applications/jedi_lfric_tests/rose-meta/jedi_id_tlm_tests/versions.py b/applications/jedi_lfric_tests/rose-meta/jedi_id_tlm_tests/versions.py index 3b9573106..cc4bf28dd 100644 --- a/applications/jedi_lfric_tests/rose-meta/jedi_id_tlm_tests/versions.py +++ b/applications/jedi_lfric_tests/rose-meta/jedi_id_tlm_tests/versions.py @@ -172,3 +172,19 @@ def upgrade(self, config, meta_config=None): ) return config, self.reports + + +class vn30_t214(MacroUpgrade): + """Upgrade macro for ticket #214 by mark Hedley.""" + + BEFORE_TAG = "vn3.0_t132" + AFTER_TAG = "vn3.0_t214" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + """Set segments configuration to true.""" + self.change_setting_value( + config, ["namelist:physics", "configure_segments"], ".true." + ) + + return config, self.reports diff --git a/applications/jedi_lfric_tests/rose-meta/jedi_lfric_tests/versions.py b/applications/jedi_lfric_tests/rose-meta/jedi_lfric_tests/versions.py index 3b9573106..cc4bf28dd 100644 --- a/applications/jedi_lfric_tests/rose-meta/jedi_lfric_tests/versions.py +++ b/applications/jedi_lfric_tests/rose-meta/jedi_lfric_tests/versions.py @@ -172,3 +172,19 @@ def upgrade(self, config, meta_config=None): ) return config, self.reports + + +class vn30_t214(MacroUpgrade): + """Upgrade macro for ticket #214 by mark Hedley.""" + + BEFORE_TAG = "vn3.0_t132" + AFTER_TAG = "vn3.0_t214" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + """Set segments configuration to true.""" + self.change_setting_value( + config, ["namelist:physics", "configure_segments"], ".true." + ) + + return config, self.reports diff --git a/applications/jedi_lfric_tests/rose-meta/jedi_tlm_forecast_tl/versions.py b/applications/jedi_lfric_tests/rose-meta/jedi_tlm_forecast_tl/versions.py index 3b9573106..cc4bf28dd 100644 --- a/applications/jedi_lfric_tests/rose-meta/jedi_tlm_forecast_tl/versions.py +++ b/applications/jedi_lfric_tests/rose-meta/jedi_tlm_forecast_tl/versions.py @@ -172,3 +172,19 @@ def upgrade(self, config, meta_config=None): ) return config, self.reports + + +class vn30_t214(MacroUpgrade): + """Upgrade macro for ticket #214 by mark Hedley.""" + + BEFORE_TAG = "vn3.0_t132" + AFTER_TAG = "vn3.0_t214" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + """Set segments configuration to true.""" + self.change_setting_value( + config, ["namelist:physics", "configure_segments"], ".true." + ) + + return config, self.reports diff --git a/applications/jedi_lfric_tests/rose-meta/jedi_tlm_tests/versions.py b/applications/jedi_lfric_tests/rose-meta/jedi_tlm_tests/versions.py index 3b9573106..cc4bf28dd 100644 --- a/applications/jedi_lfric_tests/rose-meta/jedi_tlm_tests/versions.py +++ b/applications/jedi_lfric_tests/rose-meta/jedi_tlm_tests/versions.py @@ -172,3 +172,19 @@ def upgrade(self, config, meta_config=None): ) return config, self.reports + + +class vn30_t214(MacroUpgrade): + """Upgrade macro for ticket #214 by mark Hedley.""" + + BEFORE_TAG = "vn3.0_t132" + AFTER_TAG = "vn3.0_t214" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + """Set segments configuration to true.""" + self.change_setting_value( + config, ["namelist:physics", "configure_segments"], ".true." + ) + + return config, self.reports diff --git a/applications/jules/rose-meta/lfric-jules/versions.py b/applications/jules/rose-meta/lfric-jules/versions.py index a1c801554..8bab40a9e 100644 --- a/applications/jules/rose-meta/lfric-jules/versions.py +++ b/applications/jules/rose-meta/lfric-jules/versions.py @@ -155,3 +155,19 @@ def upgrade(self, config, meta_config=None): ) return config, self.reports + + +class vn30_t214(MacroUpgrade): + """Upgrade macro for ticket #214 by mark Hedley.""" + + BEFORE_TAG = "vn3.0_t171" + AFTER_TAG = "vn3.0_t214" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + """Set segments configuration to true.""" + self.change_setting_value( + config, ["namelist:physics", "configure_segments"], ".true." + ) + + return config, self.reports diff --git a/applications/lfric2lfric/rose-meta/lfric-lfric2lfric/versions.py b/applications/lfric2lfric/rose-meta/lfric-lfric2lfric/versions.py index e9795387b..85f9ad8cf 100644 --- a/applications/lfric2lfric/rose-meta/lfric-lfric2lfric/versions.py +++ b/applications/lfric2lfric/rose-meta/lfric-lfric2lfric/versions.py @@ -171,3 +171,19 @@ def upgrade(self, config, meta_config=None): ) return config, self.reports + + +class vn30_t214(MacroUpgrade): + """Upgrade macro for ticket #214 by mark Hedley.""" + + BEFORE_TAG = "vn3.0_t48" + AFTER_TAG = "vn3.0_t214" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + """Set segments configuration to true.""" + self.change_setting_value( + config, ["namelist:physics", "configure_segments"], ".true." + ) + + return config, self.reports diff --git a/applications/lfric_atm/rose-meta/lfric-lfric_atm/versions.py b/applications/lfric_atm/rose-meta/lfric-lfric_atm/versions.py index a1c801554..8bab40a9e 100644 --- a/applications/lfric_atm/rose-meta/lfric-lfric_atm/versions.py +++ b/applications/lfric_atm/rose-meta/lfric-lfric_atm/versions.py @@ -155,3 +155,19 @@ def upgrade(self, config, meta_config=None): ) return config, self.reports + + +class vn30_t214(MacroUpgrade): + """Upgrade macro for ticket #214 by mark Hedley.""" + + BEFORE_TAG = "vn3.0_t171" + AFTER_TAG = "vn3.0_t214" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + """Set segments configuration to true.""" + self.change_setting_value( + config, ["namelist:physics", "configure_segments"], ".true." + ) + + return config, self.reports diff --git a/applications/lfric_coupled/rose-meta/lfric-lfric_coupled/versions.py b/applications/lfric_coupled/rose-meta/lfric-lfric_coupled/versions.py index a1c801554..8bab40a9e 100644 --- a/applications/lfric_coupled/rose-meta/lfric-lfric_coupled/versions.py +++ b/applications/lfric_coupled/rose-meta/lfric-lfric_coupled/versions.py @@ -155,3 +155,19 @@ def upgrade(self, config, meta_config=None): ) return config, self.reports + + +class vn30_t214(MacroUpgrade): + """Upgrade macro for ticket #214 by mark Hedley.""" + + BEFORE_TAG = "vn3.0_t171" + AFTER_TAG = "vn3.0_t214" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + """Set segments configuration to true.""" + self.change_setting_value( + config, ["namelist:physics", "configure_segments"], ".true." + ) + + return config, self.reports diff --git a/applications/linear_model/rose-meta/lfric-linear_model/versions.py b/applications/linear_model/rose-meta/lfric-linear_model/versions.py index a1c801554..8bab40a9e 100644 --- a/applications/linear_model/rose-meta/lfric-linear_model/versions.py +++ b/applications/linear_model/rose-meta/lfric-linear_model/versions.py @@ -155,3 +155,19 @@ def upgrade(self, config, meta_config=None): ) return config, self.reports + + +class vn30_t214(MacroUpgrade): + """Upgrade macro for ticket #214 by mark Hedley.""" + + BEFORE_TAG = "vn3.0_t171" + AFTER_TAG = "vn3.0_t214" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + """Set segments configuration to true.""" + self.change_setting_value( + config, ["namelist:physics", "configure_segments"], ".true." + ) + + return config, self.reports diff --git a/applications/name_transport/rose-meta/lfric-name_transport/versions.py b/applications/name_transport/rose-meta/lfric-name_transport/versions.py index a1c801554..8bab40a9e 100644 --- a/applications/name_transport/rose-meta/lfric-name_transport/versions.py +++ b/applications/name_transport/rose-meta/lfric-name_transport/versions.py @@ -155,3 +155,19 @@ def upgrade(self, config, meta_config=None): ) return config, self.reports + + +class vn30_t214(MacroUpgrade): + """Upgrade macro for ticket #214 by mark Hedley.""" + + BEFORE_TAG = "vn3.0_t171" + AFTER_TAG = "vn3.0_t214" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + """Set segments configuration to true.""" + self.change_setting_value( + config, ["namelist:physics", "configure_segments"], ".true." + ) + + return config, self.reports diff --git a/applications/ngarch/rose-meta/lfric-ngarch/versions.py b/applications/ngarch/rose-meta/lfric-ngarch/versions.py index a1c801554..8bab40a9e 100644 --- a/applications/ngarch/rose-meta/lfric-ngarch/versions.py +++ b/applications/ngarch/rose-meta/lfric-ngarch/versions.py @@ -155,3 +155,19 @@ def upgrade(self, config, meta_config=None): ) return config, self.reports + + +class vn30_t214(MacroUpgrade): + """Upgrade macro for ticket #214 by mark Hedley.""" + + BEFORE_TAG = "vn3.0_t171" + AFTER_TAG = "vn3.0_t214" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + """Set segments configuration to true.""" + self.change_setting_value( + config, ["namelist:physics", "configure_segments"], ".true." + ) + + return config, self.reports diff --git a/applications/shallow_water/rose-meta/lfric-shallow_water/versions.py b/applications/shallow_water/rose-meta/lfric-shallow_water/versions.py index a1c801554..8bab40a9e 100644 --- a/applications/shallow_water/rose-meta/lfric-shallow_water/versions.py +++ b/applications/shallow_water/rose-meta/lfric-shallow_water/versions.py @@ -155,3 +155,19 @@ def upgrade(self, config, meta_config=None): ) return config, self.reports + + +class vn30_t214(MacroUpgrade): + """Upgrade macro for ticket #214 by mark Hedley.""" + + BEFORE_TAG = "vn3.0_t171" + AFTER_TAG = "vn3.0_t214" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + """Set segments configuration to true.""" + self.change_setting_value( + config, ["namelist:physics", "configure_segments"], ".true." + ) + + return config, self.reports diff --git a/applications/transport/rose-meta/lfric-transport/versions.py b/applications/transport/rose-meta/lfric-transport/versions.py index a1c801554..8bab40a9e 100644 --- a/applications/transport/rose-meta/lfric-transport/versions.py +++ b/applications/transport/rose-meta/lfric-transport/versions.py @@ -155,3 +155,19 @@ def upgrade(self, config, meta_config=None): ) return config, self.reports + + +class vn30_t214(MacroUpgrade): + """Upgrade macro for ticket #214 by mark Hedley.""" + + BEFORE_TAG = "vn3.0_t171" + AFTER_TAG = "vn3.0_t214" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + """Set segments configuration to true.""" + self.change_setting_value( + config, ["namelist:physics", "configure_segments"], ".true." + ) + + return config, self.reports diff --git a/interfaces/coupled_interface/rose-meta/coupling/versions.py b/interfaces/coupled_interface/rose-meta/coupling/versions.py index a1c801554..8bab40a9e 100644 --- a/interfaces/coupled_interface/rose-meta/coupling/versions.py +++ b/interfaces/coupled_interface/rose-meta/coupling/versions.py @@ -155,3 +155,19 @@ def upgrade(self, config, meta_config=None): ) return config, self.reports + + +class vn30_t214(MacroUpgrade): + """Upgrade macro for ticket #214 by mark Hedley.""" + + BEFORE_TAG = "vn3.0_t171" + AFTER_TAG = "vn3.0_t214" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + """Set segments configuration to true.""" + self.change_setting_value( + config, ["namelist:physics", "configure_segments"], ".true." + ) + + return config, self.reports diff --git a/interfaces/jedi_lfric_interface/rose-meta/jedi_lfric_interface/versions.py b/interfaces/jedi_lfric_interface/rose-meta/jedi_lfric_interface/versions.py index a1c801554..8bab40a9e 100644 --- a/interfaces/jedi_lfric_interface/rose-meta/jedi_lfric_interface/versions.py +++ b/interfaces/jedi_lfric_interface/rose-meta/jedi_lfric_interface/versions.py @@ -155,3 +155,19 @@ def upgrade(self, config, meta_config=None): ) return config, self.reports + + +class vn30_t214(MacroUpgrade): + """Upgrade macro for ticket #214 by mark Hedley.""" + + BEFORE_TAG = "vn3.0_t171" + AFTER_TAG = "vn3.0_t214" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + """Set segments configuration to true.""" + self.change_setting_value( + config, ["namelist:physics", "configure_segments"], ".true." + ) + + return config, self.reports diff --git a/rose-stem/app/adjoint_tests/rose-app.conf b/rose-stem/app/adjoint_tests/rose-app.conf index 5fe4dd671..51aef30ed 100644 --- a/rose-stem/app/adjoint_tests/rose-app.conf +++ b/rose-stem/app/adjoint_tests/rose-app.conf @@ -1,4 +1,4 @@ -meta=lfric-adjoint_tests/vn3.0_t171 +meta=lfric-adjoint_tests/vn3.0_t214 [command] default=$LAUNCH_SCRIPT/launch-exe @@ -929,17 +929,17 @@ panel_decomposition='auto' partitioner='cubedsphere' [namelist:physics] -!!bl_segment=0 +bl_segment=0 !!blayer_placement='fast' -configure_segments=.false. -!!conv_gr_segment=16 +configure_segments=.true. +conv_gr_segment=16 !!convection_placement='fast' !!electric_placement='slow' !!evap_condense_placement='fast' -!!gw_segment=0 +gw_segment=0 limit_drag_incs=.false. !!lowest_level='gradient' -!!ls_ppn_segment=0 +ls_ppn_segment=0 !!microphysics_placement='slow' !!orographic_drag_placement='slow' !!radiation_placement='slow' @@ -949,7 +949,7 @@ sample_physics_winds_correction=.false. !!smagorinsky_placement='end' !!spectral_gwd_placement='slow' !!stochastic_physics_placement='fast' -!!ussp_segment=0 +ussp_segment=0 [namelist:planet] cp=1005.0 diff --git a/rose-stem/app/gravity_wave/rose-app.conf b/rose-stem/app/gravity_wave/rose-app.conf index 8ae7aca8b..291204129 100644 --- a/rose-stem/app/gravity_wave/rose-app.conf +++ b/rose-stem/app/gravity_wave/rose-app.conf @@ -1,4 +1,4 @@ -meta=lfric-gravity_wave/vn3.0_t171 +meta=lfric-gravity_wave/vn3.0_t214 [command] default=$LAUNCH_SCRIPT/launch-exe @@ -880,17 +880,17 @@ panel_decomposition='auto' partitioner='planar' [namelist:physics] -!!bl_segment=0 +bl_segment=0 !!blayer_placement='fast' -configure_segments=.false. -!!conv_gr_segment=16 +configure_segments=.true. +conv_gr_segment=16 !!convection_placement='fast' !!electric_placement='slow' !!evap_condense_placement='fast' -!!gw_segment=0 +gw_segment=0 !!limit_drag_incs=.false. !!lowest_level='gradient' -!!ls_ppn_segment=0 +ls_ppn_segment=0 !!microphysics_placement='slow' !!orographic_drag_placement='slow' !!radiation_placement='slow' @@ -900,7 +900,7 @@ configure_segments=.false. !!smagorinsky_placement='end' !!spectral_gwd_placement='slow' !!stochastic_physics_placement='fast' -!!ussp_segment=0 +ussp_segment=0 [namelist:planet] cp=1005.0 diff --git a/rose-stem/app/gungho_model/rose-app.conf b/rose-stem/app/gungho_model/rose-app.conf index 1505c0f59..999ed6092 100644 --- a/rose-stem/app/gungho_model/rose-app.conf +++ b/rose-stem/app/gungho_model/rose-app.conf @@ -1,4 +1,4 @@ -meta=lfric-gungho_model/vn3.0_t171 +meta=lfric-gungho_model/vn3.0_t214 [command] default=$CORE_ROOT_DIR/bin/tweak_iodef ; \ @@ -905,17 +905,17 @@ panel_decomposition='auto' partitioner='cubedsphere' [namelist:physics] -!!bl_segment=0 +bl_segment=0 !!blayer_placement='fast' -configure_segments=.false. -!!conv_gr_segment=16 +configure_segments=.true. +conv_gr_segment=16 !!convection_placement='fast' !!electric_placement='slow' !!evap_condense_placement='fast' -!!gw_segment=0 +gw_segment=0 !!limit_drag_incs=.false. !!lowest_level='gradient' -!!ls_ppn_segment=0 +ls_ppn_segment=0 !!microphysics_placement='slow' !!orographic_drag_placement='slow' !!radiation_placement='slow' @@ -925,7 +925,7 @@ configure_segments=.false. !!smagorinsky_placement='end' !!spectral_gwd_placement='slow' !!stochastic_physics_placement='fast' -!!ussp_segment=0 +ussp_segment=0 [namelist:planet] cp=1005.0 diff --git a/rose-stem/app/jedi_forecast/rose-app.conf b/rose-stem/app/jedi_forecast/rose-app.conf index 07f26b8c9..5e08b160e 100644 --- a/rose-stem/app/jedi_forecast/rose-app.conf +++ b/rose-stem/app/jedi_forecast/rose-app.conf @@ -1,4 +1,4 @@ -meta=jedi_forecast/vn3.0_t132 +meta=jedi_forecast/vn3.0_t214 [command] default=$CORE_ROOT_DIR/bin/tweak_iodef ; \ @@ -944,17 +944,17 @@ panel_decomposition='auto' partitioner='cubedsphere' [namelist:physics] -!!bl_segment=0 +bl_segment=0 !!blayer_placement='fast' -configure_segments=.false. -!!conv_gr_segment=16 +configure_segments=.true. +conv_gr_segment=16 !!convection_placement='fast' !!electric_placement='slow' !!evap_condense_placement='fast' -!!gw_segment=0 +gw_segment=0 limit_drag_incs=.false. !!lowest_level='gradient' -!!ls_ppn_segment=0 +ls_ppn_segment=0 !!microphysics_placement='slow' !!orographic_drag_placement='slow' !!radiation_placement='slow' @@ -964,7 +964,7 @@ sample_physics_winds_correction=.false. !!smagorinsky_placement='end' !!spectral_gwd_placement='slow' !!stochastic_physics_placement='fast' -!!ussp_segment=0 +ussp_segment=0 [namelist:planet] cp=1005.0 diff --git a/rose-stem/app/jedi_forecast_pseudo/rose-app.conf b/rose-stem/app/jedi_forecast_pseudo/rose-app.conf index fadda2861..8c5b1529d 100644 --- a/rose-stem/app/jedi_forecast_pseudo/rose-app.conf +++ b/rose-stem/app/jedi_forecast_pseudo/rose-app.conf @@ -1,4 +1,4 @@ -meta=jedi_forecast_pseudo/vn3.0_t132 +meta=jedi_forecast_pseudo/vn3.0_t214 [command] default=$LAUNCH_SCRIPT/launch-exe @@ -938,17 +938,17 @@ panel_decomposition='auto' partitioner='cubedsphere' [namelist:physics] -!!bl_segment=0 +bl_segment=0 !!blayer_placement='fast' -configure_segments=.false. -!!conv_gr_segment=16 +configure_segments=.true. +conv_gr_segment=16 !!convection_placement='fast' !!electric_placement='slow' !!evap_condense_placement='fast' -!!gw_segment=0 +gw_segment=0 limit_drag_incs=.false. !!lowest_level='gradient' -!!ls_ppn_segment=0 +ls_ppn_segment=0 !!microphysics_placement='slow' !!orographic_drag_placement='slow' !!radiation_placement='slow' @@ -958,7 +958,7 @@ sample_physics_winds_correction=.false. !!smagorinsky_placement='end' !!spectral_gwd_placement='slow' !!stochastic_physics_placement='fast' -!!ussp_segment=0 +ussp_segment=0 [namelist:planet] cp=1005.0 diff --git a/rose-stem/app/jedi_id_tlm_tests/opt/rose-app-nwp_gal9_c12.conf b/rose-stem/app/jedi_id_tlm_tests/opt/rose-app-nwp_gal9_c12.conf index de473661e..379986682 100644 --- a/rose-stem/app/jedi_id_tlm_tests/opt/rose-app-nwp_gal9_c12.conf +++ b/rose-stem/app/jedi_id_tlm_tests/opt/rose-app-nwp_gal9_c12.conf @@ -7,8 +7,6 @@ diagnostic_frequency=8 [namelist:jedi_geometry] io_calender_start='2018-04-14T21:00:00' -io_path_inc_read='$BIG_DATA_DIR/jedi-lfric/Ticket354/pert_fields/lfric_diag' -io_path_state_read='$BIG_DATA_DIR/jedi-lfric/Ticket354/ls_fields/jedi_trajectory' [namelist:jedi_increment] inc_time='2018-04-14 21:00:00' diff --git a/rose-stem/app/jedi_id_tlm_tests/rose-app.conf b/rose-stem/app/jedi_id_tlm_tests/rose-app.conf index 72005b67c..347387e33 100644 --- a/rose-stem/app/jedi_id_tlm_tests/rose-app.conf +++ b/rose-stem/app/jedi_id_tlm_tests/rose-app.conf @@ -1,4 +1,4 @@ -meta=jedi_id_tlm_tests/vn3.0_t132 +meta=jedi_id_tlm_tests/vn3.0_t214 [command] default=$LAUNCH_SCRIPT/launch-exe @@ -972,17 +972,17 @@ panel_decomposition='auto' partitioner='cubedsphere' [namelist:physics] -!!bl_segment=0 +bl_segment=0 !!blayer_placement='fast' -configure_segments=.false. -!!conv_gr_segment=16 +configure_segments=.true. +conv_gr_segment=16 !!convection_placement='fast' !!electric_placement='slow' !!evap_condense_placement='fast' -!!gw_segment=0 +gw_segment=0 limit_drag_incs=.false. !!lowest_level='gradient' -!!ls_ppn_segment=0 +ls_ppn_segment=0 !!microphysics_placement='slow' !!orographic_drag_placement='slow' !!radiation_placement='slow' @@ -992,7 +992,7 @@ sample_physics_winds_correction=.false. !!smagorinsky_placement='end' !!spectral_gwd_placement='slow' !!stochastic_physics_placement='fast' -!!ussp_segment=0 +ussp_segment=0 [namelist:planet] cp=1005.0 diff --git a/rose-stem/app/jedi_lfric_tests/rose-app.conf b/rose-stem/app/jedi_lfric_tests/rose-app.conf index 54b8acfc1..793e1ac8f 100644 --- a/rose-stem/app/jedi_lfric_tests/rose-app.conf +++ b/rose-stem/app/jedi_lfric_tests/rose-app.conf @@ -1,4 +1,4 @@ -meta=jedi_lfric_tests/vn3.0_t132 +meta=jedi_lfric_tests/vn3.0_t214 [command] default=rose env-cat iodef_temp.xml -o iodef.xml; $LAUNCH_SCRIPT/launch-exe @@ -975,17 +975,17 @@ panel_decomposition='auto' partitioner='cubedsphere' [namelist:physics] -!!bl_segment=0 +bl_segment=0 !!blayer_placement='fast' -configure_segments=.false. -!!conv_gr_segment=16 +configure_segments=.true. +conv_gr_segment=16 !!convection_placement='fast' !!electric_placement='slow' !!evap_condense_placement='fast' -!!gw_segment=0 +gw_segment=0 limit_drag_incs=.false. !!lowest_level='gradient' -!!ls_ppn_segment=0 +ls_ppn_segment=0 !!microphysics_placement='slow' !!orographic_drag_placement='slow' !!radiation_placement='slow' @@ -995,7 +995,7 @@ sample_physics_winds_correction=.false. !!smagorinsky_placement='end' !!spectral_gwd_placement='slow' !!stochastic_physics_placement='fast' -!!ussp_segment=0 +ussp_segment=0 [namelist:planet] cp=1005.0 diff --git a/rose-stem/app/jedi_tlm_forecast_tl/opt/rose-app-nwp_gal9_c12.conf b/rose-stem/app/jedi_tlm_forecast_tl/opt/rose-app-nwp_gal9_c12.conf index a83200b74..065a444b6 100644 --- a/rose-stem/app/jedi_tlm_forecast_tl/opt/rose-app-nwp_gal9_c12.conf +++ b/rose-stem/app/jedi_tlm_forecast_tl/opt/rose-app-nwp_gal9_c12.conf @@ -7,8 +7,6 @@ diagnostic_frequency=8 [namelist:jedi_geometry] io_calender_start='2018-04-14T21:00:00' -io_path_inc_read='$BIG_DATA_DIR/jedi-lfric/Ticket354/pert_fields/lfric_diag' -io_path_state_read='$BIG_DATA_DIR/jedi-lfric/Ticket354/ls_fields/jedi_trajectory' [namelist:jedi_increment] inc_time='2018-04-14 21:00:00' diff --git a/rose-stem/app/jedi_tlm_forecast_tl/rose-app.conf b/rose-stem/app/jedi_tlm_forecast_tl/rose-app.conf index bd59dd69b..70cb123ef 100644 --- a/rose-stem/app/jedi_tlm_forecast_tl/rose-app.conf +++ b/rose-stem/app/jedi_tlm_forecast_tl/rose-app.conf @@ -1,4 +1,4 @@ -meta=jedi_tlm_forecast_tl/vn3.0_t132 +meta=jedi_tlm_forecast_tl/vn3.0_t214 [command] default=$LAUNCH_SCRIPT/launch-exe @@ -972,17 +972,17 @@ panel_decomposition='auto' partitioner='cubedsphere' [namelist:physics] -!!bl_segment=0 +bl_segment=0 !!blayer_placement='fast' -configure_segments=.false. -!!conv_gr_segment=16 +configure_segments=.true. +conv_gr_segment=16 !!convection_placement='fast' !!electric_placement='slow' !!evap_condense_placement='fast' -!!gw_segment=0 +gw_segment=0 limit_drag_incs=.false. !!lowest_level='gradient' -!!ls_ppn_segment=0 +ls_ppn_segment=0 !!microphysics_placement='slow' !!orographic_drag_placement='slow' !!radiation_placement='slow' @@ -992,7 +992,7 @@ sample_physics_winds_correction=.false. !!smagorinsky_placement='end' !!spectral_gwd_placement='slow' !!stochastic_physics_placement='fast' -!!ussp_segment=0 +ussp_segment=0 [namelist:planet] cp=1005.0 diff --git a/rose-stem/app/jedi_tlm_tests/opt/rose-app-nwp_gal9_c12.conf b/rose-stem/app/jedi_tlm_tests/opt/rose-app-nwp_gal9_c12.conf index ccd55de3b..37c2ace6f 100644 --- a/rose-stem/app/jedi_tlm_tests/opt/rose-app-nwp_gal9_c12.conf +++ b/rose-stem/app/jedi_tlm_tests/opt/rose-app-nwp_gal9_c12.conf @@ -7,8 +7,6 @@ diagnostic_frequency=8 [namelist:jedi_geometry] io_calender_start='2018-04-14T21:00:00' -io_path_inc_read='$BIG_DATA_DIR/jedi-lfric/Ticket354/pert_fields/lfric_diag' -io_path_state_read='$BIG_DATA_DIR/jedi-lfric/Ticket354/ls_fields/jedi_trajectory' [namelist:jedi_increment] inc_time='2018-04-14 21:00:00' diff --git a/rose-stem/app/jedi_tlm_tests/rose-app.conf b/rose-stem/app/jedi_tlm_tests/rose-app.conf index d4648a3ce..058bb1676 100644 --- a/rose-stem/app/jedi_tlm_tests/rose-app.conf +++ b/rose-stem/app/jedi_tlm_tests/rose-app.conf @@ -1,4 +1,4 @@ -meta=jedi_tlm_tests/vn3.0_t132 +meta=jedi_tlm_tests/vn3.0_t214 [command] default=$LAUNCH_SCRIPT/launch-exe @@ -972,17 +972,17 @@ panel_decomposition='auto' partitioner='cubedsphere' [namelist:physics] -!!bl_segment=0 +bl_segment=0 !!blayer_placement='fast' -configure_segments=.false. -!!conv_gr_segment=16 +configure_segments=.true. +conv_gr_segment=16 !!convection_placement='fast' !!electric_placement='slow' !!evap_condense_placement='fast' -!!gw_segment=0 +gw_segment=0 limit_drag_incs=.false. !!lowest_level='gradient' -!!ls_ppn_segment=0 +ls_ppn_segment=0 !!microphysics_placement='slow' !!orographic_drag_placement='slow' !!radiation_placement='slow' @@ -992,7 +992,7 @@ sample_physics_winds_correction=.false. !!smagorinsky_placement='end' !!spectral_gwd_placement='slow' !!stochastic_physics_placement='fast' -!!ussp_segment=0 +ussp_segment=0 [namelist:planet] cp=1005.0 diff --git a/rose-stem/app/jules/rose-app.conf b/rose-stem/app/jules/rose-app.conf index 5d6bcab1d..019126505 100644 --- a/rose-stem/app/jules/rose-app.conf +++ b/rose-stem/app/jules/rose-app.conf @@ -1,4 +1,4 @@ -meta=lfric-jules/vn3.0_t171 +meta=lfric-jules/vn3.0_t214 [command] default=$CORE_ROOT_DIR/bin/tweak_iodef; \ @@ -982,17 +982,17 @@ panel_decomposition='auto' partitioner='planar' [namelist:physics] -!!bl_segment=0 +bl_segment=0 blayer_placement='fast' -configure_segments=.false. -!!conv_gr_segment=16 +configure_segments=.true. +conv_gr_segment=16 !!convection_placement='fast' !!electric_placement='slow' !!evap_condense_placement='fast' -!!gw_segment=0 +gw_segment=0 limit_drag_incs=.false. lowest_level='gradient' -!!ls_ppn_segment=0 +ls_ppn_segment=0 !!microphysics_placement='slow' !!orographic_drag_placement='slow' !!radiation_placement='slow' @@ -1002,7 +1002,7 @@ sample_physics_winds_correction=.false. !!smagorinsky_placement='end' !!spectral_gwd_placement='slow' !!stochastic_physics_placement='fast' -!!ussp_segment=0 +ussp_segment=0 [namelist:planet] cp=1005.0 diff --git a/rose-stem/app/lfric2lfric/rose-app.conf b/rose-stem/app/lfric2lfric/rose-app.conf index ef8b3f2a3..ea7ab4128 100644 --- a/rose-stem/app/lfric2lfric/rose-app.conf +++ b/rose-stem/app/lfric2lfric/rose-app.conf @@ -1,4 +1,4 @@ -meta=lfric-lfric2lfric/vn3.0_t48 +meta=lfric-lfric2lfric/vn3.0_t214 [command] default=$LAUNCH_SCRIPT/launch-exe @@ -850,17 +850,17 @@ panel_decomposition='auto' partitioner='cubedsphere' [namelist:physics] -!!bl_segment=0 +bl_segment=0 !!blayer_placement='fast' -configure_segments=.false. -!!conv_gr_segment=16 +configure_segments=.true. +conv_gr_segment=16 !!convection_placement='fast' !!electric_placement='slow' !!evap_condense_placement='fast' -!!gw_segment=0 +gw_segment=0 !!limit_drag_incs=.false. !!lowest_level='constant' -!!ls_ppn_segment=0 +ls_ppn_segment=0 !!microphysics_placement='slow' !!orographic_drag_placement='slow' !!radiation_placement='slow' @@ -869,7 +869,7 @@ configure_segments=.false. !!smagorinsky_placement='fast' !!spectral_gwd_placement='slow' !!stochastic_physics_placement='fast' -!!ussp_segment=0 +ussp_segment=0 [namelist:planet] cp=1005.0 diff --git a/rose-stem/app/lfric_atm/file/file_def_initial_diags.xml b/rose-stem/app/lfric_atm/file/file_def_initial_diags.xml index c6ea03cdf..c1bca4231 100644 --- a/rose-stem/app/lfric_atm/file/file_def_initial_diags.xml +++ b/rose-stem/app/lfric_atm/file/file_def_initial_diags.xml @@ -1,7 +1,7 @@ - + diff --git a/rose-stem/app/lfric_atm/file/iodef_gal_nwp_oper_hres.xml b/rose-stem/app/lfric_atm/file/iodef_gal_nwp_oper_hres.xml index 881c26f5d..b7e6d6824 100644 --- a/rose-stem/app/lfric_atm/file/iodef_gal_nwp_oper_hres.xml +++ b/rose-stem/app/lfric_atm/file/iodef_gal_nwp_oper_hres.xml @@ -36,6 +36,7 @@ + diff --git a/rose-stem/app/lfric_atm/opt/rose-app-physics_segmentation.conf b/rose-stem/app/lfric_atm/opt/rose-app-physics_segmentation.conf index ae2cf521c..854cf77af 100644 --- a/rose-stem/app/lfric_atm/opt/rose-app-physics_segmentation.conf +++ b/rose-stem/app/lfric_atm/opt/rose-app-physics_segmentation.conf @@ -1,7 +1,5 @@ [namelist:physics] bl_segment=16 -configure_segments=.true. -conv_gr_segment=16 gw_segment=32 ls_ppn_segment=32 ussp_segment=4 diff --git a/rose-stem/app/lfric_atm/rose-app.conf b/rose-stem/app/lfric_atm/rose-app.conf index e238762e8..f2837c5ad 100644 --- a/rose-stem/app/lfric_atm/rose-app.conf +++ b/rose-stem/app/lfric_atm/rose-app.conf @@ -1,4 +1,4 @@ -meta=lfric-lfric_atm/vn3.0_t171 +meta=lfric-lfric_atm/vn3.0_t214 [command] default=$CORE_ROOT_DIR/bin/tweak_iodef; \ @@ -936,17 +936,17 @@ panel_decomposition='auto' partitioner='cubedsphere' [namelist:physics] -!!bl_segment=0 +bl_segment=0 blayer_placement='fast' -configure_segments=.false. -!!conv_gr_segment=16 +configure_segments=.true. +conv_gr_segment=16 convection_placement='fast' !!electric_placement='slow' !!evap_condense_placement='fast' -!!gw_segment=0 +gw_segment=0 limit_drag_incs=.false. lowest_level='gradient' -!!ls_ppn_segment=0 +ls_ppn_segment=0 microphysics_placement='slow' orographic_drag_placement='slow' radiation_placement='slow' @@ -956,7 +956,7 @@ sample_physics_winds_correction=.false. !!smagorinsky_placement='end' spectral_gwd_placement='slow' !!stochastic_physics_placement='fast' -!!ussp_segment=0 +ussp_segment=0 [namelist:planet] cp=1005.0 diff --git a/rose-stem/app/lfric_coupled_atmosphere/rose-app.conf b/rose-stem/app/lfric_coupled_atmosphere/rose-app.conf index f82130220..cb64ade9d 100644 --- a/rose-stem/app/lfric_coupled_atmosphere/rose-app.conf +++ b/rose-stem/app/lfric_coupled_atmosphere/rose-app.conf @@ -1,4 +1,4 @@ -meta=lfric-lfric_atm/vn3.0_t171 +meta=lfric-lfric_atm/vn3.0_t214 [command] default=$LAUNCH_SCRIPT/launch-exe @@ -926,17 +926,17 @@ panel_decomposition='auto' partitioner='cubedsphere' [namelist:physics] -!!bl_segment=0 +bl_segment=0 blayer_placement='fast' -configure_segments=.false. -!!conv_gr_segment=16 +configure_segments=.true. +conv_gr_segment=16 convection_placement='fast' !!electric_placement='slow' !!evap_condense_placement='fast' -!!gw_segment=0 +gw_segment=0 limit_drag_incs=.false. lowest_level='gradient' -!!ls_ppn_segment=0 +ls_ppn_segment=0 microphysics_placement='slow' orographic_drag_placement='slow' radiation_placement='slow' @@ -946,7 +946,7 @@ sample_physics_winds_correction=.false. !!smagorinsky_placement='end' spectral_gwd_placement='slow' !!stochastic_physics_placement='fast' -!!ussp_segment=0 +ussp_segment=0 [namelist:planet] cp=1005.0 diff --git a/rose-stem/app/linear_model/rose-app.conf b/rose-stem/app/linear_model/rose-app.conf index 1c63ba504..912ad21f6 100644 --- a/rose-stem/app/linear_model/rose-app.conf +++ b/rose-stem/app/linear_model/rose-app.conf @@ -1,4 +1,4 @@ -meta=lfric-linear_model/vn3.0_t171 +meta=lfric-linear_model/vn3.0_t214 [command] default=rose env-cat iodef_temp.xml -o iodef.xml; $LAUNCH_SCRIPT/launch-exe @@ -929,17 +929,17 @@ panel_decomposition='auto' partitioner='cubedsphere' [namelist:physics] -!!bl_segment=0 +bl_segment=0 !!blayer_placement='fast' -configure_segments=.false. -!!conv_gr_segment=16 +configure_segments=.true. +conv_gr_segment=16 !!convection_placement='fast' !!electric_placement='slow' !!evap_condense_placement='fast' -!!gw_segment=0 +gw_segment=0 limit_drag_incs=.false. !!lowest_level='gradient' -!!ls_ppn_segment=0 +ls_ppn_segment=0 !!microphysics_placement='slow' !!orographic_drag_placement='slow' !!radiation_placement='slow' @@ -949,7 +949,7 @@ sample_physics_winds_correction=.false. !!smagorinsky_placement='end' !!spectral_gwd_placement='slow' !!stochastic_physics_placement='fast' -!!ussp_segment=0 +ussp_segment=0 [namelist:planet] cp=1005.0 diff --git a/rose-stem/app/name_transport/rose-app.conf b/rose-stem/app/name_transport/rose-app.conf index 1136c37a9..e1d674d67 100644 --- a/rose-stem/app/name_transport/rose-app.conf +++ b/rose-stem/app/name_transport/rose-app.conf @@ -1,4 +1,4 @@ -meta=lfric-name_transport/vn3.0_t171 +meta=lfric-name_transport/vn3.0_t214 [command] default=$LAUNCH_SCRIPT/launch-exe @@ -899,17 +899,17 @@ panel_decomposition='auto' partitioner='planar' [namelist:physics] -!!bl_segment=0 +bl_segment=0 !!blayer_placement='fast' -configure_segments=.false. -!!conv_gr_segment=16 +configure_segments=.true. +conv_gr_segment=16 !!convection_placement='fast' !!electric_placement='slow' !!evap_condense_placement='fast' -!!gw_segment=0 +gw_segment=0 !!limit_drag_incs=.false. !!lowest_level='gradient' -!!ls_ppn_segment=0 +ls_ppn_segment=0 !!microphysics_placement='slow' !!orographic_drag_placement='slow' !!radiation_placement='slow' @@ -919,7 +919,7 @@ configure_segments=.false. !!smagorinsky_placement='end' !!spectral_gwd_placement='slow' !!stochastic_physics_placement='fast' -!!ussp_segment=0 +ussp_segment=0 [namelist:planet] cp=1005.0 diff --git a/rose-stem/app/ngarch/rose-app.conf b/rose-stem/app/ngarch/rose-app.conf index 75f325140..bf6105f54 100644 --- a/rose-stem/app/ngarch/rose-app.conf +++ b/rose-stem/app/ngarch/rose-app.conf @@ -1,4 +1,4 @@ -meta=lfric-ngarch/vn3.0_t171 +meta=lfric-ngarch/vn3.0_t214 [command] default=$CORE_ROOT_DIR/bin/tweak_iodef; \ @@ -961,17 +961,17 @@ panel_decomposition='auto' partitioner='cubedsphere' [namelist:physics] -!!bl_segment=0 +bl_segment=0 blayer_placement='fast' -configure_segments=.false. -!!conv_gr_segment=16 +configure_segments=.true. +conv_gr_segment=16 !!convection_placement='fast' !!electric_placement='slow' !!evap_condense_placement='fast' -!!gw_segment=0 +gw_segment=0 limit_drag_incs=.false. lowest_level='gradient' -!!ls_ppn_segment=0 +ls_ppn_segment=0 microphysics_placement='slow' !!orographic_drag_placement='slow' !!radiation_placement='slow' @@ -981,7 +981,7 @@ sample_physics_winds_correction=.false. !!smagorinsky_placement='end' !!spectral_gwd_placement='slow' !!stochastic_physics_placement='fast' -!!ussp_segment=0 +ussp_segment=0 [namelist:planet] cp=1005.0 diff --git a/rose-stem/app/shallow_water/rose-app.conf b/rose-stem/app/shallow_water/rose-app.conf index 1075f87e9..f649c3271 100644 --- a/rose-stem/app/shallow_water/rose-app.conf +++ b/rose-stem/app/shallow_water/rose-app.conf @@ -1,4 +1,4 @@ -meta=lfric-shallow_water/vn3.0_t171 +meta=lfric-shallow_water/vn3.0_t214 [command] default=$LAUNCH_SCRIPT/launch-exe @@ -872,17 +872,17 @@ panel_decomposition='auto' partitioner='cubedsphere' [namelist:physics] -!!bl_segment=0 +bl_segment=0 !!blayer_placement='fast' -configure_segments=.false. -!!conv_gr_segment=16 +configure_segments=.true. +conv_gr_segment=16 !!convection_placement='fast' !!electric_placement='slow' !!evap_condense_placement='fast' -!!gw_segment=0 +gw_segment=0 !!limit_drag_incs=.false. !!lowest_level='gradient' -!!ls_ppn_segment=0 +ls_ppn_segment=0 !!microphysics_placement='slow' !!orographic_drag_placement='slow' !!radiation_placement='slow' @@ -892,7 +892,7 @@ configure_segments=.false. !!smagorinsky_placement='end' !!spectral_gwd_placement='slow' !!stochastic_physics_placement='fast' -!!ussp_segment=0 +ussp_segment=0 [namelist:planet] cp=1005.0 diff --git a/rose-stem/app/transport/rose-app.conf b/rose-stem/app/transport/rose-app.conf index feeb881df..fa61064ae 100644 --- a/rose-stem/app/transport/rose-app.conf +++ b/rose-stem/app/transport/rose-app.conf @@ -1,4 +1,4 @@ -meta=lfric-transport/vn3.0_t171 +meta=lfric-transport/vn3.0_t214 [command] default=$LAUNCH_SCRIPT/launch-exe @@ -895,17 +895,17 @@ panel_decomposition='auto' partitioner='planar' [namelist:physics] -!!bl_segment=0 +bl_segment=0 !!blayer_placement='fast' -configure_segments=.false. -!!conv_gr_segment=16 +configure_segments=.true. +conv_gr_segment=16 !!convection_placement='fast' !!electric_placement='slow' !!evap_condense_placement='fast' -!!gw_segment=0 +gw_segment=0 !!limit_drag_incs=.false. !!lowest_level='gradient' -!!ls_ppn_segment=0 +ls_ppn_segment=0 !!microphysics_placement='slow' !!orographic_drag_placement='slow' !!radiation_placement='slow' @@ -915,7 +915,7 @@ configure_segments=.false. !!smagorinsky_placement='end' !!spectral_gwd_placement='slow' !!stochastic_physics_placement='fast' -!!ussp_segment=0 +ussp_segment=0 [namelist:planet] cp=1005.0 diff --git a/rose-stem/site/common/lfric_atm/tasks_lfric_atm.cylc b/rose-stem/site/common/lfric_atm/tasks_lfric_atm.cylc index d24f3d962..7307b67b4 100644 --- a/rose-stem/site/common/lfric_atm/tasks_lfric_atm.cylc +++ b/rose-stem/site/common/lfric_atm/tasks_lfric_atm.cylc @@ -245,20 +245,6 @@ "log_level": "error", }) %} -{% elif task_ns.conf_name == "nwp_gal9-C896_MG" %} - - {% do task_dict.update({ - "opt_confs": ["um_dump"], - "resolution": "C896_MG", - "DT": 240, - "tsteps": 120, - "mpi_parts": 4704, - "xios_nodes": 4, - "mpi_parts_xios" : 32, - "log_level": "info", - "plot_str": "plot_map.py $NODAL_DATA_DIR/lfric_diagnostics.nc $PLOT_DIR", - }) %} - {% elif task_ns.conf_name == "nwp_gal9_coarse_aero-C48_MG" %} {% do task_dict.update({ @@ -441,6 +427,25 @@ "kgo_checks": ["checksum"], }) %} +{# Share Global Configurations - extended by Performance setups#} +{% elif task_ns.conf_name.startswith("nwp_gal9-C896_MG") %} + + {% do task_dict.update({ + "CXI_MATCH_hybrid": true, + "opt_confs": ["um_dump"], + "resolution": "C896_MG", + "DT": 240, + "tsteps": 120, + "wallclock": 15, + "mpi_parts": 4704, + "xios_nodes": 4, + "mpi_parts_xios" : 128, + "log_level": "info", + "log_to_rank_zero_only": ".true.", + "memory_plot_ex": true, + "plot_str": "plot_map.py $NODAL_DATA_DIR/lfric_diagnostics.nc $PLOT_DIR", + }) %} + {# ###################################################################### #} {# Global Climate jobs #} {# ###################################################################### #} @@ -1159,4 +1164,25 @@ {% endif %} {% endif %} +{# Extensions to the Shared Global Configurations - Performance setups#} +{% if task_ns.conf_name.startswith("nwp_gal9-C896_MG_720t") %} + + {% do task_dict.update({ + "opt_confs": ["um_dump"], + "tsteps": 720, + "wallclock": 60, + "plot_str": "", + "restart_write": false, + }) %} +{% endif %} + +{% if task_ns.conf_name.startswith("nwp_gal9-C896_MG_720t_opDiag") %} + + {% do task_dict.update({ + "opt_confs": ["um_dump","oper_diags_hres"], + }) %} + +{% endif %} + + {% do LOG.debug("Finished in site/common/lfric_atm/tasks_lfric_atm.cylc") %} diff --git a/rose-stem/site/meto/groups/groups_lfric_atm.cylc b/rose-stem/site/meto/groups/groups_lfric_atm.cylc index 174b5698f..25e15fddf 100644 --- a/rose-stem/site/meto/groups/groups_lfric_atm.cylc +++ b/rose-stem/site/meto/groups/groups_lfric_atm.cylc @@ -200,6 +200,16 @@ "ex1a_omp_C192_cce", "ex1a_omp_gnu", ], + "lfric_atm_ex1a_performance_check": [ + "lfric_atm_ex1a_weekly", + "lfric_atm_nwp_gal9-C896_MG_720t_perfRun0_ex1a_cce_production-32bit", + ], + "lfric_atm_ex1a_performance_runstats": [ + "lfric_atm_nwp_gal9-C896_MG_720t_perfRun1_ex1a_cce_production-32bit", + "lfric_atm_nwp_gal9-C896_MG_720t_perfRun2_ex1a_cce_production-32bit", + "lfric_atm_nwp_gal9-C896_MG_720t_perfRun3_ex1a_cce_production-32bit", + "lfric_atm_nwp_gal9-C896_MG_720t_perfRun4_ex1a_cce_production-32bit", + ], "lfric_atm_ex1a_threaded": [ "lfric_atm_nwp_gal9_2T-C48_MG_ex1a_cce_full-debug-32bit", "lfric_atm_nwp_gal9_4T-C48_MG_ex1a_cce_production-32bit", diff --git a/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_baroclinic-C48_MG-3panel_azspice_gnu_fast-debug-64bit.txt b/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_baroclinic-C48_MG-3panel_azspice_gnu_fast-debug-64bit.txt index 349691ba1..060f81ae0 100644 --- a/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_baroclinic-C48_MG-3panel_azspice_gnu_fast-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_baroclinic-C48_MG-3panel_azspice_gnu_fast-debug-64bit.txt @@ -1,3 +1,3 @@ -Inner product checksum rho = 4102EEF5F98EE4B6 -Inner product checksum theta = 423041DD82735559 -Inner product checksum u = 45017CE3B78D4E80 +Inner product checksum rho = 4102EEF5FAAB93B5 +Inner product checksum theta = 423041DD82556059 +Inner product checksum u = 45017CE3BDE63032 diff --git a/science/adjoint/rose-meta/lfric-adjoint/versions.py b/science/adjoint/rose-meta/lfric-adjoint/versions.py index a1c801554..8bab40a9e 100644 --- a/science/adjoint/rose-meta/lfric-adjoint/versions.py +++ b/science/adjoint/rose-meta/lfric-adjoint/versions.py @@ -155,3 +155,19 @@ def upgrade(self, config, meta_config=None): ) return config, self.reports + + +class vn30_t214(MacroUpgrade): + """Upgrade macro for ticket #214 by mark Hedley.""" + + BEFORE_TAG = "vn3.0_t171" + AFTER_TAG = "vn3.0_t214" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + """Set segments configuration to true.""" + self.change_setting_value( + config, ["namelist:physics", "configure_segments"], ".true." + ) + + return config, self.reports diff --git a/science/gungho/rose-meta/lfric-gungho/HEAD/rose-meta.conf b/science/gungho/rose-meta/lfric-gungho/HEAD/rose-meta.conf index 63826ef88..4380951b7 100644 --- a/science/gungho/rose-meta/lfric-gungho/HEAD/rose-meta.conf +++ b/science/gungho/rose-meta/lfric-gungho/HEAD/rose-meta.conf @@ -4705,7 +4705,7 @@ ns=namelist/Science [namelist:physics=bl_segment] compulsory=true description=Over-rides bl_segment_size in physics -fail-if=this <= 0 ; +fail-if=this < 0 ; help=Boundary layer segment size. = =Setting bl_segment=0 will trigger the default behaviour @@ -4783,7 +4783,7 @@ values='fast','slow' [namelist:physics=gw_segment] compulsory=true description=Over-rides gw_seg_size in um physics -fail-if=this <= 0 ; +fail-if=this < 0 ; help=Break segments gravity wave. = =Setting gw_segment=0 will trigger the default behaviour diff --git a/science/gungho/rose-meta/lfric-gungho/versions.py b/science/gungho/rose-meta/lfric-gungho/versions.py index 01c6ff3ed..50d1223d6 100644 --- a/science/gungho/rose-meta/lfric-gungho/versions.py +++ b/science/gungho/rose-meta/lfric-gungho/versions.py @@ -135,5 +135,20 @@ def upgrade(self, config, meta_config=None): self.add_setting( config, ["namelist:transport", "adjust_tracer_equation"], ".false." ) + return config, self.reports + + +class vn30_t214(MacroUpgrade): + """Upgrade macro for ticket #214 by mark Hedley.""" + + BEFORE_TAG = "vn3.0_t171" + AFTER_TAG = "vn3.0_t214" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + """Set segments configuration to true.""" + self.change_setting_value( + config, ["namelist:physics", "configure_segments"], ".true." + ) return config, self.reports diff --git a/science/linear/rose-meta/lfric-linear/versions.py b/science/linear/rose-meta/lfric-linear/versions.py index a1c801554..8bab40a9e 100644 --- a/science/linear/rose-meta/lfric-linear/versions.py +++ b/science/linear/rose-meta/lfric-linear/versions.py @@ -155,3 +155,19 @@ def upgrade(self, config, meta_config=None): ) return config, self.reports + + +class vn30_t214(MacroUpgrade): + """Upgrade macro for ticket #214 by mark Hedley.""" + + BEFORE_TAG = "vn3.0_t171" + AFTER_TAG = "vn3.0_t214" + + def upgrade(self, config, meta_config=None): + # Commands From: rose-meta/lfric-gungho + """Set segments configuration to true.""" + self.change_setting_value( + config, ["namelist:physics", "configure_segments"], ".true." + ) + + return config, self.reports