diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 6c3bd9e52..d6d4268cb 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -29,3 +29,4 @@ | cjohnson-pi | Christine Johnson | Met Office | 2026-01-19 | | t00sa | Sam Clarke-Green | Met Office | 2026-01-20 | | ukmo-juan-castillo | Juan M. Castillo | Met Office | 2026-01-23 | +| thomasmelvin | Thomas Melvin | Met Office | 2026-01-15 | \ No newline at end of file diff --git a/rose-stem/app/gungho_model/opt/rose-app-suite_controlled.conf b/rose-stem/app/gungho_model/opt/rose-app-suite_controlled.conf index c3789d266..81be83085 100644 --- a/rose-stem/app/gungho_model/opt/rose-app-suite_controlled.conf +++ b/rose-stem/app/gungho_model/opt/rose-app-suite_controlled.conf @@ -24,6 +24,11 @@ use_xios_io=${USE_XIOS_IO} [namelist:logging] run_log_level='${LOG_LEVEL}' +[namelist:partitioning] +panel_decomposition='${PANEL_DECOMP}' +panel_xproc=${XPROC} +panel_yproc=${YPROC} + [namelist:time] timestep_end='${RESTART_STOP}' timestep_start='${RESTART_START}' diff --git a/rose-stem/site/common/gungho_model/tasks_gungho_model.cylc b/rose-stem/site/common/gungho_model/tasks_gungho_model.cylc index 17c6843c5..b446910a0 100644 --- a/rose-stem/site/common/gungho_model/tasks_gungho_model.cylc +++ b/rose-stem/site/common/gungho_model/tasks_gungho_model.cylc @@ -34,6 +34,47 @@ "plot_str": "baroclinic.py $NODAL_DATA_DIR/lfric_diag.nc $PLOT_DIR dcmip dry surface_pressure_temperature", }) %} +{% elif task_ns.conf_name == "baroclinic-C48_MG" %} + + {% do task_dict.update({ + "opt_confs": ["baroclinic"], + "resolution": "C48_MG", + "DT": 3600, + "threads": 4, + "mpi_parts": 6, + "tsteps": 240, + "plot_str": "baroclinic.py $NODAL_DATA_DIR/lfric_diag.nc $PLOT_DIR dcmip dry surface_pressure_temperature", + }) %} +{% elif task_ns.conf_name == "baroclinic-C48_MG-3panel" %} + + {% do task_dict.update({ + "opt_confs": ["baroclinic"], + "resolution": "C48_MG", + "DT": 3600, + "threads": 2, + "mpi_parts": 12, + "panel_decomp": "custom", + "xproc": 2, + "yproc": 3, + "tsteps": 240, + "plot_str": "baroclinic.py $NODAL_DATA_DIR/lfric_diag.nc $PLOT_DIR dcmip dry surface_pressure_temperature", + }) %} + +{% elif task_ns.conf_name == "baroclinic-C48_MG-2panel" %} + + {% do task_dict.update({ + "opt_confs": ["baroclinic"], + "resolution": "C48_MG", + "DT": 3600, + "threads": 1, + "mpi_parts": 27, + "panel_decomp": "custom", + "xproc": 3, + "yproc": 3, + "tsteps": 240, + "plot_str": "baroclinic.py $NODAL_DATA_DIR/lfric_diag.nc $PLOT_DIR dcmip dry surface_pressure_temperature", + }) %} + {% elif task_ns.conf_name == "baroclinic-pert-C24_MG" %} {% do task_dict.update({ diff --git a/rose-stem/site/meto/groups/groups_gungho_model.cylc b/rose-stem/site/meto/groups/groups_gungho_model.cylc index 0605786b9..0704f11ad 100644 --- a/rose-stem/site/meto/groups/groups_gungho_model.cylc +++ b/rose-stem/site/meto/groups/groups_gungho_model.cylc @@ -10,6 +10,9 @@ "gungho_model_azspice_developer": [ "gungho_model_agnesi_hyd_cart-BiP120x8-2000x2000_azspice_gnu_fast-debug-64bit", "gungho_model_baroclinic-C24_MG_azspice_gnu_fast-debug-64bit", + "gungho_model_baroclinic-C48_MG_azspice_gnu_fast-debug-64bit", + "gungho_model_baroclinic-C48_MG-2panel_azspice_gnu_fast-debug-64bit", + "gungho_model_baroclinic-C48_MG-3panel_azspice_gnu_fast-debug-64bit", "gungho_model_baroclinic-pert-C24_MG_azspice_gnu_fast-debug-64bit", "gungho_model_baroclinic-alt1-C24s_MG_azspice_gnu_fast-debug-64bit", "gungho_model_baroclinic-alt2-C24_MG_op_azspice_gnu_fast-debug-64bit", diff --git a/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_baroclinic-C48_MG-2panel_azspice_gnu_fast-debug-64bit.txt b/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_baroclinic-C48_MG-2panel_azspice_gnu_fast-debug-64bit.txt new file mode 100644 index 000000000..fff7d09e8 --- /dev/null +++ b/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_baroclinic-C48_MG-2panel_azspice_gnu_fast-debug-64bit.txt @@ -0,0 +1,3 @@ +Inner product checksum rho = 4102EEF5FAAB93B4 +Inner product checksum theta = 423041DD82556056 +Inner product checksum u = 45017CE3BDE63034 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 new file mode 100644 index 000000000..060f81ae0 --- /dev/null +++ b/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_baroclinic-C48_MG-3panel_azspice_gnu_fast-debug-64bit.txt @@ -0,0 +1,3 @@ +Inner product checksum rho = 4102EEF5FAAB93B5 +Inner product checksum theta = 423041DD82556059 +Inner product checksum u = 45017CE3BDE63032 diff --git a/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_baroclinic-C48_MG_azspice_gnu_fast-debug-64bit.txt b/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_baroclinic-C48_MG_azspice_gnu_fast-debug-64bit.txt new file mode 100644 index 000000000..542074238 --- /dev/null +++ b/rose-stem/site/meto/kgos/gungho_model/azspice/checksum_gungho_model_baroclinic-C48_MG_azspice_gnu_fast-debug-64bit.txt @@ -0,0 +1,3 @@ +Inner product checksum rho = 4102EEF5FAAB93BA +Inner product checksum theta = 423041DD82556055 +Inner product checksum u = 45017CE3BDE63033 diff --git a/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_baroclinic-C48_MG_ex1a_gnu_fast-debug-64bit.txt b/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_baroclinic-C48_MG_ex1a_gnu_fast-debug-64bit.txt new file mode 100644 index 000000000..df436b1fe --- /dev/null +++ b/rose-stem/site/meto/kgos/gungho_model/ex1a/checksum_gungho_model_baroclinic-C48_MG_ex1a_gnu_fast-debug-64bit.txt @@ -0,0 +1,3 @@ +Inner product checksum rho = 4102EEF5FAB7BD35 +Inner product checksum theta = 423041DD82538AE9 +Inner product checksum u = 45017CE3BDC64744