Performance comparison and performance tests

rose-stem/app/lfric_atm/file/file_def_initial_diags.xml

@@ -1,7 +1,7 @@
 <file_definition>
 
   <!-- Initial fields to actually output by default -->
-  <file id="lfric_initial" name="lfric_initial" output_freq="1ts" convention="UGRID" enabled=".TRUE.">
+  <file id="lfric_initial" name="results/lfric_initial" output_freq="1ts" convention="UGRID" enabled=".TRUE.">
     <field_group operation="once" freq_op="1ts" prec="4">
       <field field_ref="init_theta" />
       <field field_ref="init_m_v" />

rose-stem/app/lfric_atm/file/iodef_gal_nwp_oper_hres.xml

@@ -36,6 +36,7 @@
     <file_definition src="./file_def_diags_name.xml"/>
     <file_definition src="./file_def_diags_var_ops.xml"/>
     <file_definition src="./file_def_diags_oper_nwp_gl.xml"/>
+    <file_definition src="./file_def_initial_diags.xml"/>
 
     <!-- Local file definitions -->
     <file_definition type="one_file" time_counter="none">

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") %}

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

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

science/gungho/rose-meta/lfric-gungho/versions.py

@@ -137,3 +137,16 @@ 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_t146"
+    AFTER_TAG = "vn3.0_t214"
+
+    def upgrade(self, config, meta_config=None):
+        """Set segments configuration to true."""
+        self.change_setting_value(config, ["namelist:physics", "configure_segments"], ".true.")
+
+        return config, self.reports