From 4f4783db30a025c76808422a097f51a7d8b5c2f0 Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr." Date: Wed, 22 May 2024 12:18:22 -0600 Subject: [PATCH 01/35] Rename SCM_GFS_v17_HR3 to magpie, SCM_GFS_v17_HR3_RRTMGP to robin, and RRFS_v1 to warbler --- ccpp/suites/{suite_SCM_GFS_v17_HR3.xml => magpie.xml} | 2 +- ccpp/suites/{suite_SCM_GFS_v17_HR3_ps.xml => magpie_ps.xml} | 2 +- scm/src/suite_info.py | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) rename ccpp/suites/{suite_SCM_GFS_v17_HR3.xml => magpie.xml} (98%) rename ccpp/suites/{suite_SCM_GFS_v17_HR3_ps.xml => magpie_ps.xml} (98%) diff --git a/ccpp/suites/suite_SCM_GFS_v17_HR3.xml b/ccpp/suites/magpie.xml similarity index 98% rename from ccpp/suites/suite_SCM_GFS_v17_HR3.xml rename to ccpp/suites/magpie.xml index 92effe13c..0fd6a55f7 100644 --- a/ccpp/suites/suite_SCM_GFS_v17_HR3.xml +++ b/ccpp/suites/magpie.xml @@ -1,6 +1,6 @@ - + diff --git a/ccpp/suites/suite_SCM_GFS_v17_HR3_ps.xml b/ccpp/suites/magpie_ps.xml similarity index 98% rename from ccpp/suites/suite_SCM_GFS_v17_HR3_ps.xml rename to ccpp/suites/magpie_ps.xml index d9e833936..3529f45e7 100644 --- a/ccpp/suites/suite_SCM_GFS_v17_HR3_ps.xml +++ b/ccpp/suites/magpie_ps.xml @@ -1,6 +1,6 @@ - + diff --git a/scm/src/suite_info.py b/scm/src/suite_info.py index 69b0b0a73..e41f624ae 100755 --- a/scm/src/suite_info.py +++ b/scm/src/suite_info.py @@ -44,10 +44,10 @@ def timestep(self, value): suite_list = [] suite_list.append(suite('SCM_GFS_v16', 'tracers_GFS_v16.txt', 'input_GFS_v16.nml', 600.0, 1800.0, True )) suite_list.append(suite('SCM_GFS_v17_p8', 'tracers_GFS_v17_p8.txt', 'input_GFS_v17_p8.nml', 600.0, 600.0, True )) -suite_list.append(suite('SCM_GFS_v17_HR3', 'tracers_GFS_v17_HR3.txt', 'input_GFS_v17_HR3.nml', 600.0, 600.0, True )) -suite_list.append(suite('SCM_GFS_v17_HR3_RRTMGP','tracers_GFS_v17_p8.txt', 'input_GFS_v17_HR3_RRTMGP.nml', 600.0, 600.0, True )) +suite_list.append(suite('magpie', 'tracers_GFS_v17_p8.txt', 'input_magpie.nml', 600.0, 600.0, True )) +suite_list.append(suite('robin','tracers_GFS_v17_p8.txt', 'input_GFS_v17_HR3_RRTMGP.nml', 600.0, 600.0, True )) suite_list.append(suite('SCM_RAP', 'tracers_RAP.txt', 'input_RAP.nml', 600.0, 600.0 , True )) -suite_list.append(suite('SCM_RRFS_v1', 'tracers_RRFS_v1.txt', 'input_RRFS_v1.nml', 600.0, 600.0 , True )) +suite_list.append(suite('warbler', 'tracers_RRFS_v1.txt', 'input_RRFS_v1.nml', 600.0, 600.0 , True )) suite_list.append(suite('SCM_RRFS_v1beta', 'tracers_RRFS_v1beta.txt', 'input_RRFS_v1beta.nml', 600.0, 600.0 , True )) suite_list.append(suite('SCM_WoFS_v0', 'tracers_WoFS_v0.txt', 'input_WoFS_v0.nml', 600.0, 600.0 , True )) suite_list.append(suite('SCM_HRRR', 'tracers_HRRR.txt', 'input_HRRR.nml', 600.0, 600.0 , True )) From e2e426b21cd46eb70058d55185804d783bf48f60 Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr." Date: Mon, 20 May 2024 13:40:10 -0600 Subject: [PATCH 02/35] Incorporate capability to use an alias file that maps old suite names to new. Problems that still need solving: - At runtime, there is no logic to map the old suite name to the new for the static API --- .gitmodules | 4 ++-- ccpp/framework | 2 +- ccpp/suites/{suite_HAFS_v0_hwrf.xml => barn_owl.xml} | 2 +- ccpp/suites/{suite_HAFS_v0_hwrf_ps.xml => barn_owl_ps.xml} | 2 +- ccpp/suites/magpie.xml | 5 ++++- ccpp/suites/{suite_SCM_GFS_v16.xml => raven.xml} | 2 +- 6 files changed, 10 insertions(+), 7 deletions(-) rename ccpp/suites/{suite_HAFS_v0_hwrf.xml => barn_owl.xml} (98%) rename ccpp/suites/{suite_HAFS_v0_hwrf_ps.xml => barn_owl_ps.xml} (98%) rename ccpp/suites/{suite_SCM_GFS_v16.xml => raven.xml} (98%) diff --git a/.gitmodules b/.gitmodules index dc0798c32..0460d3fa8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "ccpp-framework"] path = ccpp/framework - url = https://github.com/NCAR/ccpp-framework - branch = main + url = https://github.com/mkavulich/ccpp-framework + branch = feature/suite_names_update [submodule "ccpp-physics"] path = ccpp/physics url = https://github.com/NCAR/ccpp-physics diff --git a/ccpp/framework b/ccpp/framework index f0b9a18b0..6f0a8703a 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit f0b9a18b005d950cb9b0038fbc827b6b37500f43 +Subproject commit 6f0a8703acc2d9576a8b2cd65074527485290de8 diff --git a/ccpp/suites/suite_HAFS_v0_hwrf.xml b/ccpp/suites/barn_owl.xml similarity index 98% rename from ccpp/suites/suite_HAFS_v0_hwrf.xml rename to ccpp/suites/barn_owl.xml index c96348cfd..6ea293e97 100644 --- a/ccpp/suites/suite_HAFS_v0_hwrf.xml +++ b/ccpp/suites/barn_owl.xml @@ -1,6 +1,6 @@ - + diff --git a/ccpp/suites/suite_HAFS_v0_hwrf_ps.xml b/ccpp/suites/barn_owl_ps.xml similarity index 98% rename from ccpp/suites/suite_HAFS_v0_hwrf_ps.xml rename to ccpp/suites/barn_owl_ps.xml index cfae0831a..81a8b18b3 100644 --- a/ccpp/suites/suite_HAFS_v0_hwrf_ps.xml +++ b/ccpp/suites/barn_owl_ps.xml @@ -1,6 +1,6 @@ - + diff --git a/ccpp/suites/magpie.xml b/ccpp/suites/magpie.xml index 0fd6a55f7..3ef5fb464 100644 --- a/ccpp/suites/magpie.xml +++ b/ccpp/suites/magpie.xml @@ -1,5 +1,8 @@ - + diff --git a/ccpp/suites/suite_SCM_GFS_v16.xml b/ccpp/suites/raven.xml similarity index 98% rename from ccpp/suites/suite_SCM_GFS_v16.xml rename to ccpp/suites/raven.xml index 723dbd910..281c9486d 100644 --- a/ccpp/suites/suite_SCM_GFS_v16.xml +++ b/ccpp/suites/raven.xml @@ -1,6 +1,6 @@ - + GFS_time_vary_pre From 5c01f44370687875e048263aa966ee135096dc52 Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr." Date: Mon, 20 May 2024 15:35:57 -0600 Subject: [PATCH 03/35] Forgot to add alias file --- ccpp/suites/alias.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 ccpp/suites/alias.json diff --git a/ccpp/suites/alias.json b/ccpp/suites/alias.json new file mode 100644 index 000000000..6a2d811d9 --- /dev/null +++ b/ccpp/suites/alias.json @@ -0,0 +1,6 @@ +{ + "SCM_GFS_v17_HR3.xml": "magpie.xml", + "SCM_GFS_v16.xml": "raven.xml", + "HAFS_v0_hwrf.xml": "barn_owl.xml", + "HAFS_v0_hwrf_ps.xml": "barn_owl_ps.xml" +} From 60e2d61bead020cb0a7c82d927e1ea1d7a23aff0 Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr." Date: Tue, 21 May 2024 11:16:09 -0600 Subject: [PATCH 04/35] Chugging along. Just updating suites and CCPP part for now, will change namelists, documentation, and other stuff later. This helps test back-compatibility features like the alias file. - Update descriptions of "barn_owl" suites, esp details about "prescribed surface" suites - Another set of renames - Add "rename" script for posterity (will delete before commit) --- ccpp/suites/alias.json | 4 +++- ccpp/suites/barn_owl.xml | 5 ++++- ccpp/suites/barn_owl_ps.xml | 6 +++++- ccpp/suites/rename.sh | 8 ++++++++ .../{suite_HAFS_v0_hwrf_thompson.xml => sunbird.xml} | 7 +++++-- ...{suite_HAFS_v0_hwrf_thompson_ps.xml => sunbird_ps.xml} | 8 ++++++-- 6 files changed, 31 insertions(+), 7 deletions(-) create mode 100755 ccpp/suites/rename.sh rename ccpp/suites/{suite_HAFS_v0_hwrf_thompson.xml => sunbird.xml} (96%) rename ccpp/suites/{suite_HAFS_v0_hwrf_thompson_ps.xml => sunbird_ps.xml} (87%) diff --git a/ccpp/suites/alias.json b/ccpp/suites/alias.json index 6a2d811d9..fc0be99b2 100644 --- a/ccpp/suites/alias.json +++ b/ccpp/suites/alias.json @@ -2,5 +2,7 @@ "SCM_GFS_v17_HR3.xml": "magpie.xml", "SCM_GFS_v16.xml": "raven.xml", "HAFS_v0_hwrf.xml": "barn_owl.xml", - "HAFS_v0_hwrf_ps.xml": "barn_owl_ps.xml" + "HAFS_v0_hwrf_ps.xml": "barn_owl_ps.xml", + "HAFS_v0_hwrf_thompson.xml": "sunbird.xml", + "HAFS_v0_hwrf_thompson_ps.xml": "sunbird_ps.xml" } diff --git a/ccpp/suites/barn_owl.xml b/ccpp/suites/barn_owl.xml index 6ea293e97..19569c6ff 100644 --- a/ccpp/suites/barn_owl.xml +++ b/ccpp/suites/barn_owl.xml @@ -1,5 +1,8 @@ - + diff --git a/ccpp/suites/barn_owl_ps.xml b/ccpp/suites/barn_owl_ps.xml index 81a8b18b3..b7ae67a64 100644 --- a/ccpp/suites/barn_owl_ps.xml +++ b/ccpp/suites/barn_owl_ps.xml @@ -1,5 +1,9 @@ - + diff --git a/ccpp/suites/rename.sh b/ccpp/suites/rename.sh new file mode 100755 index 000000000..178d2dbb5 --- /dev/null +++ b/ccpp/suites/rename.sh @@ -0,0 +1,8 @@ +#!/bin/bash +oldname=$1 +newname=$2 +sed -i.backup "s/$oldname/$newname/g" suite_${oldname}.xml || exit 1 +gsed -i "2i " suite_${oldname}.xml || exit 2 +git mv suite_${oldname}.xml ${newname}.xml +git add ${newname}.xml +echo " \"${oldname}.xml\": \"${newname}.xml\"," >> alias.json diff --git a/ccpp/suites/suite_HAFS_v0_hwrf_thompson.xml b/ccpp/suites/sunbird.xml similarity index 96% rename from ccpp/suites/suite_HAFS_v0_hwrf_thompson.xml rename to ccpp/suites/sunbird.xml index e59f0ebfe..cd76d3a9f 100644 --- a/ccpp/suites/suite_HAFS_v0_hwrf_thompson.xml +++ b/ccpp/suites/sunbird.xml @@ -1,6 +1,9 @@ - - + + diff --git a/ccpp/suites/suite_HAFS_v0_hwrf_thompson_ps.xml b/ccpp/suites/sunbird_ps.xml similarity index 87% rename from ccpp/suites/suite_HAFS_v0_hwrf_thompson_ps.xml rename to ccpp/suites/sunbird_ps.xml index 1831f8829..040206f23 100644 --- a/ccpp/suites/suite_HAFS_v0_hwrf_thompson_ps.xml +++ b/ccpp/suites/sunbird_ps.xml @@ -1,6 +1,10 @@ - - + + From 5292080f5c3341842020a738ecc9e8c04aed779c Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr." Date: Tue, 21 May 2024 11:20:55 -0600 Subject: [PATCH 05/35] No longer necessary to link SDF to run dir --- scm/src/run_scm.py | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/scm/src/run_scm.py b/scm/src/run_scm.py index 926fb68ba..ed05e1da4 100755 --- a/scm/src/run_scm.py +++ b/scm/src/run_scm.py @@ -588,18 +588,6 @@ def setup_rundir(self): cmd = "ln -sf {0} {1}".format(os.path.join(SCM_ROOT, VERT_COORD_DATA_DIR, self._vert_coord_file), os.path.join(SCM_RUN, self._vert_coord_file)) execute(cmd) - # Link physics SDF to run directory - physics_suite = 'suite_' + self._suite + '.xml' - logging.debug('Linking physics suite {0} to run directory'.format(physics_suite)) - if os.path.isfile(os.path.join(SCM_RUN, physics_suite)): - os.remove(os.path.join(SCM_RUN, physics_suite)) - if not os.path.isfile(os.path.join(SCM_ROOT, PHYSICS_SUITE_DIR, physics_suite)): - message = 'Physics suite {0} not found in directory {1}'.format(physics_suite, os.path.join(SCM_ROOT, PHYSICS_SUITE_DIR)) - logging.critical(message) - raise Exception(message) - cmd = "ln -sf {0} {1}".format(os.path.join(SCM_ROOT, PHYSICS_SUITE_DIR, physics_suite), os.path.join(SCM_RUN, physics_suite)) - execute(cmd) - # Link physics data needed for schemes to run directory logging.debug('Linking physics input data from {0} into run directory'.format(os.path.join(SCM_ROOT, PHYSICS_DATA_DIR))) for entry in os.listdir(os.path.join(SCM_ROOT, PHYSICS_DATA_DIR)): From d4226f70f060234d7f558436b33efc4cd8c94f8d Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr." Date: Wed, 22 May 2024 12:19:58 -0600 Subject: [PATCH 06/35] Backtracking on suite-aliasing (AKA allowing people to use old suite names). Now we just force everyone to rename them all. We do keep the ability for suite files to be named "suite_[suitename].xml" for back-compatibility. - Update alias files for new names - Rename physics namelists and tracers for renamed suites - Update renames in various files in src and run directory - Update Regression Test files for renames - Remove old, orphaned SDFs SCM_GFS_v15p2_FA and SCM_GFS_v15p2_MYJ Next commit will rename the rest of the suites. --- ccpp/framework | 2 +- ...input_HAFS_v0_hwrf.nml => input_macaw.nml} | 0 .../{input_GFS_v16.nml => input_raven.nml} | 0 ...nput_GFS_v16_ps.nml => input_raven_ps.nml} | 0 ...v0_hwrf_thompson.nml => input_sunbird.nml} | 0 ccpp/suites/alias.json | 5 +- ccpp/suites/raven.xml | 5 +- ...{suite_SCM_GFS_v16_ps.xml => raven_ps.xml} | 6 +- ccpp/suites/suite_SCM_GFS_v15p2_FA.xml | 80 ------------------- ccpp/suites/suite_SCM_GFS_v15p2_MYJ.xml | 80 ------------------- ccpp/suites/sunbird.xml | 2 +- ccpp/suites/sunbird_ps.xml | 2 +- ...ers_HAFS_v0_hwrf.txt => tracers_macaw.txt} | 0 ...{tracers_GFS_v16.txt => tracers_raven.txt} | 0 ..._hwrf_thompson.txt => tracers_sunbird.txt} | 0 scm/src/GFS_typedefs.meta | 6 +- scm/src/example_multi_run.py | 4 +- scm/src/run_scm.py | 2 +- scm/src/suite_info.py | 10 +-- scm/src/supported_suites.py | 2 +- test/rt_test_cases.py | 10 +-- 21 files changed, 32 insertions(+), 184 deletions(-) rename ccpp/physics_namelists/{input_HAFS_v0_hwrf.nml => input_macaw.nml} (100%) rename ccpp/physics_namelists/{input_GFS_v16.nml => input_raven.nml} (100%) rename ccpp/physics_namelists/{input_GFS_v16_ps.nml => input_raven_ps.nml} (100%) rename ccpp/physics_namelists/{input_HAFS_v0_hwrf_thompson.nml => input_sunbird.nml} (100%) rename ccpp/suites/{suite_SCM_GFS_v16_ps.xml => raven_ps.xml} (95%) delete mode 100644 ccpp/suites/suite_SCM_GFS_v15p2_FA.xml delete mode 100644 ccpp/suites/suite_SCM_GFS_v15p2_MYJ.xml rename scm/etc/tracer_config/{tracers_HAFS_v0_hwrf.txt => tracers_macaw.txt} (100%) rename scm/etc/tracer_config/{tracers_GFS_v16.txt => tracers_raven.txt} (100%) rename scm/etc/tracer_config/{tracers_HAFS_v0_hwrf_thompson.txt => tracers_sunbird.txt} (100%) diff --git a/ccpp/framework b/ccpp/framework index 6f0a8703a..67fa30988 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit 6f0a8703acc2d9576a8b2cd65074527485290de8 +Subproject commit 67fa3098890c2aa48f74d2bb04a7190cdf25619b diff --git a/ccpp/physics_namelists/input_HAFS_v0_hwrf.nml b/ccpp/physics_namelists/input_macaw.nml similarity index 100% rename from ccpp/physics_namelists/input_HAFS_v0_hwrf.nml rename to ccpp/physics_namelists/input_macaw.nml diff --git a/ccpp/physics_namelists/input_GFS_v16.nml b/ccpp/physics_namelists/input_raven.nml similarity index 100% rename from ccpp/physics_namelists/input_GFS_v16.nml rename to ccpp/physics_namelists/input_raven.nml diff --git a/ccpp/physics_namelists/input_GFS_v16_ps.nml b/ccpp/physics_namelists/input_raven_ps.nml similarity index 100% rename from ccpp/physics_namelists/input_GFS_v16_ps.nml rename to ccpp/physics_namelists/input_raven_ps.nml diff --git a/ccpp/physics_namelists/input_HAFS_v0_hwrf_thompson.nml b/ccpp/physics_namelists/input_sunbird.nml similarity index 100% rename from ccpp/physics_namelists/input_HAFS_v0_hwrf_thompson.nml rename to ccpp/physics_namelists/input_sunbird.nml diff --git a/ccpp/suites/alias.json b/ccpp/suites/alias.json index fc0be99b2..c910a883c 100644 --- a/ccpp/suites/alias.json +++ b/ccpp/suites/alias.json @@ -1,8 +1,9 @@ { "SCM_GFS_v17_HR3.xml": "magpie.xml", "SCM_GFS_v16.xml": "raven.xml", - "HAFS_v0_hwrf.xml": "barn_owl.xml", - "HAFS_v0_hwrf_ps.xml": "barn_owl_ps.xml", + "SCM_GFS_v16_ps.xml": "raven_ps.xml", + "HAFS_v0_hwrf.xml": "macaw.xml", + "HAFS_v0_hwrf_ps.xml": "macaw_ps.xml", "HAFS_v0_hwrf_thompson.xml": "sunbird.xml", "HAFS_v0_hwrf_thompson_ps.xml": "sunbird_ps.xml" } diff --git a/ccpp/suites/raven.xml b/ccpp/suites/raven.xml index 281c9486d..0dabe8b04 100644 --- a/ccpp/suites/raven.xml +++ b/ccpp/suites/raven.xml @@ -1,5 +1,8 @@ - + diff --git a/ccpp/suites/suite_SCM_GFS_v16_ps.xml b/ccpp/suites/raven_ps.xml similarity index 95% rename from ccpp/suites/suite_SCM_GFS_v16_ps.xml rename to ccpp/suites/raven_ps.xml index 6320bf6a6..9571c0fcc 100644 --- a/ccpp/suites/suite_SCM_GFS_v16_ps.xml +++ b/ccpp/suites/raven_ps.xml @@ -1,6 +1,10 @@ + - + GFS_time_vary_pre diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_FA.xml b/ccpp/suites/suite_SCM_GFS_v15p2_FA.xml deleted file mode 100644 index 19d469bc6..000000000 --- a/ccpp/suites/suite_SCM_GFS_v15p2_FA.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - GFS_time_vary_pre - GFS_rrtmg_setup - GFS_rad_time_vary - GFS_phys_time_vary - - - - - GFS_suite_interstitial_rad_reset - GFS_rrtmg_pre - GFS_radiation_surface - rad_sw_pre - rrtmg_sw - rrtmg_sw_post - rrtmg_lw - rrtmg_lw_post - GFS_rrtmg_post - - - - - GFS_suite_interstitial_phys_reset - GFS_suite_stateout_reset - get_prs_fv3 - GFS_suite_interstitial_1 - GFS_surface_generic_pre - GFS_surface_composites_pre - dcyc2t3 - GFS_surface_composites_inter - GFS_suite_interstitial_2 - - - - sfc_diff - GFS_surface_loop_control_part1 - sfc_nst_pre - sfc_nst - sfc_nst_post - lsm_noah - sfc_sice - GFS_surface_loop_control_part2 - - - - GFS_surface_composites_post - sfc_diag - sfc_diag_post - GFS_surface_generic_post - GFS_PBL_generic_pre - hedmf - GFS_PBL_generic_post - GFS_GWD_generic_pre - cires_ugwp - cires_ugwp_post - GFS_GWD_generic_post - GFS_suite_stateout_update - h2ophys - get_phi_fv3 - GFS_suite_interstitial_3 - GFS_DCNV_generic_pre - samfdeepcnv - GFS_DCNV_generic_post - GFS_SCNV_generic_pre - samfshalcnv - GFS_SCNV_generic_post - GFS_suite_interstitial_4 - cnvc90 - GFS_MP_generic_pre - mp_fer_hires - GFS_MP_generic_post - maximum_hourly_diagnostics - GFS_physics_post - - - diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_MYJ.xml b/ccpp/suites/suite_SCM_GFS_v15p2_MYJ.xml deleted file mode 100644 index ff52d53dc..000000000 --- a/ccpp/suites/suite_SCM_GFS_v15p2_MYJ.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - GFS_time_vary_pre - GFS_rrtmg_setup - GFS_rad_time_vary - GFS_phys_time_vary - - - - - GFS_suite_interstitial_rad_reset - GFS_rrtmg_pre - GFS_radiation_surface - rad_sw_pre - rrtmg_sw - rrtmg_sw_post - rrtmg_lw - rrtmg_lw_post - GFS_rrtmg_post - - - - - GFS_suite_interstitial_phys_reset - GFS_suite_stateout_reset - get_prs_fv3 - GFS_suite_interstitial_1 - GFS_surface_generic_pre - GFS_surface_composites_pre - dcyc2t3 - GFS_surface_composites_inter - GFS_suite_interstitial_2 - - - - myjsfc_wrapper - GFS_surface_loop_control_part1 - sfc_nst_pre - sfc_nst - sfc_nst_post - lsm_noah - sfc_sice - GFS_surface_loop_control_part2 - - - - GFS_surface_composites_post - sfc_diag - sfc_diag_post - GFS_surface_generic_post - GFS_PBL_generic_pre - myjpbl_wrapper - GFS_PBL_generic_post - GFS_GWD_generic_pre - cires_ugwp - cires_ugwp_post - GFS_GWD_generic_post - GFS_suite_stateout_update - h2ophys - get_phi_fv3 - GFS_suite_interstitial_3 - GFS_DCNV_generic_pre - samfdeepcnv - GFS_DCNV_generic_post - GFS_SCNV_generic_pre - samfshalcnv - GFS_SCNV_generic_post - GFS_suite_interstitial_4 - cnvc90 - GFS_MP_generic_pre - gfdl_cloud_microphys - GFS_MP_generic_post - maximum_hourly_diagnostics - GFS_physics_post - - - diff --git a/ccpp/suites/sunbird.xml b/ccpp/suites/sunbird.xml index cd76d3a9f..14d7e7ce1 100644 --- a/ccpp/suites/sunbird.xml +++ b/ccpp/suites/sunbird.xml @@ -1,7 +1,7 @@ diff --git a/ccpp/suites/sunbird_ps.xml b/ccpp/suites/sunbird_ps.xml index 040206f23..6d6fcd8b7 100644 --- a/ccpp/suites/sunbird_ps.xml +++ b/ccpp/suites/sunbird_ps.xml @@ -1,7 +1,7 @@ diff --git a/scm/etc/tracer_config/tracers_HAFS_v0_hwrf.txt b/scm/etc/tracer_config/tracers_macaw.txt similarity index 100% rename from scm/etc/tracer_config/tracers_HAFS_v0_hwrf.txt rename to scm/etc/tracer_config/tracers_macaw.txt diff --git a/scm/etc/tracer_config/tracers_GFS_v16.txt b/scm/etc/tracer_config/tracers_raven.txt similarity index 100% rename from scm/etc/tracer_config/tracers_GFS_v16.txt rename to scm/etc/tracer_config/tracers_raven.txt diff --git a/scm/etc/tracer_config/tracers_HAFS_v0_hwrf_thompson.txt b/scm/etc/tracer_config/tracers_sunbird.txt similarity index 100% rename from scm/etc/tracer_config/tracers_HAFS_v0_hwrf_thompson.txt rename to scm/etc/tracer_config/tracers_sunbird.txt diff --git a/scm/src/GFS_typedefs.meta b/scm/src/GFS_typedefs.meta index 02f58b37a..7694c952f 100644 --- a/scm/src/GFS_typedefs.meta +++ b/scm/src/GFS_typedefs.meta @@ -10047,7 +10047,7 @@ [ltg1_max] standard_name = lightning_threat_index_1 long_name = lightning threat index 1 - units = flashes 5 min-1 + units = flashes min-1 dimensions = (horizontal_loop_extent) type = real kind = kind_phys @@ -10056,7 +10056,7 @@ [ltg2_max] standard_name = lightning_threat_index_2 long_name = lightning threat index 2 - units = flashes 5 min-1 + units = flashes min-1 dimensions = (horizontal_loop_extent) type = real kind = kind_phys @@ -10065,7 +10065,7 @@ [ltg3_max] standard_name = lightning_threat_index_3 long_name = lightning threat index 3 - units = flashes 5 min-1 + units = flashes min-1 dimensions = (horizontal_loop_extent) type = real kind = kind_phys diff --git a/scm/src/example_multi_run.py b/scm/src/example_multi_run.py index 342183c32..88e5dbc6f 100644 --- a/scm/src/example_multi_run.py +++ b/scm/src/example_multi_run.py @@ -1,3 +1,3 @@ cases = ["bomex"] -suites = ["SCM_GFS_v16","SCM_GFS_v17_p8"] -namelists = ["input_GFS_v16.nml","input_GFS_v17_p8.nml"] +suites = ["raven","SCM_GFS_v17_p8"] +namelists = ["input_raven.nml","input_GFS_v17_p8.nml"] diff --git a/scm/src/run_scm.py b/scm/src/run_scm.py index ed05e1da4..7328ffdd3 100755 --- a/scm/src/run_scm.py +++ b/scm/src/run_scm.py @@ -70,7 +70,7 @@ PHYSICS_SUITE_DIR = 'ccpp/suites' # Default suite to use if none is specified -DEFAULT_SUITE = 'SCM_GFS_v16' +DEFAULT_SUITE = 'raven' # Path to physics data files (relative to scm_root) PHYSICS_DATA_DIR = 'scm/data/physics_input_data' diff --git a/scm/src/suite_info.py b/scm/src/suite_info.py index e41f624ae..cbb9a40a0 100755 --- a/scm/src/suite_info.py +++ b/scm/src/suite_info.py @@ -42,7 +42,7 @@ def timestep(self, value): raise Exception(message) suite_list = [] -suite_list.append(suite('SCM_GFS_v16', 'tracers_GFS_v16.txt', 'input_GFS_v16.nml', 600.0, 1800.0, True )) +suite_list.append(suite('raven', 'tracers_raven.txt', 'input_raven.nml', 600.0, 1800.0, True )) suite_list.append(suite('SCM_GFS_v17_p8', 'tracers_GFS_v17_p8.txt', 'input_GFS_v17_p8.nml', 600.0, 600.0, True )) suite_list.append(suite('magpie', 'tracers_GFS_v17_p8.txt', 'input_magpie.nml', 600.0, 600.0, True )) suite_list.append(suite('robin','tracers_GFS_v17_p8.txt', 'input_GFS_v17_HR3_RRTMGP.nml', 600.0, 600.0, True )) @@ -60,10 +60,10 @@ def timestep(self, value): suite_list.append(suite('SCM_GFS_v15p2_YSU', 'tracers_GFS_v15p2.txt', 'input_GFS_v15p2_YSU.nml', 600.0, 1800.0, False)) suite_list.append(suite('SCM_GFS_v15p2_saYSU', 'tracers_GFS_v15p2.txt', 'input_GFS_v15p2_saYSU.nml', 600.0, 1800.0, False)) suite_list.append(suite('SCM_GFS_v15p2_ACM', 'tracers_GFS_v15p2.txt', 'input_GFS_v15p2_ACM.nml', 600.0, 1800.0, False)) -suite_list.append(suite('SCM_GFS_v16_RRTMGP', 'tracers_GFS_v16.txt', 'input_GFS_v16_RRTMGP.nml', 600.0, 1800.0, False)) -suite_list.append(suite('SCM_GFS_v16_no_nsst', 'tracers_GFS_v16.txt', 'input_GFS_v16.nml', 600.0, 1800.0, False)) -suite_list.append(suite('HAFS_v0_hwrf', 'tracers_HAFS_v0_hwrf.txt', 'input_HAFS_v0_hwrf.nml', 600.0, 1800.0, False)) -suite_list.append(suite('HAFS_v0_hwrf_thompson', 'tracers_HAFS_v0_hwrf_thompson.txt', 'input_HAFS_v0_hwrf_thompson.nml', 600.0, 600.0 , False)) +suite_list.append(suite('SCM_GFS_v16_RRTMGP', 'tracers_raven.txt', 'input_GFS_v16_RRTMGP.nml', 600.0, 1800.0, False)) +suite_list.append(suite('SCM_GFS_v16_no_nsst', 'tracers_raven.txt', 'input_raven.nml', 600.0, 1800.0, False)) +suite_list.append(suite('macaw', 'tracers_macaw.txt', 'input_macaw.nml', 600.0, 1800.0, False)) +suite_list.append(suite('sunbird', 'tracers_sunbird.txt', 'input_sunbird.nml', 600.0, 600.0 , False)) suite_list.append(suite('SCM_GSD_v1nssl', 'tracers_gsd_nssl.txt', 'input_GSD_v1nssl.nml', 600.0, 600.0 , False)) suite_list.append(suite('SCM_GSD_v1', 'tracers_gsd.txt', 'input_GSD_v1.nml', 600.0, 600.0 , False)) suite_list.append(suite('SCM_RRFS_v1nssl', 'tracers_RRFS_v1nssl_nohail_noccn.txt', 'input_RRFS_v1nssl_nohailnoccn.nml', 600.0, 600.0 , False)) diff --git a/scm/src/supported_suites.py b/scm/src/supported_suites.py index aee06a705..ad6c8f0e5 100644 --- a/scm/src/supported_suites.py +++ b/scm/src/supported_suites.py @@ -1 +1 @@ -suites = ["SCM_GFS_v16","SCM_GFS_v17_p8","SCM_GFS_v17_HR3","SCM_HRRR","SCM_RAP","SCM_RRFS_v1beta","SCM_WoFS_v0"] +suites = ["raven","magpie","SCM_HRRR","SCM_RAP","SCM_RRFS_v1beta","SCM_WoFS_v0"] diff --git a/test/rt_test_cases.py b/test/rt_test_cases.py index d9145a1b3..7c02f060f 100644 --- a/test/rt_test_cases.py +++ b/test/rt_test_cases.py @@ -2,31 +2,31 @@ #---------------------------------------------------------------------------------------------------------------------------------------------- # CCPP-SCM v6 supported suites #---------------------------------------------------------------------------------------------------------------------------------------------- - {"case": "arm_sgp_summer_1997_A", "suite": "SCM_GFS_v16"}, \ + {"case": "arm_sgp_summer_1997_A", "suite": "raven"}, \ {"case": "arm_sgp_summer_1997_A", "suite": "SCM_GFS_v17_p8"}, \ {"case": "arm_sgp_summer_1997_A", "suite": "SCM_HRRR"}, \ {"case": "arm_sgp_summer_1997_A", "suite": "SCM_RRFS_v1beta"}, \ {"case": "arm_sgp_summer_1997_A", "suite": "SCM_RAP"}, \ {"case": "arm_sgp_summer_1997_A", "suite": "SCM_WoFS_v0"}, \ - {"case": "twpice", "suite": "SCM_GFS_v16"}, \ + {"case": "twpice", "suite": "raven"}, \ {"case": "twpice", "suite": "SCM_GFS_v17_p8"}, \ {"case": "twpice", "suite": "SCM_HRRR"}, \ {"case": "twpice", "suite": "SCM_RRFS_v1beta"}, \ {"case": "twpice", "suite": "SCM_RAP"}, \ {"case": "twpice", "suite": "SCM_WoFS_v0"}, \ - {"case": "bomex", "suite": "SCM_GFS_v16"}, \ + {"case": "bomex", "suite": "raven"}, \ {"case": "bomex", "suite": "SCM_GFS_v17_p8"}, \ {"case": "bomex", "suite": "SCM_HRRR"}, \ {"case": "bomex", "suite": "SCM_RRFS_v1beta"}, \ {"case": "bomex", "suite": "SCM_RAP"}, \ {"case": "bomex", "suite": "SCM_WoFS_v0"}, \ - {"case": "astex", "suite": "SCM_GFS_v16"}, \ + {"case": "astex", "suite": "raven"}, \ {"case": "astex", "suite": "SCM_GFS_v17_p8"}, \ {"case": "astex", "suite": "SCM_HRRR"}, \ {"case": "astex", "suite": "SCM_RRFS_v1beta"}, \ {"case": "astex", "suite": "SCM_RAP"}, \ {"case": "astex", "suite": "SCM_WoFS_v0"}, \ - {"case": "LASSO_2016051812", "suite": "SCM_GFS_v16"}, \ + {"case": "LASSO_2016051812", "suite": "raven"}, \ {"case": "LASSO_2016051812", "suite": "SCM_GFS_v17_p8"}, \ {"case": "LASSO_2016051812", "suite": "SCM_HRRR"}, \ {"case": "LASSO_2016051812", "suite": "SCM_RRFS_v1beta"}, \ From 52c1dae0cffc42e0a29df9b162deefe61bea4f87 Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr." Date: Tue, 21 May 2024 14:50:44 -0600 Subject: [PATCH 07/35] Update physics submodule for PR to eliminate illegal "flashes 5 min -1" units --- .gitmodules | 4 ++-- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 0460d3fa8..9fbb5eb58 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,8 +4,8 @@ branch = feature/suite_names_update [submodule "ccpp-physics"] path = ccpp/physics - url = https://github.com/NCAR/ccpp-physics - branch = main + url = https://github.com/mkavulich/ccpp-physics + branch = ufs-dev-182 [submodule "CMakeModules"] path = CMakeModules url = https://github.com/noaa-emc/CMakeModules diff --git a/ccpp/physics b/ccpp/physics index 6d8fccbea..8f657c1da 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 6d8fccbea12c11387c0bc457dcb3855574cd29aa +Subproject commit 8f657c1da6cf94992a19853cf1c46ad636c8931d From 6e5ca3984d0e2a25da0f4537f2485cd0a488eb0a Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr." Date: Wed, 22 May 2024 12:20:55 -0600 Subject: [PATCH 08/35] Don't rename tracers and namelists, just suites --- .../{input_raven.nml => input_GFS_v16.nml} | 0 .../{input_raven_ps.nml => input_GFS_v16_ps.nml} | 0 .../{input_macaw.nml => input_HAFS_v0_hwrf.nml} | 0 ...put_sunbird.nml => input_HAFS_v0_hwrf_thompson.nml} | 0 ccpp/suites/magpie_ps.xml | 4 ++++ .../{tracers_raven.txt => tracers_GFS_v16.txt} | 0 .../{tracers_macaw.txt => tracers_HAFS_v0_hwrf.txt} | 0 ...s_sunbird.txt => tracers_HAFS_v0_hwrf_thompson.txt} | 0 scm/src/example_multi_run.py | 2 +- scm/src/suite_info.py | 10 +++++----- 10 files changed, 10 insertions(+), 6 deletions(-) rename ccpp/physics_namelists/{input_raven.nml => input_GFS_v16.nml} (100%) rename ccpp/physics_namelists/{input_raven_ps.nml => input_GFS_v16_ps.nml} (100%) rename ccpp/physics_namelists/{input_macaw.nml => input_HAFS_v0_hwrf.nml} (100%) rename ccpp/physics_namelists/{input_sunbird.nml => input_HAFS_v0_hwrf_thompson.nml} (100%) rename scm/etc/tracer_config/{tracers_raven.txt => tracers_GFS_v16.txt} (100%) rename scm/etc/tracer_config/{tracers_macaw.txt => tracers_HAFS_v0_hwrf.txt} (100%) rename scm/etc/tracer_config/{tracers_sunbird.txt => tracers_HAFS_v0_hwrf_thompson.txt} (100%) diff --git a/ccpp/physics_namelists/input_raven.nml b/ccpp/physics_namelists/input_GFS_v16.nml similarity index 100% rename from ccpp/physics_namelists/input_raven.nml rename to ccpp/physics_namelists/input_GFS_v16.nml diff --git a/ccpp/physics_namelists/input_raven_ps.nml b/ccpp/physics_namelists/input_GFS_v16_ps.nml similarity index 100% rename from ccpp/physics_namelists/input_raven_ps.nml rename to ccpp/physics_namelists/input_GFS_v16_ps.nml diff --git a/ccpp/physics_namelists/input_macaw.nml b/ccpp/physics_namelists/input_HAFS_v0_hwrf.nml similarity index 100% rename from ccpp/physics_namelists/input_macaw.nml rename to ccpp/physics_namelists/input_HAFS_v0_hwrf.nml diff --git a/ccpp/physics_namelists/input_sunbird.nml b/ccpp/physics_namelists/input_HAFS_v0_hwrf_thompson.nml similarity index 100% rename from ccpp/physics_namelists/input_sunbird.nml rename to ccpp/physics_namelists/input_HAFS_v0_hwrf_thompson.nml diff --git a/ccpp/suites/magpie_ps.xml b/ccpp/suites/magpie_ps.xml index 3529f45e7..4321ab3b2 100644 --- a/ccpp/suites/magpie_ps.xml +++ b/ccpp/suites/magpie_ps.xml @@ -1,4 +1,8 @@ + diff --git a/scm/etc/tracer_config/tracers_raven.txt b/scm/etc/tracer_config/tracers_GFS_v16.txt similarity index 100% rename from scm/etc/tracer_config/tracers_raven.txt rename to scm/etc/tracer_config/tracers_GFS_v16.txt diff --git a/scm/etc/tracer_config/tracers_macaw.txt b/scm/etc/tracer_config/tracers_HAFS_v0_hwrf.txt similarity index 100% rename from scm/etc/tracer_config/tracers_macaw.txt rename to scm/etc/tracer_config/tracers_HAFS_v0_hwrf.txt diff --git a/scm/etc/tracer_config/tracers_sunbird.txt b/scm/etc/tracer_config/tracers_HAFS_v0_hwrf_thompson.txt similarity index 100% rename from scm/etc/tracer_config/tracers_sunbird.txt rename to scm/etc/tracer_config/tracers_HAFS_v0_hwrf_thompson.txt diff --git a/scm/src/example_multi_run.py b/scm/src/example_multi_run.py index 88e5dbc6f..d372cc6d5 100644 --- a/scm/src/example_multi_run.py +++ b/scm/src/example_multi_run.py @@ -1,3 +1,3 @@ cases = ["bomex"] suites = ["raven","SCM_GFS_v17_p8"] -namelists = ["input_raven.nml","input_GFS_v17_p8.nml"] +namelists = ["input_GFS_v16.nml","input_GFS_v17_p8.nml"] diff --git a/scm/src/suite_info.py b/scm/src/suite_info.py index cbb9a40a0..c14eb93ab 100755 --- a/scm/src/suite_info.py +++ b/scm/src/suite_info.py @@ -42,7 +42,7 @@ def timestep(self, value): raise Exception(message) suite_list = [] -suite_list.append(suite('raven', 'tracers_raven.txt', 'input_raven.nml', 600.0, 1800.0, True )) +suite_list.append(suite('raven', 'tracers_GFS_v16.txt', 'input_GFS_v16.nml', 600.0, 1800.0, True )) suite_list.append(suite('SCM_GFS_v17_p8', 'tracers_GFS_v17_p8.txt', 'input_GFS_v17_p8.nml', 600.0, 600.0, True )) suite_list.append(suite('magpie', 'tracers_GFS_v17_p8.txt', 'input_magpie.nml', 600.0, 600.0, True )) suite_list.append(suite('robin','tracers_GFS_v17_p8.txt', 'input_GFS_v17_HR3_RRTMGP.nml', 600.0, 600.0, True )) @@ -60,10 +60,10 @@ def timestep(self, value): suite_list.append(suite('SCM_GFS_v15p2_YSU', 'tracers_GFS_v15p2.txt', 'input_GFS_v15p2_YSU.nml', 600.0, 1800.0, False)) suite_list.append(suite('SCM_GFS_v15p2_saYSU', 'tracers_GFS_v15p2.txt', 'input_GFS_v15p2_saYSU.nml', 600.0, 1800.0, False)) suite_list.append(suite('SCM_GFS_v15p2_ACM', 'tracers_GFS_v15p2.txt', 'input_GFS_v15p2_ACM.nml', 600.0, 1800.0, False)) -suite_list.append(suite('SCM_GFS_v16_RRTMGP', 'tracers_raven.txt', 'input_GFS_v16_RRTMGP.nml', 600.0, 1800.0, False)) -suite_list.append(suite('SCM_GFS_v16_no_nsst', 'tracers_raven.txt', 'input_raven.nml', 600.0, 1800.0, False)) -suite_list.append(suite('macaw', 'tracers_macaw.txt', 'input_macaw.nml', 600.0, 1800.0, False)) -suite_list.append(suite('sunbird', 'tracers_sunbird.txt', 'input_sunbird.nml', 600.0, 600.0 , False)) +suite_list.append(suite('SCM_GFS_v16_RRTMGP', 'tracers_GFS_v16.txt', 'input_GFS_v16_RRTMGP.nml', 600.0, 1800.0, False)) +suite_list.append(suite('SCM_GFS_v16_no_nsst', 'tracers_GFS_v16.txt', 'input_GFS_v16.nml', 600.0, 1800.0, False)) +suite_list.append(suite('macaw', 'tracers_HAFS_v0_hwrf.txt', 'input_HAFS_v0_hwrf.nml', 600.0, 1800.0, False)) +suite_list.append(suite('sunbird', 'tracers_HAFS_v0_hwrf_thompson.txt', 'input_HAFS_v0_hwrf_thompson.nml', 600.0, 600.0 , False)) suite_list.append(suite('SCM_GSD_v1nssl', 'tracers_gsd_nssl.txt', 'input_GSD_v1nssl.nml', 600.0, 600.0 , False)) suite_list.append(suite('SCM_GSD_v1', 'tracers_gsd.txt', 'input_GSD_v1.nml', 600.0, 600.0 , False)) suite_list.append(suite('SCM_RRFS_v1nssl', 'tracers_RRFS_v1nssl_nohail_noccn.txt', 'input_RRFS_v1nssl_nohailnoccn.nml', 600.0, 600.0 , False)) From ac84f034a0b54beac577be04e9bcf4d0fd70142c Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr." Date: Wed, 22 May 2024 12:22:35 -0600 Subject: [PATCH 09/35] - Rename all "supported" suites. Include more detailed descriptions for each. - Un-delete suite_SCM_GFS_v15p2_MYJ, which is still present in "suite_info.py" --- .../{suite_SCM_RAP.xml => albatross.xml} | 7 +- ...{suite_SCM_RAP_ps.xml => albatross_ps.xml} | 8 +- ccpp/suites/alias.json | 16 +++- .../{suite_SCM_HRRR.xml => bald_eagle.xml} | 7 +- ...uite_SCM_HRRR_ps.xml => bald_eagle_ps.xml} | 8 +- ccpp/suites/barn_owl.xml | 2 +- ccpp/suites/barn_owl_ps.xml | 2 +- ...{suite_SCM_GFS_v17_p8.xml => bluebird.xml} | 7 +- ..._SCM_GFS_v17_p8_ps.xml => bluebird_ps.xml} | 8 +- ...{suite_SCM_WoFS_v0.xml => hummingbird.xml} | 9 +- ..._SCM_WoFS_v0_ps.xml => hummingbird_ps.xml} | 10 ++- ccpp/suites/kingfisher.xml | 83 +++++++++++++++++++ ...SCM_GFS_v15p2_ps.xml => kingfisher_ps.xml} | 8 +- ccpp/suites/magpie.xml | 3 +- ccpp/suites/magpie_ps.xml | 4 +- ...ite_SCM_GFS_v17_p8_c3.xml => parakeet.xml} | 7 +- ...M_GFS_v17_p8_c3_ps.xml => parakeet_ps.xml} | 8 +- .../{suite_SCM_RRFS_v1beta.xml => pigeon.xml} | 7 +- ...e_SCM_RRFS_v1beta_ps.xml => pigeon_ps.xml} | 8 +- ccpp/suites/raven.xml | 2 +- ccpp/suites/raven_ps.xml | 4 +- ..._v15p2.xml => suite_SCM_GFS_v15p2_MYJ.xml} | 6 +- ccpp/suites/sunbird_ps.xml | 2 +- scm/src/example_multi_run.py | 2 +- scm/src/suite_info.py | 14 ++-- scm/src/supported_suites.py | 2 +- test/rt_test_cases.py | 60 +++++++------- 27 files changed, 224 insertions(+), 80 deletions(-) rename ccpp/suites/{suite_SCM_RAP.xml => albatross.xml} (89%) rename ccpp/suites/{suite_SCM_RAP_ps.xml => albatross_ps.xml} (80%) rename ccpp/suites/{suite_SCM_HRRR.xml => bald_eagle.xml} (86%) rename ccpp/suites/{suite_SCM_HRRR_ps.xml => bald_eagle_ps.xml} (76%) rename ccpp/suites/{suite_SCM_GFS_v17_p8.xml => bluebird.xml} (88%) rename ccpp/suites/{suite_SCM_GFS_v17_p8_ps.xml => bluebird_ps.xml} (80%) rename ccpp/suites/{suite_SCM_WoFS_v0.xml => hummingbird.xml} (91%) rename ccpp/suites/{suite_SCM_WoFS_v0_ps.xml => hummingbird_ps.xml} (80%) create mode 100644 ccpp/suites/kingfisher.xml rename ccpp/suites/{suite_SCM_GFS_v15p2_ps.xml => kingfisher_ps.xml} (79%) rename ccpp/suites/{suite_SCM_GFS_v17_p8_c3.xml => parakeet.xml} (88%) rename ccpp/suites/{suite_SCM_GFS_v17_p8_c3_ps.xml => parakeet_ps.xml} (80%) rename ccpp/suites/{suite_SCM_RRFS_v1beta.xml => pigeon.xml} (93%) rename ccpp/suites/{suite_SCM_RRFS_v1beta_ps.xml => pigeon_ps.xml} (83%) rename ccpp/suites/{suite_SCM_GFS_v15p2.xml => suite_SCM_GFS_v15p2_MYJ.xml} (95%) diff --git a/ccpp/suites/suite_SCM_RAP.xml b/ccpp/suites/albatross.xml similarity index 89% rename from ccpp/suites/suite_SCM_RAP.xml rename to ccpp/suites/albatross.xml index 68040872d..646f9c909 100644 --- a/ccpp/suites/suite_SCM_RAP.xml +++ b/ccpp/suites/albatross.xml @@ -1,6 +1,9 @@ - - + + diff --git a/ccpp/suites/suite_SCM_RAP_ps.xml b/ccpp/suites/albatross_ps.xml similarity index 80% rename from ccpp/suites/suite_SCM_RAP_ps.xml rename to ccpp/suites/albatross_ps.xml index 6855b1167..7278a2cdf 100644 --- a/ccpp/suites/suite_SCM_RAP_ps.xml +++ b/ccpp/suites/albatross_ps.xml @@ -1,6 +1,10 @@ - - + + diff --git a/ccpp/suites/alias.json b/ccpp/suites/alias.json index c910a883c..8935392f7 100644 --- a/ccpp/suites/alias.json +++ b/ccpp/suites/alias.json @@ -5,5 +5,19 @@ "HAFS_v0_hwrf.xml": "macaw.xml", "HAFS_v0_hwrf_ps.xml": "macaw_ps.xml", "HAFS_v0_hwrf_thompson.xml": "sunbird.xml", - "HAFS_v0_hwrf_thompson_ps.xml": "sunbird_ps.xml" + "HAFS_v0_hwrf_thompson_ps.xml": "sunbird_ps.xml", + "SCM_GFS_v17_p8_c3.xml": "parakeet.xml", + "SCM_GFS_v17_p8_c3_ps.xml": "parakeet_ps.xml", + "SCM_GFS_v15p2.xml": "kingfisher.xml", + "SCM_GFS_v15p2_ps.xml": "kingfisher_ps.xml", + "SCM_GFS_v17_p8.xml": "bluebird.xml", + "SCM_HRRR.xml": "bald_eagle.xml", + "SCM_RAP.xml": "albatross.xml", + "SCM_RRFS_v1beta.xml": "pigeon.xml", + "SCM_WoFS_v0.xml": "hummingbird.xml", + "SCM_GFS_v17_p8_ps.xml": "bluebird_ps.xml", + "SCM_HRRR_ps.xml": "bald_eagle_ps.xml", + "SCM_RAP_ps.xml": "albatross_ps.xml", + "SCM_RRFS_v1beta_ps.xml": "pigeon_ps.xml", + "SCM_WoFS_v0_ps.xml": "hummingbird_ps.xml" } diff --git a/ccpp/suites/suite_SCM_HRRR.xml b/ccpp/suites/bald_eagle.xml similarity index 86% rename from ccpp/suites/suite_SCM_HRRR.xml rename to ccpp/suites/bald_eagle.xml index 7904da3f3..b722049fc 100644 --- a/ccpp/suites/suite_SCM_HRRR.xml +++ b/ccpp/suites/bald_eagle.xml @@ -1,6 +1,9 @@ - - + + diff --git a/ccpp/suites/suite_SCM_HRRR_ps.xml b/ccpp/suites/bald_eagle_ps.xml similarity index 76% rename from ccpp/suites/suite_SCM_HRRR_ps.xml rename to ccpp/suites/bald_eagle_ps.xml index e1f930dbf..baa953863 100644 --- a/ccpp/suites/suite_SCM_HRRR_ps.xml +++ b/ccpp/suites/bald_eagle_ps.xml @@ -1,6 +1,10 @@ - - + + diff --git a/ccpp/suites/barn_owl.xml b/ccpp/suites/barn_owl.xml index 19569c6ff..81a85e5ff 100644 --- a/ccpp/suites/barn_owl.xml +++ b/ccpp/suites/barn_owl.xml @@ -1,7 +1,7 @@ diff --git a/ccpp/suites/barn_owl_ps.xml b/ccpp/suites/barn_owl_ps.xml index b7ae67a64..8a0a8fd8c 100644 --- a/ccpp/suites/barn_owl_ps.xml +++ b/ccpp/suites/barn_owl_ps.xml @@ -1,7 +1,7 @@ diff --git a/ccpp/suites/suite_SCM_GFS_v17_p8.xml b/ccpp/suites/bluebird.xml similarity index 88% rename from ccpp/suites/suite_SCM_GFS_v17_p8.xml rename to ccpp/suites/bluebird.xml index 17eb9993b..12e678691 100644 --- a/ccpp/suites/suite_SCM_GFS_v17_p8.xml +++ b/ccpp/suites/bluebird.xml @@ -1,6 +1,9 @@ - - + + diff --git a/ccpp/suites/suite_SCM_GFS_v17_p8_ps.xml b/ccpp/suites/bluebird_ps.xml similarity index 80% rename from ccpp/suites/suite_SCM_GFS_v17_p8_ps.xml rename to ccpp/suites/bluebird_ps.xml index 35c3941a8..a2b24a2d0 100644 --- a/ccpp/suites/suite_SCM_GFS_v17_p8_ps.xml +++ b/ccpp/suites/bluebird_ps.xml @@ -1,6 +1,10 @@ - - + + diff --git a/ccpp/suites/suite_SCM_WoFS_v0.xml b/ccpp/suites/hummingbird.xml similarity index 91% rename from ccpp/suites/suite_SCM_WoFS_v0.xml rename to ccpp/suites/hummingbird.xml index a16c8b116..eb3029bdb 100644 --- a/ccpp/suites/suite_SCM_WoFS_v0.xml +++ b/ccpp/suites/hummingbird.xml @@ -1,6 +1,9 @@ - - + + @@ -70,4 +73,4 @@ - \ No newline at end of file + diff --git a/ccpp/suites/suite_SCM_WoFS_v0_ps.xml b/ccpp/suites/hummingbird_ps.xml similarity index 80% rename from ccpp/suites/suite_SCM_WoFS_v0_ps.xml rename to ccpp/suites/hummingbird_ps.xml index 3592ac2b5..5435b5ee0 100644 --- a/ccpp/suites/suite_SCM_WoFS_v0_ps.xml +++ b/ccpp/suites/hummingbird_ps.xml @@ -1,6 +1,10 @@ - - + + @@ -51,4 +55,4 @@ - \ No newline at end of file + diff --git a/ccpp/suites/kingfisher.xml b/ccpp/suites/kingfisher.xml new file mode 100644 index 000000000..c26fd9a27 --- /dev/null +++ b/ccpp/suites/kingfisher.xml @@ -0,0 +1,83 @@ + + + + + + GFS_time_vary_pre + GFS_rrtmg_setup + GFS_rad_time_vary + GFS_phys_time_vary + + + + + GFS_suite_interstitial_rad_reset + GFS_rrtmg_pre + GFS_radiation_surface + rad_sw_pre + rrtmg_sw + rrtmg_sw_post + rrtmg_lw + rrtmg_lw_post + GFS_rrtmg_post + + + + + GFS_suite_interstitial_phys_reset + GFS_suite_stateout_reset + get_prs_fv3 + GFS_suite_interstitial_1 + GFS_surface_generic_pre + GFS_surface_composites_pre + dcyc2t3 + GFS_surface_composites_inter + GFS_suite_interstitial_2 + + + + sfc_diff + GFS_surface_loop_control_part1 + sfc_nst_pre + sfc_nst + sfc_nst_post + lsm_noah + sfc_sice + GFS_surface_loop_control_part2 + + + + GFS_surface_composites_post + sfc_diag + sfc_diag_post + GFS_surface_generic_post + GFS_PBL_generic_pre + hedmf + GFS_PBL_generic_post + GFS_GWD_generic_pre + cires_ugwp + cires_ugwp_post + GFS_GWD_generic_post + GFS_suite_stateout_update + h2ophys + get_phi_fv3 + GFS_suite_interstitial_3 + GFS_DCNV_generic_pre + samfdeepcnv + GFS_DCNV_generic_post + GFS_SCNV_generic_pre + samfshalcnv + GFS_SCNV_generic_post + GFS_suite_interstitial_4 + cnvc90 + GFS_MP_generic_pre + gfdl_cloud_microphys + GFS_MP_generic_post + maximum_hourly_diagnostics + GFS_physics_post + + + diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_ps.xml b/ccpp/suites/kingfisher_ps.xml similarity index 79% rename from ccpp/suites/suite_SCM_GFS_v15p2_ps.xml rename to ccpp/suites/kingfisher_ps.xml index 9fb1ac66b..de910dfcb 100644 --- a/ccpp/suites/suite_SCM_GFS_v15p2_ps.xml +++ b/ccpp/suites/kingfisher_ps.xml @@ -1,6 +1,10 @@ - - + + GFS_time_vary_pre diff --git a/ccpp/suites/magpie.xml b/ccpp/suites/magpie.xml index 3ef5fb464..b201878ff 100644 --- a/ccpp/suites/magpie.xml +++ b/ccpp/suites/magpie.xml @@ -1,7 +1,8 @@ diff --git a/ccpp/suites/magpie_ps.xml b/ccpp/suites/magpie_ps.xml index 4321ab3b2..e8940e7c2 100644 --- a/ccpp/suites/magpie_ps.xml +++ b/ccpp/suites/magpie_ps.xml @@ -1,9 +1,9 @@ - diff --git a/ccpp/suites/suite_SCM_GFS_v17_p8_c3.xml b/ccpp/suites/parakeet.xml similarity index 88% rename from ccpp/suites/suite_SCM_GFS_v17_p8_c3.xml rename to ccpp/suites/parakeet.xml index 5105ec520..7a174ab34 100644 --- a/ccpp/suites/suite_SCM_GFS_v17_p8_c3.xml +++ b/ccpp/suites/parakeet.xml @@ -1,6 +1,9 @@ - - + + diff --git a/ccpp/suites/suite_SCM_GFS_v17_p8_c3_ps.xml b/ccpp/suites/parakeet_ps.xml similarity index 80% rename from ccpp/suites/suite_SCM_GFS_v17_p8_c3_ps.xml rename to ccpp/suites/parakeet_ps.xml index 4a759285c..14c495755 100644 --- a/ccpp/suites/suite_SCM_GFS_v17_p8_c3_ps.xml +++ b/ccpp/suites/parakeet_ps.xml @@ -1,6 +1,10 @@ - - + + diff --git a/ccpp/suites/suite_SCM_RRFS_v1beta.xml b/ccpp/suites/pigeon.xml similarity index 93% rename from ccpp/suites/suite_SCM_RRFS_v1beta.xml rename to ccpp/suites/pigeon.xml index 1921f3f56..ca8b73801 100644 --- a/ccpp/suites/suite_SCM_RRFS_v1beta.xml +++ b/ccpp/suites/pigeon.xml @@ -1,6 +1,9 @@ - - + + diff --git a/ccpp/suites/suite_SCM_RRFS_v1beta_ps.xml b/ccpp/suites/pigeon_ps.xml similarity index 83% rename from ccpp/suites/suite_SCM_RRFS_v1beta_ps.xml rename to ccpp/suites/pigeon_ps.xml index 4c554c438..90a0c6449 100644 --- a/ccpp/suites/suite_SCM_RRFS_v1beta_ps.xml +++ b/ccpp/suites/pigeon_ps.xml @@ -1,6 +1,10 @@ - - + + diff --git a/ccpp/suites/raven.xml b/ccpp/suites/raven.xml index 0dabe8b04..9cfdab67d 100644 --- a/ccpp/suites/raven.xml +++ b/ccpp/suites/raven.xml @@ -1,7 +1,7 @@ diff --git a/ccpp/suites/raven_ps.xml b/ccpp/suites/raven_ps.xml index 9571c0fcc..aefb8c809 100644 --- a/ccpp/suites/raven_ps.xml +++ b/ccpp/suites/raven_ps.xml @@ -1,9 +1,9 @@ - diff --git a/ccpp/suites/suite_SCM_GFS_v15p2.xml b/ccpp/suites/suite_SCM_GFS_v15p2_MYJ.xml similarity index 95% rename from ccpp/suites/suite_SCM_GFS_v15p2.xml rename to ccpp/suites/suite_SCM_GFS_v15p2_MYJ.xml index 087e25d4a..ff52d53dc 100644 --- a/ccpp/suites/suite_SCM_GFS_v15p2.xml +++ b/ccpp/suites/suite_SCM_GFS_v15p2_MYJ.xml @@ -1,6 +1,6 @@ - + GFS_time_vary_pre @@ -36,7 +36,7 @@ - sfc_diff + myjsfc_wrapper GFS_surface_loop_control_part1 sfc_nst_pre sfc_nst @@ -52,7 +52,7 @@ sfc_diag_post GFS_surface_generic_post GFS_PBL_generic_pre - hedmf + myjpbl_wrapper GFS_PBL_generic_post GFS_GWD_generic_pre cires_ugwp diff --git a/ccpp/suites/sunbird_ps.xml b/ccpp/suites/sunbird_ps.xml index 6d6fcd8b7..08c93c3ef 100644 --- a/ccpp/suites/sunbird_ps.xml +++ b/ccpp/suites/sunbird_ps.xml @@ -1,7 +1,7 @@ diff --git a/scm/src/example_multi_run.py b/scm/src/example_multi_run.py index d372cc6d5..af5faea22 100644 --- a/scm/src/example_multi_run.py +++ b/scm/src/example_multi_run.py @@ -1,3 +1,3 @@ cases = ["bomex"] -suites = ["raven","SCM_GFS_v17_p8"] +suites = ["raven","bluebird"] namelists = ["input_GFS_v16.nml","input_GFS_v17_p8.nml"] diff --git a/scm/src/suite_info.py b/scm/src/suite_info.py index c14eb93ab..833836973 100755 --- a/scm/src/suite_info.py +++ b/scm/src/suite_info.py @@ -43,16 +43,16 @@ def timestep(self, value): suite_list = [] suite_list.append(suite('raven', 'tracers_GFS_v16.txt', 'input_GFS_v16.nml', 600.0, 1800.0, True )) -suite_list.append(suite('SCM_GFS_v17_p8', 'tracers_GFS_v17_p8.txt', 'input_GFS_v17_p8.nml', 600.0, 600.0, True )) -suite_list.append(suite('magpie', 'tracers_GFS_v17_p8.txt', 'input_magpie.nml', 600.0, 600.0, True )) +suite_list.append(suite('bluebird', 'tracers_GFS_v17_p8.txt', 'input_GFS_v17_p8.nml', 600.0, 600.0, True )) +suite_list.append(suite('magpie', 'tracers_GFS_v17_p8.txt', 'input_GFS_v17_HR3.nml', 600.0, 600.0, True )) suite_list.append(suite('robin','tracers_GFS_v17_p8.txt', 'input_GFS_v17_HR3_RRTMGP.nml', 600.0, 600.0, True )) -suite_list.append(suite('SCM_RAP', 'tracers_RAP.txt', 'input_RAP.nml', 600.0, 600.0 , True )) +suite_list.append(suite('albatross', 'tracers_RAP.txt', 'input_RAP.nml', 600.0, 600.0 , True )) suite_list.append(suite('warbler', 'tracers_RRFS_v1.txt', 'input_RRFS_v1.nml', 600.0, 600.0 , True )) -suite_list.append(suite('SCM_RRFS_v1beta', 'tracers_RRFS_v1beta.txt', 'input_RRFS_v1beta.nml', 600.0, 600.0 , True )) -suite_list.append(suite('SCM_WoFS_v0', 'tracers_WoFS_v0.txt', 'input_WoFS_v0.nml', 600.0, 600.0 , True )) -suite_list.append(suite('SCM_HRRR', 'tracers_HRRR.txt', 'input_HRRR.nml', 600.0, 600.0 , True )) +suite_list.append(suite('pigeon', 'tracers_RRFS_v1beta.txt', 'input_RRFS_v1beta.nml', 600.0, 600.0 , True )) +suite_list.append(suite('hummingbird', 'tracers_WoFS_v0.txt', 'input_WoFS_v0.nml', 600.0, 600.0 , True )) +suite_list.append(suite('bald_eagle', 'tracers_HRRR.txt', 'input_HRRR.nml', 600.0, 600.0 , True )) -suite_list.append(suite('SCM_GFS_v15p2', 'tracers_GFS_v15p2.txt', 'input_GFS_v15p2.nml', 600.0, 1800.0, False)) +suite_list.append(suite('kingfisher', 'tracers_GFS_v15p2.txt', 'input_GFS_v15p2.nml', 600.0, 1800.0, False)) suite_list.append(suite('SCM_GFS_v15p2_RRTMGP', 'tracers_GFS_v15p2.txt', 'input_GFS_v15p2_RRTMGP.nml', 600.0, 1800.0, False)) suite_list.append(suite('SCM_GFS_v15p2_no_nsst', 'tracers_GFS_v15p2.txt', 'input_GFS_v15p2.nml', 600.0, 1800.0, False)) suite_list.append(suite('SCM_GFS_v15p2_noahmp', 'tracers_GFS_v15p2.txt', 'input_GFS_v15p2_noahmp.nml', 600.0, 1800.0, False)) diff --git a/scm/src/supported_suites.py b/scm/src/supported_suites.py index ad6c8f0e5..1d7b72039 100644 --- a/scm/src/supported_suites.py +++ b/scm/src/supported_suites.py @@ -1 +1 @@ -suites = ["raven","magpie","SCM_HRRR","SCM_RAP","SCM_RRFS_v1beta","SCM_WoFS_v0"] +suites = ["raven","magpie","bluebird","bald_eagle","albatross","pigeon","hummingbird"] diff --git a/test/rt_test_cases.py b/test/rt_test_cases.py index 7c02f060f..2f48a4685 100644 --- a/test/rt_test_cases.py +++ b/test/rt_test_cases.py @@ -3,43 +3,43 @@ # CCPP-SCM v6 supported suites #---------------------------------------------------------------------------------------------------------------------------------------------- {"case": "arm_sgp_summer_1997_A", "suite": "raven"}, \ - {"case": "arm_sgp_summer_1997_A", "suite": "SCM_GFS_v17_p8"}, \ - {"case": "arm_sgp_summer_1997_A", "suite": "SCM_HRRR"}, \ - {"case": "arm_sgp_summer_1997_A", "suite": "SCM_RRFS_v1beta"}, \ - {"case": "arm_sgp_summer_1997_A", "suite": "SCM_RAP"}, \ - {"case": "arm_sgp_summer_1997_A", "suite": "SCM_WoFS_v0"}, \ + {"case": "arm_sgp_summer_1997_A", "suite": "bluebird"}, \ + {"case": "arm_sgp_summer_1997_A", "suite": "bald_eagle"}, \ + {"case": "arm_sgp_summer_1997_A", "suite": "pigeon"}, \ + {"case": "arm_sgp_summer_1997_A", "suite": "albatross"}, \ + {"case": "arm_sgp_summer_1997_A", "suite": "hummingbird"}, \ {"case": "twpice", "suite": "raven"}, \ - {"case": "twpice", "suite": "SCM_GFS_v17_p8"}, \ - {"case": "twpice", "suite": "SCM_HRRR"}, \ - {"case": "twpice", "suite": "SCM_RRFS_v1beta"}, \ - {"case": "twpice", "suite": "SCM_RAP"}, \ - {"case": "twpice", "suite": "SCM_WoFS_v0"}, \ + {"case": "twpice", "suite": "bluebird"}, \ + {"case": "twpice", "suite": "bald_eagle"}, \ + {"case": "twpice", "suite": "pigeon"}, \ + {"case": "twpice", "suite": "albatross"}, \ + {"case": "twpice", "suite": "hummingbird"}, \ {"case": "bomex", "suite": "raven"}, \ - {"case": "bomex", "suite": "SCM_GFS_v17_p8"}, \ - {"case": "bomex", "suite": "SCM_HRRR"}, \ - {"case": "bomex", "suite": "SCM_RRFS_v1beta"}, \ - {"case": "bomex", "suite": "SCM_RAP"}, \ - {"case": "bomex", "suite": "SCM_WoFS_v0"}, \ + {"case": "bomex", "suite": "bluebird"}, \ + {"case": "bomex", "suite": "bald_eagle"}, \ + {"case": "bomex", "suite": "pigeon"}, \ + {"case": "bomex", "suite": "albatross"}, \ + {"case": "bomex", "suite": "hummingbird"}, \ {"case": "astex", "suite": "raven"}, \ - {"case": "astex", "suite": "SCM_GFS_v17_p8"}, \ - {"case": "astex", "suite": "SCM_HRRR"}, \ - {"case": "astex", "suite": "SCM_RRFS_v1beta"}, \ - {"case": "astex", "suite": "SCM_RAP"}, \ - {"case": "astex", "suite": "SCM_WoFS_v0"}, \ + {"case": "astex", "suite": "bluebird"}, \ + {"case": "astex", "suite": "bald_eagle"}, \ + {"case": "astex", "suite": "pigeon"}, \ + {"case": "astex", "suite": "albatross"}, \ + {"case": "astex", "suite": "hummingbird"}, \ {"case": "LASSO_2016051812", "suite": "raven"}, \ - {"case": "LASSO_2016051812", "suite": "SCM_GFS_v17_p8"}, \ - {"case": "LASSO_2016051812", "suite": "SCM_HRRR"}, \ - {"case": "LASSO_2016051812", "suite": "SCM_RRFS_v1beta"}, \ - {"case": "LASSO_2016051812", "suite": "SCM_RAP"}, \ - {"case": "LASSO_2016051812", "suite": "SCM_WoFS_v0"}, \ + {"case": "LASSO_2016051812", "suite": "bluebird"}, \ + {"case": "LASSO_2016051812", "suite": "bald_eagle"}, \ + {"case": "LASSO_2016051812", "suite": "pigeon"}, \ + {"case": "LASSO_2016051812", "suite": "albatross"}, \ + {"case": "LASSO_2016051812", "suite": "hummingbird"}, \ #--------------------------------------------------------------------------------------------------------------------------------------------------- # Unsupported suites (w/ supported cases) #--------------------------------------------------------------------------------------------------------------------------------------------------- - {"case": "arm_sgp_summer_1997_A", "suite": "SCM_GFS_v15p2"}, \ - {"case": "twpice", "suite": "SCM_GFS_v15p2"}, \ - {"case": "bomex", "suite": "SCM_GFS_v15p2"}, \ - {"case": "astex", "suite": "SCM_GFS_v15p2"}, \ - {"case": "LASSO_2016051812", "suite": "SCM_GFS_v15p2"}]#, \ + {"case": "arm_sgp_summer_1997_A", "suite": "kingfisher"}, \ + {"case": "twpice", "suite": "kingfisher"}, \ + {"case": "bomex", "suite": "kingfisher"}, \ + {"case": "astex", "suite": "kingfisher"}, \ + {"case": "LASSO_2016051812", "suite": "kingfisher"}]#, \ # {"case": "arm_sgp_summer_1997_A", "suite": "SCM_GFS_v17_p8_RRTMGP", "namelist": "input_GFS_v17_p8_RRTMGP.nml", "tracer": "tracers_GFS_v17_p8.txt"},\ # {"case": "twpice", "suite": "SCM_GFS_v17_p8_RRTMGP", "namelist": "input_GFS_v17_p8_RRTMGP.nml", "tracer": "tracers_GFS_v17_p8.txt"},\ # {"case": "bomex", "suite": "SCM_GFS_v17_p8_RRTMGP", "namelist": "input_GFS_v17_p8_RRTMGP.nml", "tracer": "tracers_GFS_v17_p8.txt"},\ From 93c1dddb7e60c158ba159d48bac68ec0f00c8fdb Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr." Date: Tue, 21 May 2024 21:19:12 -0600 Subject: [PATCH 10/35] Move a bunch of old suites to "suites_not_used" directory, analogous to treatment of old suites in fv3atm. No reason to waste a bird on these! --- .../suite_SCM_GFS_v15p2_ACM_ps.xml | 0 .../suite_SCM_GFS_v15p2_MYJ.xml | 0 .../suite_SCM_GFS_v15p2_RRTMGP.xml | 0 .../suite_SCM_GFS_v15p2_RRTMGP_ps.xml | 0 .../suite_SCM_GFS_v15p2_YSU_ps.xml | 0 .../suite_SCM_GFS_v15p2_no_nsst.xml | 0 .../suite_SCM_GFS_v15p2_no_nsst_ps.xml | 0 .../suite_SCM_GFS_v15p2_noahmp.xml | 0 .../suite_SCM_GFS_v15p2_saYSU_ps.xml | 0 ccpp/{suites => suites_not_used}/suite_SCM_GSD_v1.xml | 0 .../suite_SCM_GSD_v1_ps.xml | 0 .../suite_SCM_GSD_v1nssl.xml | 0 .../suite_SCM_GSD_v1nssl_ps.xml | 0 ccpp/{suites => suites_not_used}/suite_SCM_csawmg.xml | 0 .../suite_SCM_csawmg_ps.xml | 0 scm/src/suite_info.py | 10 ---------- 16 files changed, 10 deletions(-) rename ccpp/{suites => suites_not_used}/suite_SCM_GFS_v15p2_ACM_ps.xml (100%) rename ccpp/{suites => suites_not_used}/suite_SCM_GFS_v15p2_MYJ.xml (100%) rename ccpp/{suites => suites_not_used}/suite_SCM_GFS_v15p2_RRTMGP.xml (100%) rename ccpp/{suites => suites_not_used}/suite_SCM_GFS_v15p2_RRTMGP_ps.xml (100%) rename ccpp/{suites => suites_not_used}/suite_SCM_GFS_v15p2_YSU_ps.xml (100%) rename ccpp/{suites => suites_not_used}/suite_SCM_GFS_v15p2_no_nsst.xml (100%) rename ccpp/{suites => suites_not_used}/suite_SCM_GFS_v15p2_no_nsst_ps.xml (100%) rename ccpp/{suites => suites_not_used}/suite_SCM_GFS_v15p2_noahmp.xml (100%) rename ccpp/{suites => suites_not_used}/suite_SCM_GFS_v15p2_saYSU_ps.xml (100%) rename ccpp/{suites => suites_not_used}/suite_SCM_GSD_v1.xml (100%) rename ccpp/{suites => suites_not_used}/suite_SCM_GSD_v1_ps.xml (100%) rename ccpp/{suites => suites_not_used}/suite_SCM_GSD_v1nssl.xml (100%) rename ccpp/{suites => suites_not_used}/suite_SCM_GSD_v1nssl_ps.xml (100%) rename ccpp/{suites => suites_not_used}/suite_SCM_csawmg.xml (100%) rename ccpp/{suites => suites_not_used}/suite_SCM_csawmg_ps.xml (100%) diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_ACM_ps.xml b/ccpp/suites_not_used/suite_SCM_GFS_v15p2_ACM_ps.xml similarity index 100% rename from ccpp/suites/suite_SCM_GFS_v15p2_ACM_ps.xml rename to ccpp/suites_not_used/suite_SCM_GFS_v15p2_ACM_ps.xml diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_MYJ.xml b/ccpp/suites_not_used/suite_SCM_GFS_v15p2_MYJ.xml similarity index 100% rename from ccpp/suites/suite_SCM_GFS_v15p2_MYJ.xml rename to ccpp/suites_not_used/suite_SCM_GFS_v15p2_MYJ.xml diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_RRTMGP.xml b/ccpp/suites_not_used/suite_SCM_GFS_v15p2_RRTMGP.xml similarity index 100% rename from ccpp/suites/suite_SCM_GFS_v15p2_RRTMGP.xml rename to ccpp/suites_not_used/suite_SCM_GFS_v15p2_RRTMGP.xml diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_RRTMGP_ps.xml b/ccpp/suites_not_used/suite_SCM_GFS_v15p2_RRTMGP_ps.xml similarity index 100% rename from ccpp/suites/suite_SCM_GFS_v15p2_RRTMGP_ps.xml rename to ccpp/suites_not_used/suite_SCM_GFS_v15p2_RRTMGP_ps.xml diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_YSU_ps.xml b/ccpp/suites_not_used/suite_SCM_GFS_v15p2_YSU_ps.xml similarity index 100% rename from ccpp/suites/suite_SCM_GFS_v15p2_YSU_ps.xml rename to ccpp/suites_not_used/suite_SCM_GFS_v15p2_YSU_ps.xml diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_no_nsst.xml b/ccpp/suites_not_used/suite_SCM_GFS_v15p2_no_nsst.xml similarity index 100% rename from ccpp/suites/suite_SCM_GFS_v15p2_no_nsst.xml rename to ccpp/suites_not_used/suite_SCM_GFS_v15p2_no_nsst.xml diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_no_nsst_ps.xml b/ccpp/suites_not_used/suite_SCM_GFS_v15p2_no_nsst_ps.xml similarity index 100% rename from ccpp/suites/suite_SCM_GFS_v15p2_no_nsst_ps.xml rename to ccpp/suites_not_used/suite_SCM_GFS_v15p2_no_nsst_ps.xml diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_noahmp.xml b/ccpp/suites_not_used/suite_SCM_GFS_v15p2_noahmp.xml similarity index 100% rename from ccpp/suites/suite_SCM_GFS_v15p2_noahmp.xml rename to ccpp/suites_not_used/suite_SCM_GFS_v15p2_noahmp.xml diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_saYSU_ps.xml b/ccpp/suites_not_used/suite_SCM_GFS_v15p2_saYSU_ps.xml similarity index 100% rename from ccpp/suites/suite_SCM_GFS_v15p2_saYSU_ps.xml rename to ccpp/suites_not_used/suite_SCM_GFS_v15p2_saYSU_ps.xml diff --git a/ccpp/suites/suite_SCM_GSD_v1.xml b/ccpp/suites_not_used/suite_SCM_GSD_v1.xml similarity index 100% rename from ccpp/suites/suite_SCM_GSD_v1.xml rename to ccpp/suites_not_used/suite_SCM_GSD_v1.xml diff --git a/ccpp/suites/suite_SCM_GSD_v1_ps.xml b/ccpp/suites_not_used/suite_SCM_GSD_v1_ps.xml similarity index 100% rename from ccpp/suites/suite_SCM_GSD_v1_ps.xml rename to ccpp/suites_not_used/suite_SCM_GSD_v1_ps.xml diff --git a/ccpp/suites/suite_SCM_GSD_v1nssl.xml b/ccpp/suites_not_used/suite_SCM_GSD_v1nssl.xml similarity index 100% rename from ccpp/suites/suite_SCM_GSD_v1nssl.xml rename to ccpp/suites_not_used/suite_SCM_GSD_v1nssl.xml diff --git a/ccpp/suites/suite_SCM_GSD_v1nssl_ps.xml b/ccpp/suites_not_used/suite_SCM_GSD_v1nssl_ps.xml similarity index 100% rename from ccpp/suites/suite_SCM_GSD_v1nssl_ps.xml rename to ccpp/suites_not_used/suite_SCM_GSD_v1nssl_ps.xml diff --git a/ccpp/suites/suite_SCM_csawmg.xml b/ccpp/suites_not_used/suite_SCM_csawmg.xml similarity index 100% rename from ccpp/suites/suite_SCM_csawmg.xml rename to ccpp/suites_not_used/suite_SCM_csawmg.xml diff --git a/ccpp/suites/suite_SCM_csawmg_ps.xml b/ccpp/suites_not_used/suite_SCM_csawmg_ps.xml similarity index 100% rename from ccpp/suites/suite_SCM_csawmg_ps.xml rename to ccpp/suites_not_used/suite_SCM_csawmg_ps.xml diff --git a/scm/src/suite_info.py b/scm/src/suite_info.py index 833836973..cd7112d90 100755 --- a/scm/src/suite_info.py +++ b/scm/src/suite_info.py @@ -53,21 +53,11 @@ def timestep(self, value): suite_list.append(suite('bald_eagle', 'tracers_HRRR.txt', 'input_HRRR.nml', 600.0, 600.0 , True )) suite_list.append(suite('kingfisher', 'tracers_GFS_v15p2.txt', 'input_GFS_v15p2.nml', 600.0, 1800.0, False)) -suite_list.append(suite('SCM_GFS_v15p2_RRTMGP', 'tracers_GFS_v15p2.txt', 'input_GFS_v15p2_RRTMGP.nml', 600.0, 1800.0, False)) -suite_list.append(suite('SCM_GFS_v15p2_no_nsst', 'tracers_GFS_v15p2.txt', 'input_GFS_v15p2.nml', 600.0, 1800.0, False)) -suite_list.append(suite('SCM_GFS_v15p2_noahmp', 'tracers_GFS_v15p2.txt', 'input_GFS_v15p2_noahmp.nml', 600.0, 1800.0, False)) -suite_list.append(suite('SCM_GFS_v15p2_MYJ', 'tracers_GFS_v15p2.txt', 'input_GFS_v15p2_MYJ.nml', 600.0, 1800.0, False)) -suite_list.append(suite('SCM_GFS_v15p2_YSU', 'tracers_GFS_v15p2.txt', 'input_GFS_v15p2_YSU.nml', 600.0, 1800.0, False)) -suite_list.append(suite('SCM_GFS_v15p2_saYSU', 'tracers_GFS_v15p2.txt', 'input_GFS_v15p2_saYSU.nml', 600.0, 1800.0, False)) -suite_list.append(suite('SCM_GFS_v15p2_ACM', 'tracers_GFS_v15p2.txt', 'input_GFS_v15p2_ACM.nml', 600.0, 1800.0, False)) suite_list.append(suite('SCM_GFS_v16_RRTMGP', 'tracers_GFS_v16.txt', 'input_GFS_v16_RRTMGP.nml', 600.0, 1800.0, False)) suite_list.append(suite('SCM_GFS_v16_no_nsst', 'tracers_GFS_v16.txt', 'input_GFS_v16.nml', 600.0, 1800.0, False)) suite_list.append(suite('macaw', 'tracers_HAFS_v0_hwrf.txt', 'input_HAFS_v0_hwrf.nml', 600.0, 1800.0, False)) suite_list.append(suite('sunbird', 'tracers_HAFS_v0_hwrf_thompson.txt', 'input_HAFS_v0_hwrf_thompson.nml', 600.0, 600.0 , False)) -suite_list.append(suite('SCM_GSD_v1nssl', 'tracers_gsd_nssl.txt', 'input_GSD_v1nssl.nml', 600.0, 600.0 , False)) -suite_list.append(suite('SCM_GSD_v1', 'tracers_gsd.txt', 'input_GSD_v1.nml', 600.0, 600.0 , False)) suite_list.append(suite('SCM_RRFS_v1nssl', 'tracers_RRFS_v1nssl_nohail_noccn.txt', 'input_RRFS_v1nssl_nohailnoccn.nml', 600.0, 600.0 , False)) -suite_list.append(suite('SCM_csawmg', 'tracers_csawmg.txt', 'input_csawmg.nml', 600.0, 1800.0, False)) def main(): From c8f60dfd6ba5829454d8ad43991b2041a88ebe3a Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr." Date: Wed, 22 May 2024 12:23:23 -0600 Subject: [PATCH 11/35] Finished renaming! - Moved a few more to "suites_not_used" - More specific description for prescribed surface suites --- ccpp/suites/albatross_ps.xml | 2 +- ccpp/suites/alias.json | 9 ++++++- ccpp/suites/bald_eagle_ps.xml | 2 +- ccpp/suites/barn_owl_ps.xml | 2 +- ccpp/suites/bluebird_ps.xml | 2 +- ...uite_SCM_RRFS_v1nssl.xml => crossbill.xml} | 7 +++-- ccpp/suites/hummingbird_ps.xml | 2 +- ccpp/suites/kingfisher_ps.xml | 2 +- ccpp/suites/magpie_ps.xml | 2 +- ...ite_SCM_GFS_v16_RRTMGP.xml => mallard.xml} | 7 +++-- ...M_GFS_v16_RRTMGP_ps.xml => mallard_ps.xml} | 9 +++++-- ...e_SCM_GFS_v16_no_nsst.xml => nuthatch.xml} | 7 +++-- ...GFS_v16_no_nsst_ps.xml => nuthatch_ps.xml} | 9 +++++-- ccpp/suites/parakeet_ps.xml | 2 +- ccpp/suites/pigeon_ps.xml | 2 +- ccpp/suites/raven_ps.xml | 2 +- ccpp/suites/sunbird_ps.xml | 2 +- .../suite_SCM_GFS_v16_ugwpv1.xml | 0 .../suite_SCM_RRFS_v1alpha.xml | 5 +++- .../suite_SCM_RRFS_v1alpha_ps.xml | 6 ++++- scm/src/suite_info.py | 26 +++++++++---------- 21 files changed, 70 insertions(+), 37 deletions(-) rename ccpp/suites/{suite_SCM_RRFS_v1nssl.xml => crossbill.xml} (85%) rename ccpp/suites/{suite_SCM_GFS_v16_RRTMGP.xml => mallard.xml} (89%) rename ccpp/suites/{suite_SCM_GFS_v16_RRTMGP_ps.xml => mallard_ps.xml} (79%) rename ccpp/suites/{suite_SCM_GFS_v16_no_nsst.xml => nuthatch.xml} (91%) rename ccpp/suites/{suite_SCM_GFS_v16_no_nsst_ps.xml => nuthatch_ps.xml} (80%) rename ccpp/{suites => suites_not_used}/suite_SCM_GFS_v16_ugwpv1.xml (100%) rename ccpp/{suites => suites_not_used}/suite_SCM_RRFS_v1alpha.xml (95%) rename ccpp/{suites => suites_not_used}/suite_SCM_RRFS_v1alpha_ps.xml (85%) diff --git a/ccpp/suites/albatross_ps.xml b/ccpp/suites/albatross_ps.xml index 7278a2cdf..ce2c5831a 100644 --- a/ccpp/suites/albatross_ps.xml +++ b/ccpp/suites/albatross_ps.xml @@ -2,7 +2,7 @@ diff --git a/ccpp/suites/alias.json b/ccpp/suites/alias.json index 8935392f7..3c4815d91 100644 --- a/ccpp/suites/alias.json +++ b/ccpp/suites/alias.json @@ -19,5 +19,12 @@ "SCM_HRRR_ps.xml": "bald_eagle_ps.xml", "SCM_RAP_ps.xml": "albatross_ps.xml", "SCM_RRFS_v1beta_ps.xml": "pigeon_ps.xml", - "SCM_WoFS_v0_ps.xml": "hummingbird_ps.xml" + "SCM_WoFS_v0_ps.xml": "hummingbird_ps.xml", + "SCM_GFS_v16_RRTMGP.xml": "mallard.xml", + "SCM_GFS_v16_RRTMGP_ps.xml": "mallard_ps.xml", + "SCM_GFS_v16_no_nsst.xml": "nuthatch.xml", + "SCM_GFS_v16_no_nsst_ps.xml": "nuthatch_ps.xml", + "SCM_RRFS_v1alpha.xml": "towhee.xml", + "SCM_RRFS_v1alpha_ps.xml": "towhee_ps.xml", + "SCM_RRFS_v1nssl.xml": "crossbill.xml" } diff --git a/ccpp/suites/bald_eagle_ps.xml b/ccpp/suites/bald_eagle_ps.xml index baa953863..c528f3357 100644 --- a/ccpp/suites/bald_eagle_ps.xml +++ b/ccpp/suites/bald_eagle_ps.xml @@ -2,7 +2,7 @@ diff --git a/ccpp/suites/barn_owl_ps.xml b/ccpp/suites/barn_owl_ps.xml index 8a0a8fd8c..8478f9728 100644 --- a/ccpp/suites/barn_owl_ps.xml +++ b/ccpp/suites/barn_owl_ps.xml @@ -2,7 +2,7 @@ diff --git a/ccpp/suites/bluebird_ps.xml b/ccpp/suites/bluebird_ps.xml index a2b24a2d0..fc24ec585 100644 --- a/ccpp/suites/bluebird_ps.xml +++ b/ccpp/suites/bluebird_ps.xml @@ -2,7 +2,7 @@ diff --git a/ccpp/suites/suite_SCM_RRFS_v1nssl.xml b/ccpp/suites/crossbill.xml similarity index 85% rename from ccpp/suites/suite_SCM_RRFS_v1nssl.xml rename to ccpp/suites/crossbill.xml index 439f34737..92a3a0ed5 100644 --- a/ccpp/suites/suite_SCM_RRFS_v1nssl.xml +++ b/ccpp/suites/crossbill.xml @@ -1,6 +1,9 @@ - - + + diff --git a/ccpp/suites/hummingbird_ps.xml b/ccpp/suites/hummingbird_ps.xml index 5435b5ee0..0606e9ca2 100644 --- a/ccpp/suites/hummingbird_ps.xml +++ b/ccpp/suites/hummingbird_ps.xml @@ -2,7 +2,7 @@ diff --git a/ccpp/suites/kingfisher_ps.xml b/ccpp/suites/kingfisher_ps.xml index de910dfcb..9c279fad3 100644 --- a/ccpp/suites/kingfisher_ps.xml +++ b/ccpp/suites/kingfisher_ps.xml @@ -2,7 +2,7 @@ diff --git a/ccpp/suites/magpie_ps.xml b/ccpp/suites/magpie_ps.xml index e8940e7c2..1da41bccb 100644 --- a/ccpp/suites/magpie_ps.xml +++ b/ccpp/suites/magpie_ps.xml @@ -2,7 +2,7 @@ diff --git a/ccpp/suites/suite_SCM_GFS_v16_RRTMGP.xml b/ccpp/suites/mallard.xml similarity index 89% rename from ccpp/suites/suite_SCM_GFS_v16_RRTMGP.xml rename to ccpp/suites/mallard.xml index b427bcf25..15bd1cec0 100644 --- a/ccpp/suites/suite_SCM_GFS_v16_RRTMGP.xml +++ b/ccpp/suites/mallard.xml @@ -1,6 +1,9 @@ - - + + GFS_time_vary_pre diff --git a/ccpp/suites/suite_SCM_GFS_v16_RRTMGP_ps.xml b/ccpp/suites/mallard_ps.xml similarity index 79% rename from ccpp/suites/suite_SCM_GFS_v16_RRTMGP_ps.xml rename to ccpp/suites/mallard_ps.xml index 31ea5c712..53bb4f40e 100644 --- a/ccpp/suites/suite_SCM_GFS_v16_RRTMGP_ps.xml +++ b/ccpp/suites/mallard_ps.xml @@ -1,6 +1,11 @@ - - + + GFS_time_vary_pre diff --git a/ccpp/suites/suite_SCM_GFS_v16_no_nsst.xml b/ccpp/suites/nuthatch.xml similarity index 91% rename from ccpp/suites/suite_SCM_GFS_v16_no_nsst.xml rename to ccpp/suites/nuthatch.xml index 19733a6eb..b3d8c3dd4 100644 --- a/ccpp/suites/suite_SCM_GFS_v16_no_nsst.xml +++ b/ccpp/suites/nuthatch.xml @@ -1,6 +1,9 @@ - - + + GFS_time_vary_pre diff --git a/ccpp/suites/suite_SCM_GFS_v16_no_nsst_ps.xml b/ccpp/suites/nuthatch_ps.xml similarity index 80% rename from ccpp/suites/suite_SCM_GFS_v16_no_nsst_ps.xml rename to ccpp/suites/nuthatch_ps.xml index 5437699c1..96c91ea5d 100644 --- a/ccpp/suites/suite_SCM_GFS_v16_no_nsst_ps.xml +++ b/ccpp/suites/nuthatch_ps.xml @@ -1,6 +1,11 @@ - - + + GFS_time_vary_pre diff --git a/ccpp/suites/parakeet_ps.xml b/ccpp/suites/parakeet_ps.xml index 14c495755..47f087391 100644 --- a/ccpp/suites/parakeet_ps.xml +++ b/ccpp/suites/parakeet_ps.xml @@ -2,7 +2,7 @@ diff --git a/ccpp/suites/pigeon_ps.xml b/ccpp/suites/pigeon_ps.xml index 90a0c6449..9a4193784 100644 --- a/ccpp/suites/pigeon_ps.xml +++ b/ccpp/suites/pigeon_ps.xml @@ -2,7 +2,7 @@ diff --git a/ccpp/suites/raven_ps.xml b/ccpp/suites/raven_ps.xml index aefb8c809..59f5407db 100644 --- a/ccpp/suites/raven_ps.xml +++ b/ccpp/suites/raven_ps.xml @@ -2,7 +2,7 @@ diff --git a/ccpp/suites/sunbird_ps.xml b/ccpp/suites/sunbird_ps.xml index 08c93c3ef..f67ecded6 100644 --- a/ccpp/suites/sunbird_ps.xml +++ b/ccpp/suites/sunbird_ps.xml @@ -2,7 +2,7 @@ diff --git a/ccpp/suites/suite_SCM_GFS_v16_ugwpv1.xml b/ccpp/suites_not_used/suite_SCM_GFS_v16_ugwpv1.xml similarity index 100% rename from ccpp/suites/suite_SCM_GFS_v16_ugwpv1.xml rename to ccpp/suites_not_used/suite_SCM_GFS_v16_ugwpv1.xml diff --git a/ccpp/suites/suite_SCM_RRFS_v1alpha.xml b/ccpp/suites_not_used/suite_SCM_RRFS_v1alpha.xml similarity index 95% rename from ccpp/suites/suite_SCM_RRFS_v1alpha.xml rename to ccpp/suites_not_used/suite_SCM_RRFS_v1alpha.xml index 7b0ec9db9..b9c9ee2d4 100644 --- a/ccpp/suites/suite_SCM_RRFS_v1alpha.xml +++ b/ccpp/suites_not_used/suite_SCM_RRFS_v1alpha.xml @@ -1,5 +1,8 @@ - + diff --git a/ccpp/suites/suite_SCM_RRFS_v1alpha_ps.xml b/ccpp/suites_not_used/suite_SCM_RRFS_v1alpha_ps.xml similarity index 85% rename from ccpp/suites/suite_SCM_RRFS_v1alpha_ps.xml rename to ccpp/suites_not_used/suite_SCM_RRFS_v1alpha_ps.xml index f21105dba..a85660c91 100644 --- a/ccpp/suites/suite_SCM_RRFS_v1alpha_ps.xml +++ b/ccpp/suites_not_used/suite_SCM_RRFS_v1alpha_ps.xml @@ -1,5 +1,9 @@ - + diff --git a/scm/src/suite_info.py b/scm/src/suite_info.py index cd7112d90..f3309c539 100755 --- a/scm/src/suite_info.py +++ b/scm/src/suite_info.py @@ -42,22 +42,22 @@ def timestep(self, value): raise Exception(message) suite_list = [] -suite_list.append(suite('raven', 'tracers_GFS_v16.txt', 'input_GFS_v16.nml', 600.0, 1800.0, True )) -suite_list.append(suite('bluebird', 'tracers_GFS_v17_p8.txt', 'input_GFS_v17_p8.nml', 600.0, 600.0, True )) +suite_list.append(suite('raven', 'tracers_GFS_v16.txt', 'input_GFS_v16.nml', 600.0, 1800.0, True )) +suite_list.append(suite('bluebird', 'tracers_GFS_v17_p8.txt', 'input_GFS_v17_p8.nml', 600.0, 600.0, True )) suite_list.append(suite('magpie', 'tracers_GFS_v17_p8.txt', 'input_GFS_v17_HR3.nml', 600.0, 600.0, True )) -suite_list.append(suite('robin','tracers_GFS_v17_p8.txt', 'input_GFS_v17_HR3_RRTMGP.nml', 600.0, 600.0, True )) -suite_list.append(suite('albatross', 'tracers_RAP.txt', 'input_RAP.nml', 600.0, 600.0 , True )) -suite_list.append(suite('warbler', 'tracers_RRFS_v1.txt', 'input_RRFS_v1.nml', 600.0, 600.0 , True )) +suite_list.append(suite('robin', 'tracers_GFS_v17_p8.txt', 'input_GFS_v17_HR3_RRTMGP.nml', 600.0, 600.0, True )) +suite_list.append(suite('albatross', 'tracers_RAP.txt', 'input_RAP.nml', 600.0, 600.0 , True )) +suite_list.append(suite('warbler', 'tracers_RRFS_v1.txt', 'input_RRFS_v1.nml', 600.0, 600.0 , True )) suite_list.append(suite('pigeon', 'tracers_RRFS_v1beta.txt', 'input_RRFS_v1beta.nml', 600.0, 600.0 , True )) -suite_list.append(suite('hummingbird', 'tracers_WoFS_v0.txt', 'input_WoFS_v0.nml', 600.0, 600.0 , True )) -suite_list.append(suite('bald_eagle', 'tracers_HRRR.txt', 'input_HRRR.nml', 600.0, 600.0 , True )) +suite_list.append(suite('hummingbird', 'tracers_WoFS_v0.txt', 'input_WoFS_v0.nml', 600.0, 600.0 , True )) +suite_list.append(suite('bald_eagle', 'tracers_HRRR.txt', 'input_HRRR.nml', 600.0, 600.0 , True )) -suite_list.append(suite('kingfisher', 'tracers_GFS_v15p2.txt', 'input_GFS_v15p2.nml', 600.0, 1800.0, False)) -suite_list.append(suite('SCM_GFS_v16_RRTMGP', 'tracers_GFS_v16.txt', 'input_GFS_v16_RRTMGP.nml', 600.0, 1800.0, False)) -suite_list.append(suite('SCM_GFS_v16_no_nsst', 'tracers_GFS_v16.txt', 'input_GFS_v16.nml', 600.0, 1800.0, False)) -suite_list.append(suite('macaw', 'tracers_HAFS_v0_hwrf.txt', 'input_HAFS_v0_hwrf.nml', 600.0, 1800.0, False)) -suite_list.append(suite('sunbird', 'tracers_HAFS_v0_hwrf_thompson.txt', 'input_HAFS_v0_hwrf_thompson.nml', 600.0, 600.0 , False)) -suite_list.append(suite('SCM_RRFS_v1nssl', 'tracers_RRFS_v1nssl_nohail_noccn.txt', 'input_RRFS_v1nssl_nohailnoccn.nml', 600.0, 600.0 , False)) +suite_list.append(suite('kingfisher', 'tracers_GFS_v15p2.txt', 'input_GFS_v15p2.nml', 600.0, 1800.0, False)) +suite_list.append(suite('mallard', 'tracers_GFS_v16.txt', 'input_GFS_v16_RRTMGP.nml', 600.0, 1800.0, False)) +suite_list.append(suite('nuthatch', 'tracers_GFS_v16.txt', 'input_GFS_v16.nml', 600.0, 1800.0, False)) +suite_list.append(suite('macaw', 'tracers_HAFS_v0_hwrf.txt', 'input_HAFS_v0_hwrf.nml', 600.0, 1800.0, False)) +suite_list.append(suite('sunbird', 'tracers_HAFS_v0_hwrf_thompson.txt', 'input_HAFS_v0_hwrf_thompson.nml', 600.0, 600.0 , False)) +suite_list.append(suite('crossbill', 'tracers_RRFS_v1nssl_nohail_noccn.txt', 'input_RRFS_v1nssl_nohailnoccn.nml', 600.0, 600.0 , False)) def main(): From ddcff3c2649ada933a0da9e86c707476694560d1 Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr." Date: Tue, 21 May 2024 23:25:56 -0600 Subject: [PATCH 12/35] Updating with latest commits to main - most importantly, updating the new HR3+RRTMGP (robin) and RRFS_v1 (warbler) suites. - Add some more space in description comments for legibility --- ccpp/suites/albatross_ps.xml | 1 + ccpp/suites/alias.json | 6 +++++- ccpp/suites/bald_eagle_ps.xml | 1 + ccpp/suites/barn_owl_ps.xml | 1 + ccpp/suites/bluebird_ps.xml | 1 + ccpp/suites/hummingbird_ps.xml | 1 + ccpp/suites/kingfisher_ps.xml | 1 + ccpp/suites/magpie_ps.xml | 1 + ccpp/suites/mallard_ps.xml | 1 + ccpp/suites/nuthatch_ps.xml | 1 + ccpp/suites/parakeet_ps.xml | 1 + ccpp/suites/pigeon_ps.xml | 1 + ccpp/suites/raven_ps.xml | 1 + .../{suite_SCM_GFS_v17_HR3_RRTMGP.xml => robin.xml} | 7 +++++-- ...{suite_SCM_GFS_v17_HR3_RRTMGP_ps.xml => robin_ps.xml} | 7 ++++++- ccpp/suites/sunbird_ps.xml | 1 + ccpp/suites/{suite_SCM_RRFS_v1.xml => warbler.xml} | 9 ++++++--- ccpp/suites/{suite_SCM_RRFS_v1_ps.xml => warbler_ps.xml} | 9 +++++++-- 18 files changed, 42 insertions(+), 9 deletions(-) rename ccpp/suites/{suite_SCM_GFS_v17_HR3_RRTMGP.xml => robin.xml} (90%) rename ccpp/suites/{suite_SCM_GFS_v17_HR3_RRTMGP_ps.xml => robin_ps.xml} (81%) rename ccpp/suites/{suite_SCM_RRFS_v1.xml => warbler.xml} (89%) rename ccpp/suites/{suite_SCM_RRFS_v1_ps.xml => warbler_ps.xml} (79%) diff --git a/ccpp/suites/albatross_ps.xml b/ccpp/suites/albatross_ps.xml index ce2c5831a..0820e3b57 100644 --- a/ccpp/suites/albatross_ps.xml +++ b/ccpp/suites/albatross_ps.xml @@ -2,6 +2,7 @@ diff --git a/ccpp/suites/alias.json b/ccpp/suites/alias.json index 3c4815d91..bc3b1bab9 100644 --- a/ccpp/suites/alias.json +++ b/ccpp/suites/alias.json @@ -26,5 +26,9 @@ "SCM_GFS_v16_no_nsst_ps.xml": "nuthatch_ps.xml", "SCM_RRFS_v1alpha.xml": "towhee.xml", "SCM_RRFS_v1alpha_ps.xml": "towhee_ps.xml", - "SCM_RRFS_v1nssl.xml": "crossbill.xml" + "SCM_RRFS_v1nssl.xml": "crossbill.xml", + "SCM_GFS_v17_HR3_RRTMGP.xml": "robin.xml", + "SCM_GFS_v17_HR3_RRTMGP_ps.xml": "robin_ps.xml", + "SCM_RRFS_v1.xml": "warbler.xml", + "SCM_RRFS_v1_ps.xml": "warbler_ps.xml" } diff --git a/ccpp/suites/bald_eagle_ps.xml b/ccpp/suites/bald_eagle_ps.xml index c528f3357..62388215b 100644 --- a/ccpp/suites/bald_eagle_ps.xml +++ b/ccpp/suites/bald_eagle_ps.xml @@ -2,6 +2,7 @@ diff --git a/ccpp/suites/barn_owl_ps.xml b/ccpp/suites/barn_owl_ps.xml index 8478f9728..9a8a2cbf0 100644 --- a/ccpp/suites/barn_owl_ps.xml +++ b/ccpp/suites/barn_owl_ps.xml @@ -2,6 +2,7 @@ diff --git a/ccpp/suites/bluebird_ps.xml b/ccpp/suites/bluebird_ps.xml index fc24ec585..f7d038c20 100644 --- a/ccpp/suites/bluebird_ps.xml +++ b/ccpp/suites/bluebird_ps.xml @@ -2,6 +2,7 @@ diff --git a/ccpp/suites/hummingbird_ps.xml b/ccpp/suites/hummingbird_ps.xml index 0606e9ca2..8113d1eb3 100644 --- a/ccpp/suites/hummingbird_ps.xml +++ b/ccpp/suites/hummingbird_ps.xml @@ -2,6 +2,7 @@ diff --git a/ccpp/suites/kingfisher_ps.xml b/ccpp/suites/kingfisher_ps.xml index 9c279fad3..61d78741d 100644 --- a/ccpp/suites/kingfisher_ps.xml +++ b/ccpp/suites/kingfisher_ps.xml @@ -2,6 +2,7 @@ diff --git a/ccpp/suites/magpie_ps.xml b/ccpp/suites/magpie_ps.xml index 1da41bccb..c673bfaf6 100644 --- a/ccpp/suites/magpie_ps.xml +++ b/ccpp/suites/magpie_ps.xml @@ -2,6 +2,7 @@ diff --git a/ccpp/suites/mallard_ps.xml b/ccpp/suites/mallard_ps.xml index 53bb4f40e..081e9f5f6 100644 --- a/ccpp/suites/mallard_ps.xml +++ b/ccpp/suites/mallard_ps.xml @@ -3,6 +3,7 @@ DESCRIPTION: Suite "mallard" (formerly known as SCM_GFS_v16_RRTMGP) is a modified version of the "raven" suite (formerly known as SCM_GFS_v16) that i ncludes RRTMGP: a re-written an parallelized version of the older RRTMG radiation schemes (see https://earth-system-radiation.github.io/rte-rrtmgp/). + This is an SCM-specific "prescribed surface" suite file, specifically for experiments over land points which require prescribed surface fluxes. See https://ccpp-scm.readthedocs.io/en/latest/chap_intro.html#limitations for more information. --> diff --git a/ccpp/suites/nuthatch_ps.xml b/ccpp/suites/nuthatch_ps.xml index 96c91ea5d..f45b13669 100644 --- a/ccpp/suites/nuthatch_ps.xml +++ b/ccpp/suites/nuthatch_ps.xml @@ -3,6 +3,7 @@ DESCRIPTION: Suite "nuthatch" (formerly known as SCM_GFS_v16_no_nsst) is a modified version of the "raven" suite (formerly known as SCM_GFS_v16) that omits the use of the GFS near-sea-surface temperature (NSST) surface scheme. + This is an SCM-specific "prescribed surface" suite file, specifically for experiments over land points which require prescribed surface fluxes. See https://ccpp-scm.readthedocs.io/en/latest/chap_intro.html#limitations for more information. --> diff --git a/ccpp/suites/parakeet_ps.xml b/ccpp/suites/parakeet_ps.xml index 47f087391..fbed13f8f 100644 --- a/ccpp/suites/parakeet_ps.xml +++ b/ccpp/suites/parakeet_ps.xml @@ -2,6 +2,7 @@ diff --git a/ccpp/suites/pigeon_ps.xml b/ccpp/suites/pigeon_ps.xml index 9a4193784..481de14a9 100644 --- a/ccpp/suites/pigeon_ps.xml +++ b/ccpp/suites/pigeon_ps.xml @@ -2,6 +2,7 @@ diff --git a/ccpp/suites/raven_ps.xml b/ccpp/suites/raven_ps.xml index 59f5407db..07441714e 100644 --- a/ccpp/suites/raven_ps.xml +++ b/ccpp/suites/raven_ps.xml @@ -2,6 +2,7 @@ diff --git a/ccpp/suites/suite_SCM_GFS_v17_HR3_RRTMGP.xml b/ccpp/suites/robin.xml similarity index 90% rename from ccpp/suites/suite_SCM_GFS_v17_HR3_RRTMGP.xml rename to ccpp/suites/robin.xml index 09bcbfa64..e38afb031 100644 --- a/ccpp/suites/suite_SCM_GFS_v17_HR3_RRTMGP.xml +++ b/ccpp/suites/robin.xml @@ -1,6 +1,9 @@ - - + + diff --git a/ccpp/suites/suite_SCM_GFS_v17_HR3_RRTMGP_ps.xml b/ccpp/suites/robin_ps.xml similarity index 81% rename from ccpp/suites/suite_SCM_GFS_v17_HR3_RRTMGP_ps.xml rename to ccpp/suites/robin_ps.xml index 0ba77dff3..333d378ee 100644 --- a/ccpp/suites/suite_SCM_GFS_v17_HR3_RRTMGP_ps.xml +++ b/ccpp/suites/robin_ps.xml @@ -1,6 +1,11 @@ + + diff --git a/ccpp/suites/sunbird_ps.xml b/ccpp/suites/sunbird_ps.xml index f67ecded6..caeb17540 100644 --- a/ccpp/suites/sunbird_ps.xml +++ b/ccpp/suites/sunbird_ps.xml @@ -2,6 +2,7 @@ diff --git a/ccpp/suites/suite_SCM_RRFS_v1.xml b/ccpp/suites/warbler.xml similarity index 89% rename from ccpp/suites/suite_SCM_RRFS_v1.xml rename to ccpp/suites/warbler.xml index ef1c73157..87de20ccc 100644 --- a/ccpp/suites/suite_SCM_RRFS_v1.xml +++ b/ccpp/suites/warbler.xml @@ -1,6 +1,9 @@ - - + + GFS_time_vary_pre @@ -76,4 +79,4 @@ GFS_physics_post - \ No newline at end of file + diff --git a/ccpp/suites/suite_SCM_RRFS_v1_ps.xml b/ccpp/suites/warbler_ps.xml similarity index 79% rename from ccpp/suites/suite_SCM_RRFS_v1_ps.xml rename to ccpp/suites/warbler_ps.xml index 91918a6b8..b2715b3ca 100644 --- a/ccpp/suites/suite_SCM_RRFS_v1_ps.xml +++ b/ccpp/suites/warbler_ps.xml @@ -1,6 +1,11 @@ + + GFS_time_vary_pre @@ -60,4 +65,4 @@ GFS_physics_post - \ No newline at end of file + From ed9d813eba6be739494d430e86e5ea785f8ce567 Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr." Date: Wed, 22 May 2024 13:36:15 -0600 Subject: [PATCH 13/35] Forgot to fully change barn_owl (HAFS_v0_hwrf) to macaw, missed one in alias file, correct some rebase mistakes --- ccpp/suites/alias.json | 1 + ccpp/suites/{barn_owl.xml => macaw.xml} | 4 ++-- ccpp/suites/{barn_owl_ps.xml => macaw_ps.xml} | 4 ++-- scm/src/suite_info.py | 4 ++-- scm/src/supported_suites.py | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) rename ccpp/suites/{barn_owl.xml => macaw.xml} (87%) rename ccpp/suites/{barn_owl_ps.xml => macaw_ps.xml} (85%) diff --git a/ccpp/suites/alias.json b/ccpp/suites/alias.json index bc3b1bab9..f3f47fa48 100644 --- a/ccpp/suites/alias.json +++ b/ccpp/suites/alias.json @@ -1,5 +1,6 @@ { "SCM_GFS_v17_HR3.xml": "magpie.xml", + "SCM_GFS_v17_HR3_ps.xml": "magpie_ps.xml", "SCM_GFS_v16.xml": "raven.xml", "SCM_GFS_v16_ps.xml": "raven_ps.xml", "HAFS_v0_hwrf.xml": "macaw.xml", diff --git a/ccpp/suites/barn_owl.xml b/ccpp/suites/macaw.xml similarity index 87% rename from ccpp/suites/barn_owl.xml rename to ccpp/suites/macaw.xml index 81a85e5ff..cc471c758 100644 --- a/ccpp/suites/barn_owl.xml +++ b/ccpp/suites/macaw.xml @@ -1,9 +1,9 @@ - + diff --git a/ccpp/suites/barn_owl_ps.xml b/ccpp/suites/macaw_ps.xml similarity index 85% rename from ccpp/suites/barn_owl_ps.xml rename to ccpp/suites/macaw_ps.xml index 9a8a2cbf0..8ebbc97cb 100644 --- a/ccpp/suites/barn_owl_ps.xml +++ b/ccpp/suites/macaw_ps.xml @@ -1,11 +1,11 @@ - + diff --git a/scm/src/suite_info.py b/scm/src/suite_info.py index f3309c539..6e1bc633a 100755 --- a/scm/src/suite_info.py +++ b/scm/src/suite_info.py @@ -44,8 +44,8 @@ def timestep(self, value): suite_list = [] suite_list.append(suite('raven', 'tracers_GFS_v16.txt', 'input_GFS_v16.nml', 600.0, 1800.0, True )) suite_list.append(suite('bluebird', 'tracers_GFS_v17_p8.txt', 'input_GFS_v17_p8.nml', 600.0, 600.0, True )) -suite_list.append(suite('magpie', 'tracers_GFS_v17_p8.txt', 'input_GFS_v17_HR3.nml', 600.0, 600.0, True )) -suite_list.append(suite('robin', 'tracers_GFS_v17_p8.txt', 'input_GFS_v17_HR3_RRTMGP.nml', 600.0, 600.0, True )) +suite_list.append(suite('magpie', 'tracers_GFS_v17_HR3.txt', 'input_GFS_v17_HR3.nml', 600.0, 600.0, True )) +suite_list.append(suite('robin', 'tracers_GFS_v17_HR3.txt', 'input_GFS_v17_HR3_RRTMGP.nml', 600.0, 600.0, True )) suite_list.append(suite('albatross', 'tracers_RAP.txt', 'input_RAP.nml', 600.0, 600.0 , True )) suite_list.append(suite('warbler', 'tracers_RRFS_v1.txt', 'input_RRFS_v1.nml', 600.0, 600.0 , True )) suite_list.append(suite('pigeon', 'tracers_RRFS_v1beta.txt', 'input_RRFS_v1beta.nml', 600.0, 600.0 , True )) diff --git a/scm/src/supported_suites.py b/scm/src/supported_suites.py index 1d7b72039..5f9816a5f 100644 --- a/scm/src/supported_suites.py +++ b/scm/src/supported_suites.py @@ -1 +1 @@ -suites = ["raven","magpie","bluebird","bald_eagle","albatross","pigeon","hummingbird"] +suites = ["raven","magpie","robin","warbler","hummingbird"] From 8645f49f1c087a2361aad47f6fe25b463ad082c5 Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr." Date: Wed, 22 May 2024 13:48:34 -0600 Subject: [PATCH 14/35] Update suite names for CI tests --- .github/workflows/ci_build_scm_ubuntu_22.04.yml | 2 +- .github/workflows/ci_build_scm_ubuntu_22.04_nvidia.yml | 4 ++-- .github/workflows/ci_run_scm_DEPHY.yml | 2 +- .github/workflows/ci_run_scm_rts.yml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci_build_scm_ubuntu_22.04.yml b/.github/workflows/ci_build_scm_ubuntu_22.04.yml index 6c33a30e5..fe7e71643 100644 --- a/.github/workflows/ci_build_scm_ubuntu_22.04.yml +++ b/.github/workflows/ci_build_scm_ubuntu_22.04.yml @@ -22,7 +22,7 @@ jobs: w3emc_ROOT: /home/runner/myw3emc SCM_ROOT: /home/runner/work/ccpp-scm/ccpp-scm intel_ROOT: /home/runner/intel - suites: SCM_GFS_v15p2,SCM_GFS_v16,SCM_GFS_v17_p8,SCM_HRRR,SCM_RRFS_v1beta,SCM_RAP,SCM_WoFS_v0,SCM_GFS_v15p2_ps,SCM_GFS_v16_ps,SCM_GFS_v17_p8_ps,SCM_HRRR_ps,SCM_RRFS_v1beta_ps,SCM_RAP_ps,SCM_WoFS_v0_ps + suites: kingfisher,raven,bluebird,bald_eagle,pigeon,albatross,hummingbird,kingfisher_ps,raven_ps,bluebird_ps,bald_eagle_ps,pigeon_ps,albatross_ps,hummingbird_ps # Workflow steps steps: diff --git a/.github/workflows/ci_build_scm_ubuntu_22.04_nvidia.yml b/.github/workflows/ci_build_scm_ubuntu_22.04_nvidia.yml index 8bb7fcedb..f5a808aad 100644 --- a/.github/workflows/ci_build_scm_ubuntu_22.04_nvidia.yml +++ b/.github/workflows/ci_build_scm_ubuntu_22.04_nvidia.yml @@ -23,8 +23,8 @@ jobs: SCM_ROOT: /home/runner/work/ccpp-scm/ccpp-scm zlib_ROOT: /home/runner/zlib HDF5_ROOT: /home/runner/hdf5 - suites: SCM_GFS_v15p2,SCM_GFS_v16,SCM_GFS_v17_p8,SCM_HRRR,SCM_RRFS_v1beta,SCM_RAP,SCM_WoFS_v0 - suites_ps: SCM_GFS_v15p2_ps,SCM_GFS_v16_ps,SCM_GFS_v17_p8_ps,SCM_HRRR_ps,SCM_RRFS_v1beta_ps,SCM_RAP_ps,SCM_WoFS_v0_ps + suites: kingfisher,raven,bluebird,bald_eagle,pigeon,albatross,hummingbird + suites_ps: kingfisher_ps,raven_ps,bluebird_ps,bald_eagle_ps,pigeon_ps,albatross_ps,hummingbird_ps # Workflow steps steps: diff --git a/.github/workflows/ci_run_scm_DEPHY.yml b/.github/workflows/ci_run_scm_DEPHY.yml index eeba4c7fe..8373aa2aa 100644 --- a/.github/workflows/ci_run_scm_DEPHY.yml +++ b/.github/workflows/ci_run_scm_DEPHY.yml @@ -20,7 +20,7 @@ jobs: sp_ROOT: /home/runner/NCEPLIBS-sp w3emc_ROOT: /home/runner/myw3emc SCM_ROOT: /home/runner/work/ccpp-scm/ccpp-scm - suites: SCM_GFS_v16,SCM_GFS_v16_ps + suites: raven,raven_ps # Workflow steps steps: diff --git a/.github/workflows/ci_run_scm_rts.yml b/.github/workflows/ci_run_scm_rts.yml index d58a10cdd..e1319d62d 100644 --- a/.github/workflows/ci_run_scm_rts.yml +++ b/.github/workflows/ci_run_scm_rts.yml @@ -21,8 +21,8 @@ jobs: sp_ROOT: /home/runner/NCEPLIBS-sp w3emc_ROOT: /home/runner/myw3emc SCM_ROOT: /home/runner/work/ccpp-scm/ccpp-scm - suites: SCM_GFS_v15p2,SCM_GFS_v16,SCM_GFS_v17_p8,SCM_HRRR,SCM_RRFS_v1beta,SCM_RAP,SCM_WoFS_v0 - suites_ps: SCM_GFS_v15p2_ps,SCM_GFS_v16_ps,SCM_GFS_v17_p8_ps,SCM_HRRR_ps,SCM_RRFS_v1beta_ps,SCM_RAP_ps,SCM_WoFS_v0_ps + suites: kingfisher,SCM_GFS_v16,bluebird,bald_eagle,pigeon,albatross,hummingbird + suites_ps: kingfisher_ps,SCM_GFS_v16_ps,bluebird_ps,bald_eagle_ps,pigeon_ps,albatross_ps,hummingbird_ps dir_rt: /home/runner/work/ccpp-scm/ccpp-scm/test/artifact-${{matrix.build-type}} dir_bl: /home/runner/work/ccpp-scm/ccpp-scm/test/BL-${{matrix.build-type}} From 9e4f492885b891bffe724d489d7677ea4953450b Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr." Date: Wed, 22 May 2024 15:57:32 -0600 Subject: [PATCH 15/35] Debugging CI --- .github/workflows/ci_build_scm_ubuntu_22.04.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_build_scm_ubuntu_22.04.yml b/.github/workflows/ci_build_scm_ubuntu_22.04.yml index fe7e71643..021f39641 100644 --- a/.github/workflows/ci_build_scm_ubuntu_22.04.yml +++ b/.github/workflows/ci_build_scm_ubuntu_22.04.yml @@ -174,7 +174,7 @@ jobs: run: | cd ${SCM_ROOT}/scm mkdir bin && cd bin - cmake -DCCPP_SUITES=${suites} -DCMAKE_BUILD_TYPE=Debug ../src + cmake -DCCPP_SUITES=${suites} -DCMAKE_BUILD_TYPE=Debug ../src || cat ccpp_prebuild.err - name: Build SCM run: | From 5eb776e8ea2074fb08f9ff997a267f92b71a6b06 Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr." Date: Wed, 22 May 2024 16:35:30 -0600 Subject: [PATCH 16/35] Revert "Debugging CI". Turns out Github runners were just glitching. This reverts commit 9e4f492885b891bffe724d489d7677ea4953450b. --- .github/workflows/ci_build_scm_ubuntu_22.04.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_build_scm_ubuntu_22.04.yml b/.github/workflows/ci_build_scm_ubuntu_22.04.yml index 021f39641..fe7e71643 100644 --- a/.github/workflows/ci_build_scm_ubuntu_22.04.yml +++ b/.github/workflows/ci_build_scm_ubuntu_22.04.yml @@ -174,7 +174,7 @@ jobs: run: | cd ${SCM_ROOT}/scm mkdir bin && cd bin - cmake -DCCPP_SUITES=${suites} -DCMAKE_BUILD_TYPE=Debug ../src || cat ccpp_prebuild.err + cmake -DCCPP_SUITES=${suites} -DCMAKE_BUILD_TYPE=Debug ../src - name: Build SCM run: | From bf72a59c9e6418692b6f35ac4a6cd824a3408a95 Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr" Date: Wed, 22 May 2024 17:18:00 -0600 Subject: [PATCH 17/35] Still debugging CIs. Turns out I have no idea whats going on --- .github/workflows/ci_run_scm_rts.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci_run_scm_rts.yml b/.github/workflows/ci_run_scm_rts.yml index e1319d62d..293d3d47c 100644 --- a/.github/workflows/ci_run_scm_rts.yml +++ b/.github/workflows/ci_run_scm_rts.yml @@ -165,6 +165,10 @@ jobs: mkdir bin && cd bin cmake -DCCPP_SUITES=${suites},${suites_ps} -DCMAKE_BUILD_TYPE=Debug ../src + - name: cat CCPP log file + if: always() + run: cat ccpp_prebuild.err + - name: Build SCM run: | cd ${SCM_ROOT}/scm/bin From 1b0028d6d6c9ae315e3041fcf69bb1d7d7b36bd1 Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr" Date: Wed, 22 May 2024 17:33:28 -0600 Subject: [PATCH 18/35] Still debugging CIs. --- .github/workflows/ci_run_scm_rts.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci_run_scm_rts.yml b/.github/workflows/ci_run_scm_rts.yml index 293d3d47c..71a5a26c1 100644 --- a/.github/workflows/ci_run_scm_rts.yml +++ b/.github/workflows/ci_run_scm_rts.yml @@ -167,7 +167,9 @@ jobs: - name: cat CCPP log file if: always() - run: cat ccpp_prebuild.err + run: | + cd ${SCM_ROOT}/scm/bin + cat ccpp_prebuild.err - name: Build SCM run: | From 4050b976f9863357d76ea34c2c844f04dc400c0c Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr" Date: Wed, 22 May 2024 17:41:31 -0600 Subject: [PATCH 19/35] Stupidly missed one suite rename, not sure how I missed that one. --- .github/workflows/ci_run_scm_rts.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_run_scm_rts.yml b/.github/workflows/ci_run_scm_rts.yml index 71a5a26c1..980dead2a 100644 --- a/.github/workflows/ci_run_scm_rts.yml +++ b/.github/workflows/ci_run_scm_rts.yml @@ -21,8 +21,8 @@ jobs: sp_ROOT: /home/runner/NCEPLIBS-sp w3emc_ROOT: /home/runner/myw3emc SCM_ROOT: /home/runner/work/ccpp-scm/ccpp-scm - suites: kingfisher,SCM_GFS_v16,bluebird,bald_eagle,pigeon,albatross,hummingbird - suites_ps: kingfisher_ps,SCM_GFS_v16_ps,bluebird_ps,bald_eagle_ps,pigeon_ps,albatross_ps,hummingbird_ps + suites: kingfisher,raven,bluebird,bald_eagle,pigeon,albatross,hummingbird + suites_ps: kingfisher_ps,raven_ps,bluebird_ps,bald_eagle_ps,pigeon_ps,albatross_ps,hummingbird_ps dir_rt: /home/runner/work/ccpp-scm/ccpp-scm/test/artifact-${{matrix.build-type}} dir_bl: /home/runner/work/ccpp-scm/ccpp-scm/test/BL-${{matrix.build-type}} From c1cf541e4376d27ab291197c2c2384ff5152b5c8 Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr" Date: Thu, 23 May 2024 12:47:04 -0600 Subject: [PATCH 20/35] Add OpenMPI to build for CI tests; this is required for latest CCPP framework code --- .../workflows/ci_build_scm_ubuntu_22.04.yml | 14 +++++++ .github/workflows/ci_run_scm_DEPHY.yml | 18 +++++++++ .github/workflows/ci_run_scm_rts.yml | 37 +++++++++++++++---- 3 files changed, 62 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci_build_scm_ubuntu_22.04.yml b/.github/workflows/ci_build_scm_ubuntu_22.04.yml index fe7e71643..a406fa4b6 100644 --- a/.github/workflows/ci_build_scm_ubuntu_22.04.yml +++ b/.github/workflows/ci_build_scm_ubuntu_22.04.yml @@ -85,6 +85,20 @@ jobs: sudo apt-get install intel-hpckit-getting-started intel-oneapi-clck intel-oneapi-common-licensing intel-oneapi-common-vars sudo apt-get install intel-oneapi-dev-utilities intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic intel-oneapi-compiler-fortran intel-oneapi-itac + - name: Install open mpi + run: | + wget https://github.com/open-mpi/ompi/archive/refs/tags/v4.1.6.tar.gz + tar -xvf v4.1.6.tar.gz + cd ompi-4.1.6 + ./autogen.pl + ./configure --prefix=/home/runner/ompi-4.1.6 + make -j4 + make install + echo "LD_LIBRARY_PATH=/home/runner/ompi-4.1.6/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV + echo "PATH=/home/runner/ompi-4.1.6/bin:$PATH" >> $GITHUB_ENV + echo "CC=mpicc" >> $GITHUB_ENV + echo "FC=mpif90" >> $GITHUB_ENV + - name: Cache bacio library v2.4.1 id: cache-bacio-fortran uses: actions/cache@v3 diff --git a/.github/workflows/ci_run_scm_DEPHY.yml b/.github/workflows/ci_run_scm_DEPHY.yml index 8373aa2aa..95e67faf9 100644 --- a/.github/workflows/ci_run_scm_DEPHY.yml +++ b/.github/workflows/ci_run_scm_DEPHY.yml @@ -51,6 +51,24 @@ jobs: - name: Update system packages run: sudo apt-get update + ####################################################################################### + # Install OpenMPI + ####################################################################################### + - name: Install open mpi + run: | + wget https://github.com/open-mpi/ompi/archive/refs/tags/v4.1.6.tar.gz + tar -xvf v4.1.6.tar.gz + cd ompi-4.1.6 + ./autogen.pl + ./configure --prefix=/home/runner/ompi-4.1.6 + make -j4 + make install + echo "LD_LIBRARY_PATH=/home/runner/ompi-4.1.6/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV + echo "PATH=/home/runner/ompi-4.1.6/bin:$PATH" >> $GITHUB_ENV + echo "CC=mpicc" >> $GITHUB_ENV + echo "FC=mpif90" >> $GITHUB_ENV + + ####################################################################################### # Install FORTRAN dependencies ####################################################################################### diff --git a/.github/workflows/ci_run_scm_rts.yml b/.github/workflows/ci_run_scm_rts.yml index 980dead2a..dd0790ff8 100644 --- a/.github/workflows/ci_run_scm_rts.yml +++ b/.github/workflows/ci_run_scm_rts.yml @@ -60,7 +60,7 @@ jobs: # Install FORTRAN dependencies ####################################################################################### - name: Environment for gfortran compiler - if: contains(matrix.fortran-compiler, 'gnu') + if: contains(matrix.fortran-compiler, 'gfortran') run: | echo "FC=gfortran-11" >> $GITHUB_ENV echo "CC=gcc-11" >> $GITHUB_ENV @@ -71,6 +71,29 @@ jobs: echo "CC=icx" >> $GITHUB_ENV echo "FC=ifort" >> $GITHUB_ENV + ####################################################################################### + # OpenMPI setup + ####################################################################################### + + - name: Install open mpi + run: | + wget https://github.com/open-mpi/ompi/archive/refs/tags/v4.1.6.tar.gz + tar -xvf v4.1.6.tar.gz + cd ompi-4.1.6 + ./autogen.pl + ./configure --prefix=/home/runner/ompi-4.1.6 + make -j4 + make install + echo "LD_LIBRARY_PATH=/home/runner/ompi-4.1.6/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV + echo "PATH=/home/runner/ompi-4.1.6/bin:$PATH" >> $GITHUB_ENV + echo `ls /home/runner/ompi-4.1.6/bin` + echo "FC=mpif90" >> $GITHUB_ENV + echo "CC=mpicc" >> $GITHUB_ENV + + ####################################################################################### + # Install FORTRAN dependencies + ####################################################################################### + - name: Cache bacio library v2.4.1 id: cache-bacio-fortran uses: actions/cache@v3 @@ -145,12 +168,6 @@ jobs: ####################################################################################### # Build SCM. Run regression tests. ####################################################################################### - - name: Download data for SCM - run: | - cd ${SCM_ROOT} - ./contrib/get_all_static_data.sh - ./contrib/get_thompson_tables.sh - - name: Configure build with CMake (Release) if: contains(matrix.build-type, 'Release') run: | @@ -176,6 +193,12 @@ jobs: cd ${SCM_ROOT}/scm/bin make -j4 + - name: Download data for SCM + run: | + cd ${SCM_ROOT} + ./contrib/get_all_static_data.sh + ./contrib/get_thompson_tables.sh + - name: Run SCM RTs run: | cd ${SCM_ROOT}/scm/bin From b7a2641943e08cfb8a746b59af04d80cebfad2ae Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr" Date: Thu, 23 May 2024 12:49:27 -0600 Subject: [PATCH 21/35] Convert all CI to "push" rules temporarily so I can test this in draft mode --- .github/workflows/ci_build_scm_ubuntu_22.04.yml | 2 +- .github/workflows/ci_build_scm_ubuntu_22.04_nvidia.yml | 2 +- .github/workflows/ci_run_scm_DEPHY.yml | 2 +- .github/workflows/ci_run_scm_rts.yml | 2 +- .github/workflows/ci_run_scm_ufs_replay.yml | 4 ++-- .github/workflows/ci_test_docker.yml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci_build_scm_ubuntu_22.04.yml b/.github/workflows/ci_build_scm_ubuntu_22.04.yml index a406fa4b6..b4e5a1a8a 100644 --- a/.github/workflows/ci_build_scm_ubuntu_22.04.yml +++ b/.github/workflows/ci_build_scm_ubuntu_22.04.yml @@ -1,6 +1,6 @@ name: CI test to build the CCPP-SCM on ubuntu v22.04 -on: [pull_request,workflow_dispatch] +on: [pull_request,workflow_dispatch,push] jobs: build_scm: diff --git a/.github/workflows/ci_build_scm_ubuntu_22.04_nvidia.yml b/.github/workflows/ci_build_scm_ubuntu_22.04_nvidia.yml index f5a808aad..4d9ce78e6 100644 --- a/.github/workflows/ci_build_scm_ubuntu_22.04_nvidia.yml +++ b/.github/workflows/ci_build_scm_ubuntu_22.04_nvidia.yml @@ -1,6 +1,6 @@ name: CI test to build the CCPP-SCM on ubuntu v22.04 -on: [pull_request,workflow_dispatch] +on: [pull_request,workflow_dispatch,push] jobs: diff --git a/.github/workflows/ci_run_scm_DEPHY.yml b/.github/workflows/ci_run_scm_DEPHY.yml index 95e67faf9..00af6a249 100644 --- a/.github/workflows/ci_run_scm_DEPHY.yml +++ b/.github/workflows/ci_run_scm_DEPHY.yml @@ -1,6 +1,6 @@ name: CI test to run the SCM with DEPHY v1 data -on: [pull_request,workflow_dispatch] +on: [pull_request,workflow_dispatch,push] jobs: run-scm-DEPHY: diff --git a/.github/workflows/ci_run_scm_rts.yml b/.github/workflows/ci_run_scm_rts.yml index dd0790ff8..d18044945 100644 --- a/.github/workflows/ci_run_scm_rts.yml +++ b/.github/workflows/ci_run_scm_rts.yml @@ -1,6 +1,6 @@ name: CI test to build and run SCM regression tests -on: [pull_request, workflow_dispatch] +on: [pull_request, workflow_dispatch,push] jobs: run_scm_rts: diff --git a/.github/workflows/ci_run_scm_ufs_replay.yml b/.github/workflows/ci_run_scm_ufs_replay.yml index 0bd6a161d..4cdfb5ba3 100644 --- a/.github/workflows/ci_run_scm_ufs_replay.yml +++ b/.github/workflows/ci_run_scm_ufs_replay.yml @@ -1,6 +1,6 @@ name: CI test to create SCM UFS-replay cases from UWM regression tests -on: [pull_request,workflow_dispatch] +on: [pull_request,workflow_dispatch,push] jobs: run_scm_ufs_replay: @@ -72,4 +72,4 @@ jobs: ####################################################################################### # Done - ####################################################################################### \ No newline at end of file + ####################################################################################### diff --git a/.github/workflows/ci_test_docker.yml b/.github/workflows/ci_test_docker.yml index 3406d8326..bb5908d59 100644 --- a/.github/workflows/ci_test_docker.yml +++ b/.github/workflows/ci_test_docker.yml @@ -1,6 +1,6 @@ name: build_test_and_push_docker -on: [pull_request,workflow_dispatch] +on: [pull_request,workflow_dispatch,push] env: TEST_TAG: dtcenter/ccpp-scm:test From 1ff2e462f14d85a5f98dac31c77b7404ccd9d0a5 Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr" Date: Thu, 23 May 2024 13:53:08 -0600 Subject: [PATCH 22/35] Forgot to add new CMake rule so bad compilers fail at CMAKE stage --- scm/src/CMakeLists.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scm/src/CMakeLists.txt b/scm/src/CMakeLists.txt index 2ef20bb84..d93697e4d 100644 --- a/scm/src/CMakeLists.txt +++ b/scm/src/CMakeLists.txt @@ -241,6 +241,13 @@ else() set(CMAKE_Fortran_FLAGS_DYNAMICS "") endif() +#------------------------------------------------------------------------------ +# Set MPI flags for Fortran with MPI F08 interface +find_package(MPI REQUIRED Fortran) +if(NOT MPI_Fortran_HAVE_F08_MODULE) + message(FATAL_ERROR "MPI implementation does not support the Fortran 2008 mpi_f08 interface") +endif() + #------------------------------------------------------------------------------ # Set netCDF flags for preprocessor ADD_DEFINITIONS(-DNETCDF) From fb910987270ca503a9c2b1500634ae51da7f1554 Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr" Date: Thu, 23 May 2024 14:17:07 -0600 Subject: [PATCH 23/35] Forgot to update suites for nvidia tests --- test/rt_test_cases_nvidia.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/rt_test_cases_nvidia.py b/test/rt_test_cases_nvidia.py index 14473306c..c6b68abf9 100644 --- a/test/rt_test_cases_nvidia.py +++ b/test/rt_test_cases_nvidia.py @@ -1,9 +1,9 @@ run_list = [\ - #---------------------------------------------------------------------------------------------------------------------------------------------- + #---------------------------------------------------------------- # CCPP-SCM suites for use with Nvidia compilers - #---------------------------------------------------------------------------------------------------------------------------------------------- - {"case": "arm_sgp_summer_1997_A", "suite": "SCM_RAP"}, \ - {"case": "twpice", "suite": "SCM_RAP"}, \ - {"case": "bomex", "suite": "SCM_RAP"}, \ - {"case": "astex", "suite": "SCM_RAP"}, \ - {"case": "LASSO_2016051812", "suite": "SCM_RAP"}] + #---------------------------------------------------------------- + {"case": "arm_sgp_summer_1997_A", "suite": "albatross"}, \ + {"case": "twpice", "suite": "albatross"}, \ + {"case": "bomex", "suite": "albatross"}, \ + {"case": "astex", "suite": "albatross"}, \ + {"case": "LASSO_2016051812", "suite": "albatross"}] From 93c292eecaa86595f7e833fac7c3387dc846217d Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr" Date: Thu, 23 May 2024 14:39:54 -0600 Subject: [PATCH 24/35] Fix typo in suite list, remove debugging job from RT CI, fix typo in RT list --- .github/workflows/ci_run_scm_rts.yml | 8 +------- test/rt_test_cases.py | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci_run_scm_rts.yml b/.github/workflows/ci_run_scm_rts.yml index b803ba888..8452a987b 100644 --- a/.github/workflows/ci_run_scm_rts.yml +++ b/.github/workflows/ci_run_scm_rts.yml @@ -22,7 +22,7 @@ jobs: w3emc_ROOT: /home/runner/myw3emc SCM_ROOT: /home/runner/work/ccpp-scm/ccpp-scm suites: kingfisher,raven,bluebird,bald_eagle,pigeon,albatross,hummingbird,magpie,robin,warbler - suites_ps: kingfisher_ps,raven_ps,bluebird_ps,bald_eagle_ps,pigeon_ps,albatross_ps,hummingbird_ps,magpie_os,robin_ps,warbler_ps + suites_ps: kingfisher_ps,raven_ps,bluebird_ps,bald_eagle_ps,pigeon_ps,albatross_ps,hummingbird_ps,magpie_ps,robin_ps,warbler_ps dir_rt: /home/runner/work/ccpp-scm/ccpp-scm/test/artifact-${{matrix.build-type}} dir_bl: /home/runner/work/ccpp-scm/ccpp-scm/test/BL-${{matrix.build-type}} @@ -182,12 +182,6 @@ jobs: mkdir bin && cd bin cmake -DCCPP_SUITES=${suites},${suites_ps} -DCMAKE_BUILD_TYPE=Debug ../src - - name: cat CCPP log file - if: always() - run: | - cd ${SCM_ROOT}/scm/bin - cat ccpp_prebuild.err - - name: Build SCM run: | cd ${SCM_ROOT}/scm/bin diff --git a/test/rt_test_cases.py b/test/rt_test_cases.py index 481638d0c..b6d1aaa0d 100644 --- a/test/rt_test_cases.py +++ b/test/rt_test_cases.py @@ -58,7 +58,7 @@ {"case": "astex", "suite": "bald_eagle"}, \ {"case": "astex", "suite": "pigeon"}, \ {"case": "astex", "suite": "albatross"}, \ - {"case": "LASSO_2016051812", "suite": "kingfisher"} \ + {"case": "LASSO_2016051812", "suite": "kingfisher"}, \ {"case": "LASSO_2016051812", "suite": "bluebird"}, \ {"case": "LASSO_2016051812", "suite": "bald_eagle"}, \ {"case": "LASSO_2016051812", "suite": "pigeon"}, \ From 1928b13cc1ef979fd50dc20434352b83b9f94e7c Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr." Date: Fri, 24 May 2024 11:26:43 -0600 Subject: [PATCH 25/35] Didn't update regression test list correctly --- test/rt_test_cases.py | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/test/rt_test_cases.py b/test/rt_test_cases.py index b6d1aaa0d..ddb56f3d4 100644 --- a/test/rt_test_cases.py +++ b/test/rt_test_cases.py @@ -6,34 +6,26 @@ {"case": "arm_sgp_summer_1997_A", "suite": "magpie"}, \ {"case": "arm_sgp_summer_1997_A", "suite": "robin"}, \ {"case": "arm_sgp_summer_1997_A", "suite": "warbler"}, \ - {"case": "arm_sgp_summer_1997_A", "suite": "bluebird"}, \ - {"case": "arm_sgp_summer_1997_A", "suite": "bald_eagle"}, \ - {"case": "arm_sgp_summer_1997_A", "suite": "pigeon"}, \ - {"case": "arm_sgp_summer_1997_A", "suite": "albatross"}, \ {"case": "arm_sgp_summer_1997_A", "suite": "hummingbird"}, \ {"case": "twpice", "suite": "raven"}, \ - {"case": "twpice", "suite": "bluebird"}, \ - {"case": "twpice", "suite": "bald_eagle"}, \ - {"case": "twpice", "suite": "pigeon"}, \ - {"case": "twpice", "suite": "albatross"}, \ + {"case": "twpice", "suite": "magpie"}, \ + {"case": "twpice", "suite": "robin"}, \ + {"case": "twpice", "suite": "warbler"}, \ {"case": "twpice", "suite": "hummingbird"}, \ {"case": "bomex", "suite": "raven"}, \ - {"case": "bomex", "suite": "bluebird"}, \ - {"case": "bomex", "suite": "bald_eagle"}, \ - {"case": "bomex", "suite": "pigeon"}, \ - {"case": "bomex", "suite": "albatross"}, \ + {"case": "bomex", "suite": "magpie"}, \ + {"case": "bomex", "suite": "robin"}, \ + {"case": "bomex", "suite": "warbler"}, \ {"case": "bomex", "suite": "hummingbird"}, \ {"case": "astex", "suite": "raven"}, \ - {"case": "astex", "suite": "bluebird"}, \ - {"case": "astex", "suite": "bald_eagle"}, \ - {"case": "astex", "suite": "pigeon"}, \ - {"case": "astex", "suite": "albatross"}, \ + {"case": "astex", "suite": "magpie"}, \ + {"case": "astex", "suite": "robin"}, \ + {"case": "astex", "suite": "warbler"}, \ {"case": "astex", "suite": "hummingbird"}, \ {"case": "LASSO_2016051812", "suite": "raven"}, \ - {"case": "LASSO_2016051812", "suite": "bluebird"}, \ - {"case": "LASSO_2016051812", "suite": "bald_eagle"}, \ - {"case": "LASSO_2016051812", "suite": "pigeon"}, \ - {"case": "LASSO_2016051812", "suite": "albatross"}, \ + {"case": "LASSO_2016051812", "suite": "magpie"}, \ + {"case": "LASSO_2016051812", "suite": "robin"}, \ + {"case": "LASSO_2016051812", "suite": "warbler"}, \ {"case": "LASSO_2016051812", "suite": "hummingbird"}, \ #--------------------------------------------------------------- # Unsupported suites (w/ supported cases) From 231c26383bd8416149e3eb3c9da0ec4209117491 Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr." Date: Fri, 24 May 2024 11:58:20 -0600 Subject: [PATCH 26/35] Fix tracer file for "robin" --- scm/src/suite_info.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scm/src/suite_info.py b/scm/src/suite_info.py index 3f93b9abf..fa5636cb3 100755 --- a/scm/src/suite_info.py +++ b/scm/src/suite_info.py @@ -45,7 +45,7 @@ def timestep(self, value): suite_list.append(suite('raven', 'tracers_GFS_v16.txt', 'input_GFS_v16.nml', 600.0, 1800.0, True )) suite_list.append(suite('bluebird', 'tracers_GFS_v17_p8.txt', 'input_GFS_v17_p8.nml', 600.0, 600.0, True )) suite_list.append(suite('magpie', 'tracers_GFS_v17_HR3.txt', 'input_GFS_v17_HR3.nml', 600.0, 600.0, True )) -suite_list.append(suite('robin', 'tracers_GFS_v17_p8', 'input_GFS_v17_HR3_RRTMGP.nml', 600.0, 600.0, True )) +suite_list.append(suite('robin', 'tracers_GFS_v17_p8.txt', 'input_GFS_v17_HR3_RRTMGP.nml', 600.0, 600.0, True )) suite_list.append(suite('albatross', 'tracers_RAP.txt', 'input_RAP.nml', 600.0, 600.0 , True )) suite_list.append(suite('warbler', 'tracers_RRFS_v1.txt', 'input_RRFS_v1.nml', 600.0, 600.0 , True )) suite_list.append(suite('pigeon', 'tracers_RRFS_v1beta.txt', 'input_RRFS_v1beta.nml', 600.0, 600.0 , True )) From 0cc91dc277c5876cf70814b864635b06f96fefbd Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr." Date: Wed, 29 May 2024 13:18:25 -0600 Subject: [PATCH 27/35] Update physics submodule to point to Grant's newer PR --- .gitmodules | 4 ++-- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 9fbb5eb58..97b396bf3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,8 +4,8 @@ branch = feature/suite_names_update [submodule "ccpp-physics"] path = ccpp/physics - url = https://github.com/mkavulich/ccpp-physics - branch = ufs-dev-182 + url = https://github.com/grantfirl/ccpp-physics + branch = ufs-dev-PR184 [submodule "CMakeModules"] path = CMakeModules url = https://github.com/noaa-emc/CMakeModules diff --git a/ccpp/physics b/ccpp/physics index 8f657c1da..a3760b8b8 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 8f657c1da6cf94992a19853cf1c46ad636c8931d +Subproject commit a3760b8b8f4d7c7e35503283d90f5836573e665c From 1631872e43162e8ad95b2d786a5746f7d9e03e4a Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr" Date: Thu, 30 May 2024 18:27:42 +0000 Subject: [PATCH 28/35] Merge grant's changes from SCM PR 482 --- .../workflows/ci_build_scm_ubuntu_22.04.yml | 42 +++++++------------ .github/workflows/ci_run_scm_DEPHY.yml | 17 ++++++++ .github/workflows/ci_run_scm_rts.yml | 24 +++++++---- ccpp/config/ccpp_prebuild_config.py | 1 + scm/src/CMakeLists.txt | 4 ++ scm/src/GFS_typedefs.F90 | 39 ++++++----------- scm/src/GFS_typedefs.meta | 8 +++- scm/src/run_scm.py | 2 +- scm/src/scm.F90 | 23 +++++++++- scm/src/scm_setup.F90 | 5 +-- 10 files changed, 96 insertions(+), 69 deletions(-) diff --git a/.github/workflows/ci_build_scm_ubuntu_22.04.yml b/.github/workflows/ci_build_scm_ubuntu_22.04.yml index b4e5a1a8a..e4571b607 100644 --- a/.github/workflows/ci_build_scm_ubuntu_22.04.yml +++ b/.github/workflows/ci_build_scm_ubuntu_22.04.yml @@ -21,7 +21,6 @@ jobs: sp_ROOT: /home/runner/NCEPLIBS-sp w3emc_ROOT: /home/runner/myw3emc SCM_ROOT: /home/runner/work/ccpp-scm/ccpp-scm - intel_ROOT: /home/runner/intel suites: kingfisher,raven,bluebird,bald_eagle,pigeon,albatross,hummingbird,kingfisher_ps,raven_ps,bluebird_ps,bald_eagle_ps,pigeon_ps,albatross_ps,hummingbird_ps # Workflow steps @@ -57,33 +56,17 @@ jobs: ####################################################################################### # Install FORTRAN dependencies ####################################################################################### - - name: Environment for ifort compiler - if: contains(matrix.fortran-compiler, 'ifort') + - name: Install openmpi run: | - echo "CC=icx" >> $GITHUB_ENV - echo "FC=ifort" >> $GITHUB_ENV - echo "NFVERSION=v4.4.4" >> $GITHUB_ENV - - - name: Cache Intel compilers - id: cache-intel-compilers - if: contains(matrix.fortran-compiler, 'ifort') - uses: actions/cache@v2 - with: - path: /home/runner/intel - key: intel-${{ runner.os }}-compilers-b - - # https://software.intel.com/content/www/us/en/develop/articles/installing-intel-oneapi-toolkits-via-apt.html - # List of packages from Docker file at - # https://github.com/intel/oneapi-containers/blob/master/images/docker/hpckit-devel-ubuntu18.04/Dockerfile - - name: Install Intel compilers and libraries - if: contains(matrix.fortran-compiler, 'ifort') && steps.cache-intel-compilers.outputs.cache-hit != 'true' - run: | - wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB - sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB - sudo add-apt-repository "deb https://apt.repos.intel.com/oneapi all main" - sudo apt-get update - sudo apt-get install intel-hpckit-getting-started intel-oneapi-clck intel-oneapi-common-licensing intel-oneapi-common-vars - sudo apt-get install intel-oneapi-dev-utilities intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic intel-oneapi-compiler-fortran intel-oneapi-itac + wget https://github.com/open-mpi/ompi/archive/refs/tags/v4.1.6.tar.gz + tar -xvf v4.1.6.tar.gz + cd ompi-4.1.6 + ./autogen.pl + ./configure --prefix=/home/runner/ompi-4.1.6 + make -j4 + make install + echo "LD_LIBRARY_PATH=/home/runner/ompi-4.1.6/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV + echo "PATH=/home/runner/ompi-4.1.6/bin:$PATH" >> $GITHUB_ENV - name: Install open mpi run: | @@ -172,6 +155,11 @@ jobs: sudo make install export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${NFHOME}/lib + - name: Environment for openmpi compiler + run: | + echo "FC=mpif90" >> $GITHUB_ENV + echo "CC=mpicc" >> $GITHUB_ENV + ####################################################################################### # Build SCM. ####################################################################################### diff --git a/.github/workflows/ci_run_scm_DEPHY.yml b/.github/workflows/ci_run_scm_DEPHY.yml index 00af6a249..0097f924a 100644 --- a/.github/workflows/ci_run_scm_DEPHY.yml +++ b/.github/workflows/ci_run_scm_DEPHY.yml @@ -72,6 +72,18 @@ jobs: ####################################################################################### # Install FORTRAN dependencies ####################################################################################### + - name: Install openmpi + run: | + wget https://github.com/open-mpi/ompi/archive/refs/tags/v4.1.6.tar.gz + tar -xvf v4.1.6.tar.gz + cd ompi-4.1.6 + ./autogen.pl + ./configure --prefix=/home/runner/ompi-4.1.6 + make -j4 + make install + echo "LD_LIBRARY_PATH=/home/runner/ompi-4.1.6/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV + echo "PATH=/home/runner/ompi-4.1.6/bin:$PATH" >> $GITHUB_ENV + - name: Cache bacio library v2.4.1 id: cache-bacio-fortran uses: actions/cache@v3 @@ -146,6 +158,11 @@ jobs: ####################################################################################### # Build SCM. Run DEPHYv1 case. ####################################################################################### + - name: Environment for openmpi compiler + run: | + echo "FC=mpif90" >> $GITHUB_ENV + echo "CC=mpicc" >> $GITHUB_ENV + - name: Download data for SCM run: | cd ${SCM_ROOT} diff --git a/.github/workflows/ci_run_scm_rts.yml b/.github/workflows/ci_run_scm_rts.yml index 8452a987b..691aa526c 100644 --- a/.github/workflows/ci_run_scm_rts.yml +++ b/.github/workflows/ci_run_scm_rts.yml @@ -59,17 +59,18 @@ jobs: ####################################################################################### # Install FORTRAN dependencies ####################################################################################### - - name: Environment for gfortran compiler - if: contains(matrix.fortran-compiler, 'gfortran') - run: | - echo "FC=gfortran-11" >> $GITHUB_ENV - echo "CC=gcc-11" >> $GITHUB_ENV - - name: Environment for ifort compiler - if: contains(matrix.fortran-compiler, 'intel') + - name: Install openmpi run: | - echo "CC=icx" >> $GITHUB_ENV - echo "FC=ifort" >> $GITHUB_ENV + wget https://github.com/open-mpi/ompi/archive/refs/tags/v4.1.6.tar.gz + tar -xvf v4.1.6.tar.gz + cd ompi-4.1.6 + ./autogen.pl + ./configure --prefix=/home/runner/ompi-4.1.6 + make -j4 + make install + echo "LD_LIBRARY_PATH=/home/runner/ompi-4.1.6/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV + echo "PATH=/home/runner/ompi-4.1.6/bin:$PATH" >> $GITHUB_ENV ####################################################################################### # OpenMPI setup @@ -165,6 +166,11 @@ jobs: sudo make install export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${NFHOME}/lib + - name: Environment for openmpi compiler + run: | + echo "FC=mpif90" >> $GITHUB_ENV + echo "CC=mpicc" >> $GITHUB_ENV + ####################################################################################### # Build SCM. Run regression tests. ####################################################################################### diff --git a/ccpp/config/ccpp_prebuild_config.py b/ccpp/config/ccpp_prebuild_config.py index 41736151a..d68aaf98b 100755 --- a/ccpp/config/ccpp_prebuild_config.py +++ b/ccpp/config/ccpp_prebuild_config.py @@ -33,6 +33,7 @@ TYPEDEFS_NEW_METADATA = { 'ccpp_types' : { 'ccpp_types' : '', + 'MPI_Comm' : '', 'ccpp_t' : 'cdata', }, 'machine' : { diff --git a/scm/src/CMakeLists.txt b/scm/src/CMakeLists.txt index d93697e4d..095c0cb53 100644 --- a/scm/src/CMakeLists.txt +++ b/scm/src/CMakeLists.txt @@ -105,6 +105,9 @@ ADD_DEFINITIONS(-DCCPP) # Add host-model specific preprocessor flag (needed for some physics schemes) ADD_DEFINITIONS(-DSCM) +ADD_DEFINITIONS(-DMPI) + + #------------------------------------------------------------------------------ # Add model-specific flags for C/C++/Fortran preprocessor ADD_DEFINITIONS(-DMOIST_CAPPA -DUSE_COND -DNEMS_GSM) @@ -264,6 +267,7 @@ endif() # How about using proper compile targets etc? #------------------------------------------------------------------------------ # Configure sources + ADD_SUBDIRECTORY(${CCPP_FRAMEWORK_SRC} ${CMAKE_BINARY_DIR}/ccpp/framework) ADD_SUBDIRECTORY(${CCPP_PHYSICS_SRC} ${CMAKE_BINARY_DIR}/ccpp/physics) ADD_DEPENDENCIES(ccpp_physics ccpp_framework) diff --git a/scm/src/GFS_typedefs.F90 b/scm/src/GFS_typedefs.F90 index cf4a6db0c..51e6ae1ed 100644 --- a/scm/src/GFS_typedefs.F90 +++ b/scm/src/GFS_typedefs.F90 @@ -1,5 +1,6 @@ module GFS_typedefs + use mpi_f08 use machine, only: kind_phys, kind_dbl_prec, kind_sngl_prec use module_radsw_parameters, only: topfsw_type, sfcfsw_type @@ -85,7 +86,7 @@ module GFS_typedefs type GFS_init_type integer :: me !< my MPI-rank integer :: master !< master MPI-rank - integer :: fcst_mpi_comm !< forecast tasks mpi communicator + type(MPI_Comm) :: fcst_mpi_comm !< forecast tasks mpi communicator integer :: fcst_ntasks !< total number of forecast tasks integer :: tile_num !< tile number for this MPI rank integer :: isc !< starting i-index for this MPI-domain @@ -693,7 +694,7 @@ module GFS_typedefs integer :: me !< MPI rank designator integer :: master !< MPI rank of master atmosphere processor - integer :: communicator !< MPI communicator + type(MPI_Comm) :: communicator !< MPI communicator integer :: ntasks !< MPI size in communicator integer :: nthreads !< OpenMP threads available for physics integer :: nlunit !< unit for namelist @@ -1153,6 +1154,7 @@ module GFS_typedefs logical :: lheatstrg !< flag for canopy heat storage parameterization logical :: lseaspray !< flag for sea spray parameterization logical :: cnvcld + logical :: xr_cnvcld !< flag for adding suspended convective clouds to Xu-Randall cloud fraction logical :: random_clds !< flag controls whether clouds are random logical :: shal_cnv !< flag for calling shallow convection logical :: do_deep !< whether to do deep convection @@ -2582,7 +2584,6 @@ subroutine sfcprop_create (Sfcprop, IM, Model) allocate(Sfcprop%iceprv (IM)) allocate(Sfcprop%snowprv (IM)) allocate(Sfcprop%graupelprv(IM)) - Sfcprop%iceprv = clear_val Sfcprop%snowprv = clear_val Sfcprop%graupelprv = clear_val @@ -3297,7 +3298,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & real(kind=kind_phys), dimension(:), intent(in) :: bk logical, intent(in) :: restart logical, intent(in) :: hydrostatic - integer, intent(in) :: communicator + type(MPI_Comm), intent(in) :: communicator integer, intent(in) :: ntasks integer, intent(in) :: nthreads @@ -3307,9 +3308,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & integer :: seed0 logical :: exists real(kind=kind_phys) :: tem - real(kind=kind_phys) :: rinc(5) - real(kind=kind_sngl_prec) :: rinc4(5) - real(kind=kind_dbl_prec) :: rinc8(5) + real(kind=kind_dbl_prec) :: rinc(5) real(kind=kind_phys) :: wrk(1) real(kind=kind_phys), parameter :: con_hr = 3600. @@ -3673,6 +3672,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & logical :: lheatstrg = .false. !< flag for canopy heat storage parameterization logical :: lseaspray = .false. !< flag for sea spray parameterization logical :: cnvcld = .false. + logical :: xr_cnvcld = .true. !< flag for including suspended convective clouds in Xu-Randall cloud fraction logical :: random_clds = .false. !< flag controls whether clouds are random logical :: shal_cnv = .false. !< flag for calling shallow convection integer :: imfshalcnv = 1 !< flag for mass-flux shallow convection scheme @@ -3979,7 +3979,6 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & real(kind=kind_phys) :: radar_tten_limits(2) = (/ limit_unspecified, limit_unspecified /) integer :: itime - integer :: w3kindreal,w3kindint !--- END NAMELIST VARIABLES @@ -4069,8 +4068,8 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & hwrf_samfdeep, hwrf_samfshal,progsigma,betascu,betamcu, & betadcu,h2o_phys, pdfcld, shcnvcw, redrag, hybedmf, satmedmf,& shinhong, do_ysu, dspheat, lheatstrg, lseaspray, cnvcld, & - random_clds, shal_cnv, imfshalcnv, imfdeepcnv, isatmedmf, & - do_deep, jcap, & + xr_cnvcld, random_clds, shal_cnv, imfshalcnv, imfdeepcnv, & + isatmedmf, do_deep, jcap, & cs_parm, flgmin, cgwf, ccwf, cdmbgwd, sup, ctei_rm, crtrh, & dlqf, rbcr, shoc_parm, psauras, prauras, wminras, & do_sppt, do_shum, do_skeb, & @@ -4949,6 +4948,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & Model%lheatstrg = lheatstrg Model%lseaspray = lseaspray Model%cnvcld = cnvcld + Model%xr_cnvcld = xr_cnvcld Model%random_clds = random_clds Model%shal_cnv = shal_cnv Model%imfshalcnv = imfshalcnv @@ -5664,19 +5664,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & Model%cdec = -9999. Model%clstp = -9999 rinc(1:5) = 0 - call w3kind(w3kindreal,w3kindint) - if (w3kindreal == 8) then - rinc8(1:5) = 0 - call w3difdat(jdat,idat,4,rinc8) - rinc = rinc8 - else if (w3kindreal == 4) then - rinc4(1:5) = 0 - call w3difdat(jdat,idat,4,rinc4) - rinc = rinc4 - else - write(0,*)' FATAL ERROR: Invalid w3kindreal' - call abort - endif + call w3difdat(jdat,idat,4,rinc) Model%phour = rinc(4)/con_hr Model%fhour = (rinc(4) + Model%dtp)/con_hr Model%zhour = mod(Model%phour,Model%fhzero) @@ -6251,7 +6239,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & ' do_shoc=', Model%do_shoc, ' nshoc3d=', Model%nshoc_3d, & ' nshoc_2d=', Model%nshoc_2d, ' shoc_cld=', Model%shoc_cld, & ' nkbfshoc=', Model%nkbfshoc, ' nahdshoc=', Model%nahdshoc, & - ' nscfshoc=', Model%nscfshoc, & + ' nscfshoc=', Model%nscfshoc, ' xr_cnvcld=',Model%xr_cnvcld, & ' uni_cld=', Model%uni_cld, & ' ntot3d=', Model%ntot3d, ' ntot2d=', Model%ntot2d, & ' shocaftcnv=',Model%shocaftcnv,' indcld=', Model%indcld, & @@ -6474,7 +6462,7 @@ subroutine control_print(Model) print *, 'basic control parameters' print *, ' me : ', Model%me print *, ' master : ', Model%master - print *, ' communicator : ', Model%communicator + print *, ' communicator : ', Model%communicator%mpi_val print *, ' nlunit : ', Model%nlunit print *, ' fn_nml : ', trim(Model%fn_nml) print *, ' fhzero : ', Model%fhzero @@ -7192,7 +7180,6 @@ subroutine tbd_create (Tbd, IM, Model) allocate (Tbd%h2opl (IM,levh2o,h2o_coeff)) Tbd%h2opl = clear_val Tbd%ozpl = clear_val - !--- ccn and in needs ! DH* allocate only for MG? *DH diff --git a/scm/src/GFS_typedefs.meta b/scm/src/GFS_typedefs.meta index 7694c952f..2b2d485bf 100644 --- a/scm/src/GFS_typedefs.meta +++ b/scm/src/GFS_typedefs.meta @@ -3346,7 +3346,7 @@ long_name = MPI communicator units = index dimensions = () - type = integer + type = MPI_Comm [ntasks] standard_name = number_of_mpi_tasks long_name = number of MPI tasks in communicator @@ -5424,6 +5424,12 @@ units = flag dimensions = () type = logical +[xr_cnvcld] + standard_name = flag_for_suspended_convective_clouds_in_Xu_Randall + long_name = flag for using suspended convective clouds in Xu Randall + units = flag + dimensions = () + type = logical [shal_cnv] standard_name = flag_for_simplified_arakawa_schubert_shallow_convection long_name = flag for calling shallow convection diff --git a/scm/src/run_scm.py b/scm/src/run_scm.py index 7328ffdd3..9acc5b64a 100755 --- a/scm/src/run_scm.py +++ b/scm/src/run_scm.py @@ -708,7 +708,7 @@ def launch_executable(use_gdb, gdb, ignore_error = False): if use_gdb: cmd = '(cd {scm_run} && {gdb} {executable})'.format(scm_run=SCM_RUN, gdb=gdb, executable=EXECUTABLE) else: - cmd = '(cd {scm_run} && time {executable})'.format(scm_run=SCM_RUN, executable=EXECUTABLE) + cmd = '(cd {scm_run} && time mpirun -n 1 {executable})'.format(scm_run=SCM_RUN, executable=EXECUTABLE) logging.info('Passing control to "{0}"'.format(cmd)) time.sleep(1) # This will abort in 'execute' in the event of an error if ignore_error = False diff --git a/scm/src/scm.F90 b/scm/src/scm.F90 index ba152f1c1..d6abe399e 100644 --- a/scm/src/scm.F90 +++ b/scm/src/scm.F90 @@ -15,7 +15,8 @@ subroutine scm_main_sub() use scm_time_integration use scm_output use scm_type_defs - + use mpi_f08 + use :: ccpp_static_api, & only: ccpp_physics_init, & ccpp_physics_timestep_init, & @@ -30,6 +31,8 @@ subroutine scm_main_sub() type(scm_input_type), target :: scm_input_instance type(scm_reference_type), target :: scm_reference + type(MPI_Comm) :: fcst_mpi_comm + integer :: i, j, kdt_rad, idtend, itrac real(kind=8) :: rinc(5) !(DAYS, HOURS, MINUTES, SECONDS, MILLISECONDS) integer :: jdat(1:8) @@ -39,6 +42,13 @@ subroutine scm_main_sub() character(len=16) :: logfile_name logical :: in_spinup + call MPI_INIT(ierr) + if (ierr/=0) then + write(*,'(a,i0,a)') 'An error occurred in MPI_INIT: ' // ierr // '. Exiting...' + stop 1 + end if + fcst_mpi_comm = MPI_COMM_WORLD + call get_config_nml(scm_state) select case(scm_state%input_type) @@ -94,6 +104,7 @@ subroutine scm_main_sub() open(unit=physics%Init_parm%logunit, file=trim(scm_state%output_dir)//'/'//logfile_name, action='write', status='replace') end if + physics%Init_parm%fcst_mpi_comm = fcst_mpi_comm physics%Init_parm%levs = scm_state%n_levels physics%Init_parm%bdat(1) = scm_state%init_year physics%Init_parm%bdat(2) = scm_state%init_month @@ -120,7 +131,7 @@ subroutine scm_main_sub() call GFS_suite_setup(physics%Model, physics%Statein, physics%Stateout, & physics%Sfcprop, physics%Coupling, physics%Grid, & physics%Tbd, physics%Cldprop, physics%Radtend, & - physics%Diag, physics%Interstitial, 0, 1, 1, & + physics%Diag, physics%Interstitial, 1, 1, & physics%Init_parm, scm_state%n_cols, scm_state%lon, & scm_state%lat, scm_state%area) @@ -418,6 +429,12 @@ subroutine scm_main_sub() write(*,'(a,i0,a)') 'An error occurred in ccpp_physics_finalize: ' // trim(cdata%errmsg) // '. Exiting...' stop 1 end if + + call MPI_FINALIZE(ierr) + if (ierr/=0) then + write(*,'(a,i0,a)') 'An error occurred in MPI_FINALIZE: ' // ierr // '. Exiting...' + stop 1 + end if end subroutine scm_main_sub @@ -429,5 +446,7 @@ end module scm_main !! subroutine \ref scm_main_sub above. program scm use scm_main + use mpi_f08 + call scm_main_sub() end program scm diff --git a/scm/src/scm_setup.F90 b/scm/src/scm_setup.F90 index 30ebf3d47..5f4423e29 100644 --- a/scm/src/scm_setup.F90 +++ b/scm/src/scm_setup.F90 @@ -279,7 +279,7 @@ end subroutine patch_in_ref !-------------- subroutine GFS_suite_setup (Model, Statein, Stateout, Sfcprop, & Coupling, Grid, Tbd, Cldprop, Radtend, Diag, & - Interstitial, communicator, ntasks, nthreads, & + Interstitial, ntasks, nthreads, & Init_parm, n_cols, lon, lat, area) use machine, only: kind_phys @@ -311,7 +311,6 @@ subroutine GFS_suite_setup (Model, Statein, Stateout, Sfcprop, type(GFS_interstitial_type), intent(inout) :: Interstitial type(GFS_init_type), intent(in) :: Init_parm - integer, intent(in) :: communicator integer, intent(in) :: ntasks, nthreads, n_cols real(kind=dp), dimension(n_cols), intent(in) :: lon, lat, area @@ -334,7 +333,7 @@ subroutine GFS_suite_setup (Model, Statein, Stateout, Sfcprop, Init_parm%input_nml_file, Init_parm%tile_num, & Init_parm%blksz, Init_parm%ak, Init_parm%bk, & Init_parm%restart, Init_parm%hydrostatic, & - communicator, ntasks, nthreads) + Init_parm%fcst_mpi_comm, ntasks, nthreads) !--- initialize DDTs From ab0e0af419b73dbabf0c56220b3b946401ea21a9 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Thu, 30 May 2024 14:33:27 -0400 Subject: [PATCH 29/35] fix compilation error for MPI_INIT/FINALIZE error messages --- scm/src/scm.F90 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scm/src/scm.F90 b/scm/src/scm.F90 index d6abe399e..9a05e974a 100644 --- a/scm/src/scm.F90 +++ b/scm/src/scm.F90 @@ -44,7 +44,7 @@ subroutine scm_main_sub() call MPI_INIT(ierr) if (ierr/=0) then - write(*,'(a,i0,a)') 'An error occurred in MPI_INIT: ' // ierr // '. Exiting...' + write(*,*) 'An error occurred in MPI_INIT: ', ierr stop 1 end if fcst_mpi_comm = MPI_COMM_WORLD @@ -432,7 +432,7 @@ subroutine scm_main_sub() call MPI_FINALIZE(ierr) if (ierr/=0) then - write(*,'(a,i0,a)') 'An error occurred in MPI_FINALIZE: ' // ierr // '. Exiting...' + write(*,*) 'An error occurred in MPI_FINALIZE: ', ierr stop 1 end if From f9c1fa0abfeca35ce2fbdc2d525ce3d7db5e29a6 Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr" Date: Thu, 30 May 2024 19:18:18 +0000 Subject: [PATCH 30/35] Move "macaw" (HAFS_v0_hwrf) back to old name in suites_not_used, since ferrier-aligo microphysics is currently broken --- ccpp/suites/alias.json | 2 -- .../macaw.xml => suites_not_used/suite_SCM_HAFS_v0_hwrf.xml} | 4 ++-- .../suite_SCM_HAFS_v0_hwrf_ps.xml} | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) rename ccpp/{suites/macaw.xml => suites_not_used/suite_SCM_HAFS_v0_hwrf.xml} (87%) rename ccpp/{suites/macaw_ps.xml => suites_not_used/suite_SCM_HAFS_v0_hwrf_ps.xml} (85%) diff --git a/ccpp/suites/alias.json b/ccpp/suites/alias.json index f3f47fa48..1040bd281 100644 --- a/ccpp/suites/alias.json +++ b/ccpp/suites/alias.json @@ -3,8 +3,6 @@ "SCM_GFS_v17_HR3_ps.xml": "magpie_ps.xml", "SCM_GFS_v16.xml": "raven.xml", "SCM_GFS_v16_ps.xml": "raven_ps.xml", - "HAFS_v0_hwrf.xml": "macaw.xml", - "HAFS_v0_hwrf_ps.xml": "macaw_ps.xml", "HAFS_v0_hwrf_thompson.xml": "sunbird.xml", "HAFS_v0_hwrf_thompson_ps.xml": "sunbird_ps.xml", "SCM_GFS_v17_p8_c3.xml": "parakeet.xml", diff --git a/ccpp/suites/macaw.xml b/ccpp/suites_not_used/suite_SCM_HAFS_v0_hwrf.xml similarity index 87% rename from ccpp/suites/macaw.xml rename to ccpp/suites_not_used/suite_SCM_HAFS_v0_hwrf.xml index cc471c758..da92ea019 100644 --- a/ccpp/suites/macaw.xml +++ b/ccpp/suites_not_used/suite_SCM_HAFS_v0_hwrf.xml @@ -1,9 +1,9 @@ - + diff --git a/ccpp/suites/macaw_ps.xml b/ccpp/suites_not_used/suite_SCM_HAFS_v0_hwrf_ps.xml similarity index 85% rename from ccpp/suites/macaw_ps.xml rename to ccpp/suites_not_used/suite_SCM_HAFS_v0_hwrf_ps.xml index 8ebbc97cb..f119aaf5a 100644 --- a/ccpp/suites/macaw_ps.xml +++ b/ccpp/suites_not_used/suite_SCM_HAFS_v0_hwrf_ps.xml @@ -1,11 +1,11 @@ - + From b1f08f45d45edeaaf7234cd532cacee5ec60d92d Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr" Date: Thu, 30 May 2024 20:57:53 +0000 Subject: [PATCH 31/35] Alphabetize alias.json --- ccpp/suites/alias.json | 46 +++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/ccpp/suites/alias.json b/ccpp/suites/alias.json index 1040bd281..434a10fe0 100644 --- a/ccpp/suites/alias.json +++ b/ccpp/suites/alias.json @@ -1,33 +1,33 @@ { - "SCM_GFS_v17_HR3.xml": "magpie.xml", - "SCM_GFS_v17_HR3_ps.xml": "magpie_ps.xml", - "SCM_GFS_v16.xml": "raven.xml", - "SCM_GFS_v16_ps.xml": "raven_ps.xml", - "HAFS_v0_hwrf_thompson.xml": "sunbird.xml", "HAFS_v0_hwrf_thompson_ps.xml": "sunbird_ps.xml", - "SCM_GFS_v17_p8_c3.xml": "parakeet.xml", - "SCM_GFS_v17_p8_c3_ps.xml": "parakeet_ps.xml", - "SCM_GFS_v15p2.xml": "kingfisher.xml", + "HAFS_v0_hwrf_thompson.xml": "sunbird.xml", "SCM_GFS_v15p2_ps.xml": "kingfisher_ps.xml", - "SCM_GFS_v17_p8.xml": "bluebird.xml", - "SCM_HRRR.xml": "bald_eagle.xml", - "SCM_RAP.xml": "albatross.xml", - "SCM_RRFS_v1beta.xml": "pigeon.xml", - "SCM_WoFS_v0.xml": "hummingbird.xml", + "SCM_GFS_v15p2.xml": "kingfisher.xml", + "SCM_GFS_v16_no_nsst_ps.xml": "nuthatch_ps.xml", + "SCM_GFS_v16_no_nsst.xml": "nuthatch.xml", + "SCM_GFS_v16_ps.xml": "raven_ps.xml", + "SCM_GFS_v16_RRTMGP_ps.xml": "mallard_ps.xml", + "SCM_GFS_v16_RRTMGP.xml": "mallard.xml", + "SCM_GFS_v16.xml": "raven.xml", + "SCM_GFS_v17_HR3_ps.xml": "magpie_ps.xml", + "SCM_GFS_v17_HR3_RRTMGP_ps.xml": "robin_ps.xml", + "SCM_GFS_v17_HR3_RRTMGP.xml": "robin.xml", + "SCM_GFS_v17_HR3.xml": "magpie.xml", + "SCM_GFS_v17_p8_c3_ps.xml": "parakeet_ps.xml", + "SCM_GFS_v17_p8_c3.xml": "parakeet.xml", "SCM_GFS_v17_p8_ps.xml": "bluebird_ps.xml", + "SCM_GFS_v17_p8.xml": "bluebird.xml", "SCM_HRRR_ps.xml": "bald_eagle_ps.xml", + "SCM_HRRR.xml": "bald_eagle.xml", "SCM_RAP_ps.xml": "albatross_ps.xml", - "SCM_RRFS_v1beta_ps.xml": "pigeon_ps.xml", - "SCM_WoFS_v0_ps.xml": "hummingbird_ps.xml", - "SCM_GFS_v16_RRTMGP.xml": "mallard.xml", - "SCM_GFS_v16_RRTMGP_ps.xml": "mallard_ps.xml", - "SCM_GFS_v16_no_nsst.xml": "nuthatch.xml", - "SCM_GFS_v16_no_nsst_ps.xml": "nuthatch_ps.xml", - "SCM_RRFS_v1alpha.xml": "towhee.xml", + "SCM_RAP.xml": "albatross.xml", "SCM_RRFS_v1alpha_ps.xml": "towhee_ps.xml", + "SCM_RRFS_v1alpha.xml": "towhee.xml", + "SCM_RRFS_v1beta_ps.xml": "pigeon_ps.xml", + "SCM_RRFS_v1beta.xml": "pigeon.xml", "SCM_RRFS_v1nssl.xml": "crossbill.xml", - "SCM_GFS_v17_HR3_RRTMGP.xml": "robin.xml", - "SCM_GFS_v17_HR3_RRTMGP_ps.xml": "robin_ps.xml", + "SCM_RRFS_v1_ps.xml": "warbler_ps.xml", "SCM_RRFS_v1.xml": "warbler.xml", - "SCM_RRFS_v1_ps.xml": "warbler_ps.xml" + "SCM_WoFS_v0_ps.xml": "hummingbird_ps.xml", + "SCM_WoFS_v0.xml": "hummingbird.xml" } From 1c6cef8274974ddd5f93df8a94a91b7bd370cd96 Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr" Date: Fri, 31 May 2024 03:58:17 +0000 Subject: [PATCH 32/35] Add CLI so plot_scm_out.py can be run manually --- test/plot_scm_out.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/test/plot_scm_out.py b/test/plot_scm_out.py index 7641e80f9..53ddf0e77 100755 --- a/test/plot_scm_out.py +++ b/test/plot_scm_out.py @@ -1,5 +1,6 @@ #!/usr/bin/env python +import argparse ############################################################################## # # This script compares SCM RT output to baselines. @@ -175,3 +176,18 @@ def plot_results(file_BL, file_RT, plot_RT_only): # end for (fields in file) return(plot_files) + +if __name__ == "__main__": + + #Parse arguments + parser = argparse.ArgumentParser( + description="Script for setting up a forecast and creating a workflow"\ + "according to the parameters specified in the config file\n") + + parser.add_argument('-bl', '--baseline', type=str, required=True, + help='Baseline file') + parser.add_argument('-rt', '--rt', type=str, required=True, + help='Regression test file') + pargs = parser.parse_args() + + plot_results(pargs.baseline, pargs.rt, False) From 0f87525b3cdcc3586de0fc123ddda07ebaa23590 Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr" Date: Fri, 31 May 2024 04:45:49 +0000 Subject: [PATCH 33/35] Fix bad merge of CI tests, remove "push" rules --- .../workflows/ci_build_scm_ubuntu_22.04.yml | 16 +------------- .../ci_build_scm_ubuntu_22.04_nvidia.yml | 2 +- .github/workflows/ci_run_scm_DEPHY.yml | 19 +---------------- .github/workflows/ci_run_scm_rts.yml | 21 +------------------ .github/workflows/ci_run_scm_ufs_replay.yml | 2 +- .github/workflows/ci_test_docker.yml | 2 +- 6 files changed, 6 insertions(+), 56 deletions(-) diff --git a/.github/workflows/ci_build_scm_ubuntu_22.04.yml b/.github/workflows/ci_build_scm_ubuntu_22.04.yml index e4571b607..7eaabd29d 100644 --- a/.github/workflows/ci_build_scm_ubuntu_22.04.yml +++ b/.github/workflows/ci_build_scm_ubuntu_22.04.yml @@ -1,6 +1,6 @@ name: CI test to build the CCPP-SCM on ubuntu v22.04 -on: [pull_request,workflow_dispatch,push] +on: [pull_request,workflow_dispatch] jobs: build_scm: @@ -68,20 +68,6 @@ jobs: echo "LD_LIBRARY_PATH=/home/runner/ompi-4.1.6/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV echo "PATH=/home/runner/ompi-4.1.6/bin:$PATH" >> $GITHUB_ENV - - name: Install open mpi - run: | - wget https://github.com/open-mpi/ompi/archive/refs/tags/v4.1.6.tar.gz - tar -xvf v4.1.6.tar.gz - cd ompi-4.1.6 - ./autogen.pl - ./configure --prefix=/home/runner/ompi-4.1.6 - make -j4 - make install - echo "LD_LIBRARY_PATH=/home/runner/ompi-4.1.6/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV - echo "PATH=/home/runner/ompi-4.1.6/bin:$PATH" >> $GITHUB_ENV - echo "CC=mpicc" >> $GITHUB_ENV - echo "FC=mpif90" >> $GITHUB_ENV - - name: Cache bacio library v2.4.1 id: cache-bacio-fortran uses: actions/cache@v3 diff --git a/.github/workflows/ci_build_scm_ubuntu_22.04_nvidia.yml b/.github/workflows/ci_build_scm_ubuntu_22.04_nvidia.yml index 4d9ce78e6..f5a808aad 100644 --- a/.github/workflows/ci_build_scm_ubuntu_22.04_nvidia.yml +++ b/.github/workflows/ci_build_scm_ubuntu_22.04_nvidia.yml @@ -1,6 +1,6 @@ name: CI test to build the CCPP-SCM on ubuntu v22.04 -on: [pull_request,workflow_dispatch,push] +on: [pull_request,workflow_dispatch] jobs: diff --git a/.github/workflows/ci_run_scm_DEPHY.yml b/.github/workflows/ci_run_scm_DEPHY.yml index 0097f924a..ebf97c9a1 100644 --- a/.github/workflows/ci_run_scm_DEPHY.yml +++ b/.github/workflows/ci_run_scm_DEPHY.yml @@ -1,6 +1,6 @@ name: CI test to run the SCM with DEPHY v1 data -on: [pull_request,workflow_dispatch,push] +on: [pull_request,workflow_dispatch] jobs: run-scm-DEPHY: @@ -51,23 +51,6 @@ jobs: - name: Update system packages run: sudo apt-get update - ####################################################################################### - # Install OpenMPI - ####################################################################################### - - name: Install open mpi - run: | - wget https://github.com/open-mpi/ompi/archive/refs/tags/v4.1.6.tar.gz - tar -xvf v4.1.6.tar.gz - cd ompi-4.1.6 - ./autogen.pl - ./configure --prefix=/home/runner/ompi-4.1.6 - make -j4 - make install - echo "LD_LIBRARY_PATH=/home/runner/ompi-4.1.6/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV - echo "PATH=/home/runner/ompi-4.1.6/bin:$PATH" >> $GITHUB_ENV - echo "CC=mpicc" >> $GITHUB_ENV - echo "FC=mpif90" >> $GITHUB_ENV - ####################################################################################### # Install FORTRAN dependencies diff --git a/.github/workflows/ci_run_scm_rts.yml b/.github/workflows/ci_run_scm_rts.yml index c88e7d771..7f44478eb 100644 --- a/.github/workflows/ci_run_scm_rts.yml +++ b/.github/workflows/ci_run_scm_rts.yml @@ -1,6 +1,6 @@ name: CI test to build and run SCM regression tests -on: [pull_request, workflow_dispatch,push] +on: [pull_request, workflow_dispatch] jobs: run_scm_rts: @@ -72,25 +72,6 @@ jobs: echo "LD_LIBRARY_PATH=/home/runner/ompi-4.1.6/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV echo "PATH=/home/runner/ompi-4.1.6/bin:$PATH" >> $GITHUB_ENV - ####################################################################################### - # OpenMPI setup - ####################################################################################### - - - name: Install open mpi - run: | - wget https://github.com/open-mpi/ompi/archive/refs/tags/v4.1.6.tar.gz - tar -xvf v4.1.6.tar.gz - cd ompi-4.1.6 - ./autogen.pl - ./configure --prefix=/home/runner/ompi-4.1.6 - make -j4 - make install - echo "LD_LIBRARY_PATH=/home/runner/ompi-4.1.6/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV - echo "PATH=/home/runner/ompi-4.1.6/bin:$PATH" >> $GITHUB_ENV - echo `ls /home/runner/ompi-4.1.6/bin` - echo "FC=mpif90" >> $GITHUB_ENV - echo "CC=mpicc" >> $GITHUB_ENV - ####################################################################################### # Install FORTRAN dependencies ####################################################################################### diff --git a/.github/workflows/ci_run_scm_ufs_replay.yml b/.github/workflows/ci_run_scm_ufs_replay.yml index 4cdfb5ba3..d252e1425 100644 --- a/.github/workflows/ci_run_scm_ufs_replay.yml +++ b/.github/workflows/ci_run_scm_ufs_replay.yml @@ -1,6 +1,6 @@ name: CI test to create SCM UFS-replay cases from UWM regression tests -on: [pull_request,workflow_dispatch,push] +on: [pull_request,workflow_dispatch] jobs: run_scm_ufs_replay: diff --git a/.github/workflows/ci_test_docker.yml b/.github/workflows/ci_test_docker.yml index bb5908d59..3406d8326 100644 --- a/.github/workflows/ci_test_docker.yml +++ b/.github/workflows/ci_test_docker.yml @@ -1,6 +1,6 @@ name: build_test_and_push_docker -on: [pull_request,workflow_dispatch,push] +on: [pull_request,workflow_dispatch] env: TEST_TAG: dtcenter/ccpp-scm:test From 41531a40f7a6364400d1201371942177630c14ed Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Fri, 31 May 2024 10:06:55 -0400 Subject: [PATCH 34/35] change len to shape for numpy array checking --- test/plot_scm_out.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/plot_scm_out.py b/test/plot_scm_out.py index 41b46cfc3..c1796a251 100755 --- a/test/plot_scm_out.py +++ b/test/plot_scm_out.py @@ -84,7 +84,7 @@ def plot_results(file_bl, file_rt=None, vars2plt=None): if file_rt is not None: x2 = SCM_RT[timeD][:].squeeze()/3600. #seconds - >hours # If temporal dimensions disagree, con't compute deltas from experiments, turn off difference plots. - if (len(x1) != len(x2)): + if (x1.shape != x2.shape): plot_diff = False # end if # end if From d8952ee3799b6407ceecc40fac3a5e364d1ecaf6 Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr" Date: Mon, 3 Jun 2024 16:45:11 +0000 Subject: [PATCH 35/35] Fix "magpie" description --- ccpp/suites/magpie.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/ccpp/suites/magpie.xml b/ccpp/suites/magpie.xml index b201878ff..27f38fea8 100644 --- a/ccpp/suites/magpie.xml +++ b/ccpp/suites/magpie.xml @@ -2,7 +2,6 @@