From 8a71bd4dc5df758e49ffada472d992ecb9c26a9f Mon Sep 17 00:00:00 2001 From: XiaSun-NOAA Date: Wed, 20 Jan 2021 15:30:12 +0000 Subject: [PATCH 1/6] SDF for GFSv16 with Thompson --- .../suites/suite_FV3_GFS_v16beta_thompson.xml | 91 +++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 ccpp/suites/suite_FV3_GFS_v16beta_thompson.xml diff --git a/ccpp/suites/suite_FV3_GFS_v16beta_thompson.xml b/ccpp/suites/suite_FV3_GFS_v16beta_thompson.xml new file mode 100644 index 000000000..ee1b555ea --- /dev/null +++ b/ccpp/suites/suite_FV3_GFS_v16beta_thompson.xml @@ -0,0 +1,91 @@ + + + + + + + GFS_time_vary_pre + GFS_rrtmg_setup + GFS_rad_time_vary + GFS_phys_time_vary + + + + + GFS_suite_interstitial_rad_reset + GFS_rrtmg_pre + rrtmg_sw_pre + rrtmg_sw + rrtmg_sw_post + rrtmg_lw_pre + 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 + satmedmfvdifq + GFS_PBL_generic_post + GFS_GWD_generic_pre + cires_ugwp + cires_ugwp_post + GFS_GWD_generic_post + rayleigh_damp + GFS_suite_stateout_update + ozphys_2015 + 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_thompson_pre + mp_thompson + mp_thompson_post + GFS_MP_generic_post + maximum_hourly_diagnostics + + + + + GFS_stochastics + phys_tend + + + + From 2ceca244cc4c4ecdabe162724995af4699867440 Mon Sep 17 00:00:00 2001 From: XiaSun-NOAA Date: Wed, 17 Feb 2021 14:28:49 +0000 Subject: [PATCH 2/6] rename v16beta to v16 --- ccpp/suites/suite_FV3_GFS_v16_thompson.xml | 91 ++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 ccpp/suites/suite_FV3_GFS_v16_thompson.xml diff --git a/ccpp/suites/suite_FV3_GFS_v16_thompson.xml b/ccpp/suites/suite_FV3_GFS_v16_thompson.xml new file mode 100644 index 000000000..67e552d46 --- /dev/null +++ b/ccpp/suites/suite_FV3_GFS_v16_thompson.xml @@ -0,0 +1,91 @@ + + + + + + + GFS_time_vary_pre + GFS_rrtmg_setup + GFS_rad_time_vary + GFS_phys_time_vary + + + + + GFS_suite_interstitial_rad_reset + GFS_rrtmg_pre + rrtmg_sw_pre + rrtmg_sw + rrtmg_sw_post + rrtmg_lw_pre + 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 + satmedmfvdifq + GFS_PBL_generic_post + GFS_GWD_generic_pre + cires_ugwp + cires_ugwp_post + GFS_GWD_generic_post + rayleigh_damp + GFS_suite_stateout_update + ozphys_2015 + 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_thompson_pre + mp_thompson + mp_thompson_post + GFS_MP_generic_post + maximum_hourly_diagnostics + + + + + GFS_stochastics + phys_tend + + + + From 3cd1722e6ab8cad7813af6b309d17f8370bef668 Mon Sep 17 00:00:00 2001 From: XiaSun-NOAA Date: Wed, 17 Feb 2021 14:45:07 +0000 Subject: [PATCH 3/6] Update .gitmodules and submodule pointer for ccpp-physics for code review and testing --- .gitmodules | 4 ++-- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index d253f6966..f1a47f68b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,5 +8,5 @@ branch = master [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/NCAR/ccpp-physics - branch = master + url = https://github.com/RuiyuSun/ccpp-physics + branch = ruiyu/bugfix/prerad diff --git a/ccpp/physics b/ccpp/physics index 8c40fec35..336876d17 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 8c40fec35759737b93843735c6b8442ae8c348d9 +Subproject commit 336876d17d85787fd50a7b2f66da77c0bdeef9e8 From edd4e81872725387889bd7c6c54cd87c8f8a4a4a Mon Sep 17 00:00:00 2001 From: XiaSun-NOAA <58949533+XiaSun-NOAA@users.noreply.github.com> Date: Wed, 17 Feb 2021 08:06:44 -0700 Subject: [PATCH 4/6] Delete suite_FV3_GFS_v16beta_thompson.xml --- .../suites/suite_FV3_GFS_v16beta_thompson.xml | 91 ------------------- 1 file changed, 91 deletions(-) delete mode 100644 ccpp/suites/suite_FV3_GFS_v16beta_thompson.xml diff --git a/ccpp/suites/suite_FV3_GFS_v16beta_thompson.xml b/ccpp/suites/suite_FV3_GFS_v16beta_thompson.xml deleted file mode 100644 index ee1b555ea..000000000 --- a/ccpp/suites/suite_FV3_GFS_v16beta_thompson.xml +++ /dev/null @@ -1,91 +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 - rrtmg_sw_pre - rrtmg_sw - rrtmg_sw_post - rrtmg_lw_pre - 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 - satmedmfvdifq - GFS_PBL_generic_post - GFS_GWD_generic_pre - cires_ugwp - cires_ugwp_post - GFS_GWD_generic_post - rayleigh_damp - GFS_suite_stateout_update - ozphys_2015 - 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_thompson_pre - mp_thompson - mp_thompson_post - GFS_MP_generic_post - maximum_hourly_diagnostics - - - - - GFS_stochastics - phys_tend - - - - From b5f00c64255be796f9f2bc2b7308ffb3bb7270e4 Mon Sep 17 00:00:00 2001 From: XiaSun-NOAA Date: Wed, 17 Feb 2021 17:30:38 +0000 Subject: [PATCH 5/6] update to new commit of Thompson MP in ccpp physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 336876d17..8cc60d34c 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 336876d17d85787fd50a7b2f66da77c0bdeef9e8 +Subproject commit 8cc60d34c49426b78d2fe14a9c16fc719c558041 From fc8e4c280127a21545a587504b57e8e0bb7f4d69 Mon Sep 17 00:00:00 2001 From: XiaSun-NOAA Date: Fri, 19 Feb 2021 14:26:36 +0000 Subject: [PATCH 6/6] Revert change to .gitmodules and update submodule pointer for ccpp-physics --- .gitmodules | 4 ++-- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index f1a47f68b..d253f6966 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,5 +8,5 @@ branch = master [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/RuiyuSun/ccpp-physics - branch = ruiyu/bugfix/prerad + url = https://github.com/NCAR/ccpp-physics + branch = master diff --git a/ccpp/physics b/ccpp/physics index 8cc60d34c..d884fb105 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 8cc60d34c49426b78d2fe14a9c16fc719c558041 +Subproject commit d884fb105bc138216f5f213d43ee05b0481a030e