diff --git a/rose-stem/app/lfric2lfric/opt/rose-app-multi-cpu.conf b/rose-stem/app/lfric2lfric/opt/rose-app-multi-cpu.conf new file mode 100644 index 000000000..6512c9267 --- /dev/null +++ b/rose-stem/app/lfric2lfric/opt/rose-app-multi-cpu.conf @@ -0,0 +1,4 @@ +[namelist:partitioning(source)] +panel_decomposition='custom' +panel_xproc=2 +panel_yproc=1 diff --git a/rose-stem/app/lfric2lfric/opt/rose-app-suite_controlled.conf b/rose-stem/app/lfric2lfric/opt/rose-app-suite_controlled.conf index eceb8d060..17bfd0bfd 100644 --- a/rose-stem/app/lfric2lfric/opt/rose-app-suite_controlled.conf +++ b/rose-stem/app/lfric2lfric/opt/rose-app-suite_controlled.conf @@ -29,11 +29,6 @@ panel_decomposition='${PANEL_DECOMP}' panel_xproc=${XPROC} panel_yproc=${YPROC} -[namelist:partitioning(source)] -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/lfric2lfric/tasks_lfric2lfric.cylc b/rose-stem/site/common/lfric2lfric/tasks_lfric2lfric.cylc index b68dc1efc..164ed8558 100644 --- a/rose-stem/site/common/lfric2lfric/tasks_lfric2lfric.cylc +++ b/rose-stem/site/common/lfric2lfric/tasks_lfric2lfric.cylc @@ -5,7 +5,7 @@ {# ########################################################################### #} {% do LOG.debug("Entered site/common/lfric2lfric/tasks_solver.cylc") %} -{% if task_ns.conf_name == "ral_seuk-C32_lam_MG" %} +{% if task_ns.conf_name == "ral_seuk-C32_lam_MG_1cpu" %} {% do task_dict.update({ "opt_confs": ["ral_seuk"], @@ -18,7 +18,34 @@ "src_type": "", }) %} -{% elif task_ns.conf_name == "oasis_ral_seuk-C32_lam_MG" %} +{% elif task_ns.conf_name == "ral_seuk-C32_lam_MG_4cpu" %} + + {% do task_dict.update({ + "opt_confs": ["ral_seuk"], + "resolution": "seuk_MG", + "dst_mesh": "", + "dst_name": "", + "dst_type": "", + "src_mesh": "", + "src_name": "", + "src_type": "", + "mpi_parts": 4, + }) %} + +{% elif task_ns.conf_name == "oasis_ral_seuk-C32_lam_MG_1cpu" %} + + {% do task_dict.update({ + "opt_confs": ["ral_seuk","oasis"], + "resolution": "seuk_MG", + "dst_mesh": "seuk_MG", + "dst_name": "multigrid_l1", + "dst_type": "regional", + "src_mesh": "seuk_MG", + "src_name": "dynamics", + "src_type": "regional", + }) %} + +{% elif task_ns.conf_name == "oasis_ral_seuk-C32_lam_MG_4cpu" %} {% do task_dict.update({ "opt_confs": ["ral_seuk","oasis"], @@ -29,6 +56,7 @@ "src_mesh": "seuk_MG", "src_name": "dynamics", "src_type": "regional", + "mpi_parts": 4, }) %} {% elif task_ns.conf_name == "ral3-seuk" %} @@ -70,7 +98,20 @@ "src_type": "", }) %} -{% elif task_ns.conf_name == "clim_gal9-C24_C12" %} +{% elif task_ns.conf_name == "clim_gal9-C24_C12_1cpu" %} + + {% do task_dict.update({ + "opt_confs": ["clim_gal9"], + "resolution": "C24_C12", + "dst_mesh": "", + "dst_name": "", + "dst_type": "", + "src_mesh": "", + "src_name": "", + "src_type": "", + }) %} + +{% elif task_ns.conf_name == "clim_gal9-C24_C12_6cpu" %} {% do task_dict.update({ "opt_confs": ["clim_gal9"], @@ -81,9 +122,10 @@ "src_mesh": "", "src_name": "", "src_type": "", + "mpi_parts": 6, }) %} -{% elif task_ns.conf_name == "oasis_clim_gal9-C24_C12" %} +{% elif task_ns.conf_name == "oasis_clim_gal9-C24_C12_1cpu" %} {% do task_dict.update({ "opt_confs": ["clim_gal9","oasis"], @@ -96,7 +138,21 @@ "src_type": "global", }) %} -{% elif task_ns.conf_name == "oasis_clim_gal9_C12-ral_seuk_C16_lam" %} +{% elif task_ns.conf_name == "oasis_clim_gal9-C24_C12_6cpu" %} + + {% do task_dict.update({ + "opt_confs": ["clim_gal9","oasis"], + "resolution": "C24_C12", + "dst_mesh": "C24_C12", + "dst_name": "C24", + "dst_type": "global", + "src_mesh": "C24_C12", + "src_name": "C12", + "src_type": "global", + "mpi_parts": 6, + }) %} + +{% elif task_ns.conf_name == "oasis_clim_gal9_C12-ral_seuk_C16_lam_1cpu" %} {% do task_dict.update({ "opt_confs": ["clim_gal9_ral_seuk","oasis"], @@ -109,7 +165,21 @@ "src_type": "global", }) %} -{% elif task_ns.conf_name == "oasis_clim_gal9_C12-ral_seuk_C16_lam-lbc" %} +{% elif task_ns.conf_name == "oasis_clim_gal9_C12-ral_seuk_C16_lam_4cpu" %} + + {% do task_dict.update({ + "opt_confs": ["clim_gal9_ral_seuk","oasis", "multi-cpu"], + "resolution": "C12_C16_lam", + "dst_mesh": "seuk_MG", + "dst_name": "dynamics", + "dst_type": "regional", + "src_mesh": "C24_C12", + "src_name": "C12", + "src_type": "global", + "mpi_parts": 4, + }) %} + +{% elif task_ns.conf_name == "oasis_clim_gal9_C12-ral_seuk_C16_lam-lbc_1cpu" %} {# dst_name will need to change to "dynamics-lbc" when lbc meshes can be read #} {% do task_dict.update({ @@ -123,6 +193,21 @@ "src_type": "global", }) %} +{% elif task_ns.conf_name == "oasis_clim_gal9_C12-ral_seuk_C16_lam-lbc_4cpu" %} + + {# dst_name will need to change to "dynamics-lbc" when lbc meshes can be read #} + {% do task_dict.update({ + "opt_confs": ["clim_gal9_ral_seuk","oasis","lbc", "multi-cpu"], + "resolution": "C12_C16_lam", + "dst_mesh": "seuk_MG", + "dst_name": "dynamics-lbc", + "dst_type": "regional", + "src_mesh": "C24_C12", + "src_name": "C12", + "src_type": "global", + "mpi_parts": 4, + }) %} + {% elif task_ns.conf_name == "canned" %} {% do task_dict.update({ diff --git a/rose-stem/site/meto/groups/groups_lfric2lfric.cylc b/rose-stem/site/meto/groups/groups_lfric2lfric.cylc index eca0b1d27..55b20e1d0 100644 --- a/rose-stem/site/meto/groups/groups_lfric2lfric.cylc +++ b/rose-stem/site/meto/groups/groups_lfric2lfric.cylc @@ -8,13 +8,19 @@ {# Azspice Groups #} {% do site_groups.update({ "lfric2lfric_azspice_developer": [ - "lfric2lfric_ral_seuk-C32_lam_MG_azspice_gnu_fast-debug-64bit", - "lfric2lfric_oasis_ral_seuk-C32_lam_MG_azspice_gnu_fast-debug-64bit", + "lfric2lfric_ral_seuk-C32_lam_MG_1cpu_azspice_gnu_fast-debug-64bit", + "lfric2lfric_ral_seuk-C32_lam_MG_4cpu_azspice_gnu_fast-debug-64bit", + "lfric2lfric_oasis_ral_seuk-C32_lam_MG_1cpu_azspice_gnu_fast-debug-64bit", + "lfric2lfric_oasis_ral_seuk-C32_lam_MG_4cpu_azspice_gnu_fast-debug-64bit", "lfric2lfric_ral3-seuk_azspice_gnu_fast-debug-64bit", - "lfric2lfric_clim_gal9-C24_C12_azspice_gnu_fast-debug-64bit", - "lfric2lfric_oasis_clim_gal9-C24_C12_azspice_gnu_fast-debug-64bit", - "lfric2lfric_oasis_clim_gal9_C12-ral_seuk_C16_lam_azspice_gnu_fast-debug-64bit", - "lfric2lfric_oasis_clim_gal9_C12-ral_seuk_C16_lam-lbc_azspice_gnu_fast-debug-64bit", + "lfric2lfric_clim_gal9-C24_C12_1cpu_azspice_gnu_fast-debug-64bit", + "lfric2lfric_clim_gal9-C24_C12_6cpu_azspice_gnu_fast-debug-64bit", + "lfric2lfric_oasis_clim_gal9-C24_C12_1cpu_azspice_gnu_fast-debug-64bit", + "lfric2lfric_oasis_clim_gal9-C24_C12_6cpu_azspice_gnu_fast-debug-64bit", + "lfric2lfric_oasis_clim_gal9_C12-ral_seuk_C16_lam_1cpu_azspice_gnu_fast-debug-64bit", + "lfric2lfric_oasis_clim_gal9_C12-ral_seuk_C16_lam_4cpu_azspice_gnu_fast-debug-64bit", + "lfric2lfric_oasis_clim_gal9_C12-ral_seuk_C16_lam-lbc_1cpu_azspice_gnu_fast-debug-64bit", + "lfric2lfric_oasis_clim_gal9_C12-ral_seuk_C16_lam-lbc_4cpu_azspice_gnu_fast-debug-64bit", "lfric2lfric_azspice_canned", ], "lfric2lfric_azspice_extra": [ @@ -36,13 +42,19 @@ {# EX1A Groups #} {% do site_groups.update({ "lfric2lfric_ex1a_developer": [ - "lfric2lfric_ral_seuk-C32_lam_MG_ex1a_cce_fast-debug-64bit", - "lfric2lfric_oasis_ral_seuk-C32_lam_MG_ex1a_cce_fast-debug-64bit", + "lfric2lfric_ral_seuk-C32_lam_MG_1cpu_ex1a_cce_fast-debug-64bit", + "lfric2lfric_ral_seuk-C32_lam_MG_4cpu_ex1a_cce_fast-debug-64bit", + "lfric2lfric_oasis_ral_seuk-C32_lam_MG_1cpu_ex1a_cce_fast-debug-64bit", + "lfric2lfric_oasis_ral_seuk-C32_lam_MG_4cpu_ex1a_cce_fast-debug-64bit", "lfric2lfric_ral3-seuk_ex1a_cce_fast-debug-64bit", - "lfric2lfric_clim_gal9-C24_C12_ex1a_cce_fast-debug-64bit", - "lfric2lfric_oasis_clim_gal9-C24_C12_ex1a_cce_fast-debug-64bit", - "lfric2lfric_oasis_clim_gal9_C12-ral_seuk_C16_lam_ex1a_cce_fast-debug-64bit", - "lfric2lfric_oasis_clim_gal9_C12-ral_seuk_C16_lam-lbc_ex1a_cce_fast-debug-64bit", + "lfric2lfric_clim_gal9-C24_C12_1cpu_ex1a_cce_fast-debug-64bit", + "lfric2lfric_clim_gal9-C24_C12_6cpu_ex1a_cce_fast-debug-64bit", + "lfric2lfric_oasis_clim_gal9-C24_C12_1cpu_ex1a_cce_fast-debug-64bit", + "lfric2lfric_oasis_clim_gal9-C24_C12_6cpu_ex1a_cce_fast-debug-64bit", + "lfric2lfric_oasis_clim_gal9_C12-ral_seuk_C16_lam_1cpu_ex1a_cce_fast-debug-64bit", + "lfric2lfric_oasis_clim_gal9_C12-ral_seuk_C16_lam_4cpu_ex1a_cce_fast-debug-64bit", + "lfric2lfric_oasis_clim_gal9_C12-ral_seuk_C16_lam-lbc_1cpu_ex1a_cce_fast-debug-64bit", + "lfric2lfric_oasis_clim_gal9_C12-ral_seuk_C16_lam-lbc_4cpu_ex1a_cce_fast-debug-64bit", "lfric2lfric_ex1a_canned", ], "lfric2lfric_ex1a_extra": [