From 114cc4bf8db8f863a80476b49ba94a37afe8299d Mon Sep 17 00:00:00 2001 From: "Yihua.Wu" Date: Fri, 2 Apr 2021 13:49:30 +0000 Subject: [PATCH 01/20] Updated flake physics and suites, and change ccpp-physics branch to https://github.com/YihuaWu-NOAA/ccpp-physics --- .gitmodules | 4 +- ccpp/physics | 2 +- .../suite_FV3_GFS_v15_thompson_mynn_noah.xml | 90 ++++++++++++++++++ ...e_FV3_GFS_v15_thompson_mynn_noah_flake.xml | 91 ++++++++++++++++++ ...suite_FV3_GFS_v15_thompson_mynn_noahmp.xml | 91 ++++++++++++++++++ ...FV3_GFS_v15_thompson_mynn_noahmp_flake.xml | 92 +++++++++++++++++++ ccpp/suites/suite_RRFS_parallel.xml | 90 ++++++++++++++++++ 7 files changed, 457 insertions(+), 3 deletions(-) create mode 100644 ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah.xml create mode 100644 ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah_flake.xml create mode 100644 ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp.xml create mode 100644 ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp_flake.xml create mode 100644 ccpp/suites/suite_RRFS_parallel.xml diff --git a/.gitmodules b/.gitmodules index 1f7526633..a9a5691de 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/YihuaWu-NOAA/ccpp-physics + branch = flake diff --git a/ccpp/physics b/ccpp/physics index e09c3b26c..bd67c0fbe 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit e09c3b26c738c48d635f0d8f96cbafd0b3b1c000 +Subproject commit bd67c0fbe15568a954b350405a24d78bfd94ea69 diff --git a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah.xml b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah.xml new file mode 100644 index 000000000..39caf7bdc --- /dev/null +++ b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah.xml @@ -0,0 +1,90 @@ + + + + + + + GFS_time_vary_pre + GFS_rrtmg_setup + GFS_rad_time_vary + GFS_phys_time_vary + + + + + GFS_suite_interstitial_rad_reset + sgscloud_radpre + GFS_rrtmg_pre + rrtmg_sw_pre + rrtmg_sw + rrtmg_sw_post + rrtmg_lw_pre + rrtmg_lw + sgscloud_radpost + 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 + mynnedmf_wrapper + 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 + + + + diff --git a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah_flake.xml b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah_flake.xml new file mode 100644 index 000000000..c93ec9d69 --- /dev/null +++ b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah_flake.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 + sgscloud_radpre + GFS_rrtmg_pre + rrtmg_sw_pre + rrtmg_sw + rrtmg_sw_post + rrtmg_lw_pre + rrtmg_lw + sgscloud_radpost + 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 + flake_driver + sfc_sice + GFS_surface_loop_control_part2 + + + + GFS_surface_composites_post + sfc_diag + sfc_diag_post + GFS_surface_generic_post + mynnedmf_wrapper + 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 + + + + diff --git a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp.xml b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp.xml new file mode 100644 index 000000000..4fa1d2b09 --- /dev/null +++ b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp.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 + sgscloud_radpre + GFS_rrtmg_pre + rrtmg_sw_pre + rrtmg_sw + rrtmg_sw_post + rrtmg_lw_pre + rrtmg_lw + sgscloud_radpost + 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 + + noahmpdrv + sfc_sice + GFS_surface_loop_control_part2 + + + + GFS_surface_composites_post + sfc_diag + sfc_diag_post + GFS_surface_generic_post + mynnedmf_wrapper + 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 + + + + diff --git a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp_flake.xml b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp_flake.xml new file mode 100644 index 000000000..7eabf2fc1 --- /dev/null +++ b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp_flake.xml @@ -0,0 +1,92 @@ + + + + + + + GFS_time_vary_pre + GFS_rrtmg_setup + GFS_rad_time_vary + GFS_phys_time_vary + + + + + GFS_suite_interstitial_rad_reset + sgscloud_radpre + GFS_rrtmg_pre + rrtmg_sw_pre + rrtmg_sw + rrtmg_sw_post + rrtmg_lw_pre + rrtmg_lw + sgscloud_radpost + 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 + + noahmpdrv + flake_driver + sfc_sice + GFS_surface_loop_control_part2 + + + + GFS_surface_composites_post + sfc_diag + sfc_diag_post + GFS_surface_generic_post + mynnedmf_wrapper + 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 + + + + diff --git a/ccpp/suites/suite_RRFS_parallel.xml b/ccpp/suites/suite_RRFS_parallel.xml new file mode 100644 index 000000000..9f80faf24 --- /dev/null +++ b/ccpp/suites/suite_RRFS_parallel.xml @@ -0,0 +1,90 @@ + + + + + GFS_time_vary_pre + GFS_rrtmg_setup + GFS_rad_time_vary + GFS_phys_time_vary + + + + + GFS_suite_interstitial_rad_reset + sgscloud_radpre + GFS_rrtmg_pre + rrtmg_sw_pre + rrtmg_sw + rrtmg_sw_post + rrtmg_lw_pre + rrtmg_lw + sgscloud_radpost + 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 + + + + mynnsfc_wrapper + GFS_surface_loop_control_part1 + sfc_nst_pre + sfc_nst + sfc_nst_post + lsm_noah + flake_driver + sfc_sice + GFS_surface_loop_control_part2 + + + + GFS_surface_composites_post + sfc_diag + sfc_diag_post + GFS_surface_generic_post + mynnedmf_wrapper + GFS_GWD_generic_pre + + 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 + + GFS_DCNV_generic_post + GFS_SCNV_generic_pre + + GFS_SCNV_generic_post + GFS_suite_interstitial_4 + + GFS_MP_generic_pre + mp_thompson_pre + mp_thompson + mp_thompson_post + GFS_MP_generic_post + maximum_hourly_diagnostics + + + + + GFS_stochastics + + + + + From d40cf76a22ad42b157b23846d66b2b008a15a18e Mon Sep 17 00:00:00 2001 From: "Yihua.Wu" Date: Thu, 8 Apr 2021 12:51:34 +0000 Subject: [PATCH 02/20] Updated flake physics & suites --- .gitmodules | 4 +- ccpp/physics | 2 +- .../suite_FV3_GFS_v15_thompson_mynn_noah.xml | 90 ++++++++++++++++++ ...e_FV3_GFS_v15_thompson_mynn_noah_flake.xml | 91 ++++++++++++++++++ ...suite_FV3_GFS_v15_thompson_mynn_noahmp.xml | 91 ++++++++++++++++++ ...FV3_GFS_v15_thompson_mynn_noahmp_flake.xml | 92 +++++++++++++++++++ ccpp/suites/suite_RRFS_parallel.xml | 90 ++++++++++++++++++ 7 files changed, 457 insertions(+), 3 deletions(-) create mode 100644 ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah.xml create mode 100644 ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah_flake.xml create mode 100644 ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp.xml create mode 100644 ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp_flake.xml create mode 100644 ccpp/suites/suite_RRFS_parallel.xml diff --git a/.gitmodules b/.gitmodules index 1f7526633..a9a5691de 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/YihuaWu-NOAA/ccpp-physics + branch = flake diff --git a/ccpp/physics b/ccpp/physics index e09c3b26c..8f7824920 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit e09c3b26c738c48d635f0d8f96cbafd0b3b1c000 +Subproject commit 8f78249209e6ef321a58764292e4087c5f9a5b23 diff --git a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah.xml b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah.xml new file mode 100644 index 000000000..39caf7bdc --- /dev/null +++ b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah.xml @@ -0,0 +1,90 @@ + + + + + + + GFS_time_vary_pre + GFS_rrtmg_setup + GFS_rad_time_vary + GFS_phys_time_vary + + + + + GFS_suite_interstitial_rad_reset + sgscloud_radpre + GFS_rrtmg_pre + rrtmg_sw_pre + rrtmg_sw + rrtmg_sw_post + rrtmg_lw_pre + rrtmg_lw + sgscloud_radpost + 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 + mynnedmf_wrapper + 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 + + + + diff --git a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah_flake.xml b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah_flake.xml new file mode 100644 index 000000000..c93ec9d69 --- /dev/null +++ b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah_flake.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 + sgscloud_radpre + GFS_rrtmg_pre + rrtmg_sw_pre + rrtmg_sw + rrtmg_sw_post + rrtmg_lw_pre + rrtmg_lw + sgscloud_radpost + 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 + flake_driver + sfc_sice + GFS_surface_loop_control_part2 + + + + GFS_surface_composites_post + sfc_diag + sfc_diag_post + GFS_surface_generic_post + mynnedmf_wrapper + 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 + + + + diff --git a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp.xml b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp.xml new file mode 100644 index 000000000..4fa1d2b09 --- /dev/null +++ b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp.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 + sgscloud_radpre + GFS_rrtmg_pre + rrtmg_sw_pre + rrtmg_sw + rrtmg_sw_post + rrtmg_lw_pre + rrtmg_lw + sgscloud_radpost + 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 + + noahmpdrv + sfc_sice + GFS_surface_loop_control_part2 + + + + GFS_surface_composites_post + sfc_diag + sfc_diag_post + GFS_surface_generic_post + mynnedmf_wrapper + 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 + + + + diff --git a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp_flake.xml b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp_flake.xml new file mode 100644 index 000000000..7eabf2fc1 --- /dev/null +++ b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp_flake.xml @@ -0,0 +1,92 @@ + + + + + + + GFS_time_vary_pre + GFS_rrtmg_setup + GFS_rad_time_vary + GFS_phys_time_vary + + + + + GFS_suite_interstitial_rad_reset + sgscloud_radpre + GFS_rrtmg_pre + rrtmg_sw_pre + rrtmg_sw + rrtmg_sw_post + rrtmg_lw_pre + rrtmg_lw + sgscloud_radpost + 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 + + noahmpdrv + flake_driver + sfc_sice + GFS_surface_loop_control_part2 + + + + GFS_surface_composites_post + sfc_diag + sfc_diag_post + GFS_surface_generic_post + mynnedmf_wrapper + 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 + + + + diff --git a/ccpp/suites/suite_RRFS_parallel.xml b/ccpp/suites/suite_RRFS_parallel.xml new file mode 100644 index 000000000..9f80faf24 --- /dev/null +++ b/ccpp/suites/suite_RRFS_parallel.xml @@ -0,0 +1,90 @@ + + + + + GFS_time_vary_pre + GFS_rrtmg_setup + GFS_rad_time_vary + GFS_phys_time_vary + + + + + GFS_suite_interstitial_rad_reset + sgscloud_radpre + GFS_rrtmg_pre + rrtmg_sw_pre + rrtmg_sw + rrtmg_sw_post + rrtmg_lw_pre + rrtmg_lw + sgscloud_radpost + 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 + + + + mynnsfc_wrapper + GFS_surface_loop_control_part1 + sfc_nst_pre + sfc_nst + sfc_nst_post + lsm_noah + flake_driver + sfc_sice + GFS_surface_loop_control_part2 + + + + GFS_surface_composites_post + sfc_diag + sfc_diag_post + GFS_surface_generic_post + mynnedmf_wrapper + GFS_GWD_generic_pre + + 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 + + GFS_DCNV_generic_post + GFS_SCNV_generic_pre + + GFS_SCNV_generic_post + GFS_suite_interstitial_4 + + GFS_MP_generic_pre + mp_thompson_pre + mp_thompson + mp_thompson_post + GFS_MP_generic_post + maximum_hourly_diagnostics + + + + + GFS_stochastics + + + + + From 96ad75e39b862999a378e20b8c7c174e1be94d75 Mon Sep 17 00:00:00 2001 From: "Yihua.Wu" Date: Mon, 12 Apr 2021 18:53:15 +0000 Subject: [PATCH 03/20] Updating to head of upstream --- atmos_cubed_sphere | 2 +- ccpp/physics | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 6944f421b..03a7ae7dc 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 6944f421bba37887394ef9552d8b88869f82dd49 +Subproject commit 03a7ae7dc0b93ca9eec0f9e133bfceccf004b083 diff --git a/ccpp/physics b/ccpp/physics index 334e2451b..7adb61fc7 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 334e2451b2bc74c873a9e6c6d36751d60feff959 +Subproject commit 7adb61fc72a186badad3b296fbc994c034f5564d From 02b897c7d6f99997b94b443689da48c9a03f525e Mon Sep 17 00:00:00 2001 From: "Yihua.Wu" Date: Mon, 12 Apr 2021 18:58:53 +0000 Subject: [PATCH 04/20] Updated flake physics and suites --- .gitmodules | 4 +- ccpp/physics | 2 +- .../suite_FV3_GFS_v15_thompson_mynn_noah.xml | 90 ++++++++++++++++++ ...e_FV3_GFS_v15_thompson_mynn_noah_flake.xml | 91 ++++++++++++++++++ ...suite_FV3_GFS_v15_thompson_mynn_noahmp.xml | 91 ++++++++++++++++++ ...FV3_GFS_v15_thompson_mynn_noahmp_flake.xml | 92 +++++++++++++++++++ ccpp/suites/suite_RRFS_parallel.xml | 90 ++++++++++++++++++ 7 files changed, 457 insertions(+), 3 deletions(-) create mode 100644 ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah.xml create mode 100644 ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah_flake.xml create mode 100644 ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp.xml create mode 100644 ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp_flake.xml create mode 100644 ccpp/suites/suite_RRFS_parallel.xml diff --git a/.gitmodules b/.gitmodules index 1f7526633..a9a5691de 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/YihuaWu-NOAA/ccpp-physics + branch = flake diff --git a/ccpp/physics b/ccpp/physics index e09c3b26c..7adb61fc7 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit e09c3b26c738c48d635f0d8f96cbafd0b3b1c000 +Subproject commit 7adb61fc72a186badad3b296fbc994c034f5564d diff --git a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah.xml b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah.xml new file mode 100644 index 000000000..39caf7bdc --- /dev/null +++ b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah.xml @@ -0,0 +1,90 @@ + + + + + + + GFS_time_vary_pre + GFS_rrtmg_setup + GFS_rad_time_vary + GFS_phys_time_vary + + + + + GFS_suite_interstitial_rad_reset + sgscloud_radpre + GFS_rrtmg_pre + rrtmg_sw_pre + rrtmg_sw + rrtmg_sw_post + rrtmg_lw_pre + rrtmg_lw + sgscloud_radpost + 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 + mynnedmf_wrapper + 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 + + + + diff --git a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah_flake.xml b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah_flake.xml new file mode 100644 index 000000000..c93ec9d69 --- /dev/null +++ b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah_flake.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 + sgscloud_radpre + GFS_rrtmg_pre + rrtmg_sw_pre + rrtmg_sw + rrtmg_sw_post + rrtmg_lw_pre + rrtmg_lw + sgscloud_radpost + 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 + flake_driver + sfc_sice + GFS_surface_loop_control_part2 + + + + GFS_surface_composites_post + sfc_diag + sfc_diag_post + GFS_surface_generic_post + mynnedmf_wrapper + 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 + + + + diff --git a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp.xml b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp.xml new file mode 100644 index 000000000..4fa1d2b09 --- /dev/null +++ b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp.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 + sgscloud_radpre + GFS_rrtmg_pre + rrtmg_sw_pre + rrtmg_sw + rrtmg_sw_post + rrtmg_lw_pre + rrtmg_lw + sgscloud_radpost + 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 + + noahmpdrv + sfc_sice + GFS_surface_loop_control_part2 + + + + GFS_surface_composites_post + sfc_diag + sfc_diag_post + GFS_surface_generic_post + mynnedmf_wrapper + 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 + + + + diff --git a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp_flake.xml b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp_flake.xml new file mode 100644 index 000000000..7eabf2fc1 --- /dev/null +++ b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp_flake.xml @@ -0,0 +1,92 @@ + + + + + + + GFS_time_vary_pre + GFS_rrtmg_setup + GFS_rad_time_vary + GFS_phys_time_vary + + + + + GFS_suite_interstitial_rad_reset + sgscloud_radpre + GFS_rrtmg_pre + rrtmg_sw_pre + rrtmg_sw + rrtmg_sw_post + rrtmg_lw_pre + rrtmg_lw + sgscloud_radpost + 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 + + noahmpdrv + flake_driver + sfc_sice + GFS_surface_loop_control_part2 + + + + GFS_surface_composites_post + sfc_diag + sfc_diag_post + GFS_surface_generic_post + mynnedmf_wrapper + 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 + + + + diff --git a/ccpp/suites/suite_RRFS_parallel.xml b/ccpp/suites/suite_RRFS_parallel.xml new file mode 100644 index 000000000..9f80faf24 --- /dev/null +++ b/ccpp/suites/suite_RRFS_parallel.xml @@ -0,0 +1,90 @@ + + + + + GFS_time_vary_pre + GFS_rrtmg_setup + GFS_rad_time_vary + GFS_phys_time_vary + + + + + GFS_suite_interstitial_rad_reset + sgscloud_radpre + GFS_rrtmg_pre + rrtmg_sw_pre + rrtmg_sw + rrtmg_sw_post + rrtmg_lw_pre + rrtmg_lw + sgscloud_radpost + 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 + + + + mynnsfc_wrapper + GFS_surface_loop_control_part1 + sfc_nst_pre + sfc_nst + sfc_nst_post + lsm_noah + flake_driver + sfc_sice + GFS_surface_loop_control_part2 + + + + GFS_surface_composites_post + sfc_diag + sfc_diag_post + GFS_surface_generic_post + mynnedmf_wrapper + GFS_GWD_generic_pre + + 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 + + GFS_DCNV_generic_post + GFS_SCNV_generic_pre + + GFS_SCNV_generic_post + GFS_suite_interstitial_4 + + GFS_MP_generic_pre + mp_thompson_pre + mp_thompson + mp_thompson_post + GFS_MP_generic_post + maximum_hourly_diagnostics + + + + + GFS_stochastics + + + + + From 726b0aac8295a4bee412f3391c258438cb8ecc69 Mon Sep 17 00:00:00 2001 From: "Yihua.Wu" Date: Mon, 12 Apr 2021 21:35:51 +0000 Subject: [PATCH 05/20] Updated flake physics and suites --- .gitmodules | 4 +- ccpp/physics | 2 +- .../suite_FV3_GFS_v15_thompson_mynn_noah.xml | 90 ++++++++++++++++++ ...e_FV3_GFS_v15_thompson_mynn_noah_flake.xml | 91 ++++++++++++++++++ ...suite_FV3_GFS_v15_thompson_mynn_noahmp.xml | 91 ++++++++++++++++++ ...FV3_GFS_v15_thompson_mynn_noahmp_flake.xml | 92 +++++++++++++++++++ ccpp/suites/suite_RRFS_parallel.xml | 90 ++++++++++++++++++ 7 files changed, 457 insertions(+), 3 deletions(-) create mode 100644 ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah.xml create mode 100644 ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah_flake.xml create mode 100644 ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp.xml create mode 100644 ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp_flake.xml create mode 100644 ccpp/suites/suite_RRFS_parallel.xml diff --git a/.gitmodules b/.gitmodules index 1f7526633..a9a5691de 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/YihuaWu-NOAA/ccpp-physics + branch = flake diff --git a/ccpp/physics b/ccpp/physics index 990b9d041..7adb61fc7 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 990b9d0416e340e40e4b136561a85f63d46671e2 +Subproject commit 7adb61fc72a186badad3b296fbc994c034f5564d diff --git a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah.xml b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah.xml new file mode 100644 index 000000000..39caf7bdc --- /dev/null +++ b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah.xml @@ -0,0 +1,90 @@ + + + + + + + GFS_time_vary_pre + GFS_rrtmg_setup + GFS_rad_time_vary + GFS_phys_time_vary + + + + + GFS_suite_interstitial_rad_reset + sgscloud_radpre + GFS_rrtmg_pre + rrtmg_sw_pre + rrtmg_sw + rrtmg_sw_post + rrtmg_lw_pre + rrtmg_lw + sgscloud_radpost + 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 + mynnedmf_wrapper + 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 + + + + diff --git a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah_flake.xml b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah_flake.xml new file mode 100644 index 000000000..c93ec9d69 --- /dev/null +++ b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah_flake.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 + sgscloud_radpre + GFS_rrtmg_pre + rrtmg_sw_pre + rrtmg_sw + rrtmg_sw_post + rrtmg_lw_pre + rrtmg_lw + sgscloud_radpost + 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 + flake_driver + sfc_sice + GFS_surface_loop_control_part2 + + + + GFS_surface_composites_post + sfc_diag + sfc_diag_post + GFS_surface_generic_post + mynnedmf_wrapper + 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 + + + + diff --git a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp.xml b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp.xml new file mode 100644 index 000000000..4fa1d2b09 --- /dev/null +++ b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp.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 + sgscloud_radpre + GFS_rrtmg_pre + rrtmg_sw_pre + rrtmg_sw + rrtmg_sw_post + rrtmg_lw_pre + rrtmg_lw + sgscloud_radpost + 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 + + noahmpdrv + sfc_sice + GFS_surface_loop_control_part2 + + + + GFS_surface_composites_post + sfc_diag + sfc_diag_post + GFS_surface_generic_post + mynnedmf_wrapper + 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 + + + + diff --git a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp_flake.xml b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp_flake.xml new file mode 100644 index 000000000..7eabf2fc1 --- /dev/null +++ b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp_flake.xml @@ -0,0 +1,92 @@ + + + + + + + GFS_time_vary_pre + GFS_rrtmg_setup + GFS_rad_time_vary + GFS_phys_time_vary + + + + + GFS_suite_interstitial_rad_reset + sgscloud_radpre + GFS_rrtmg_pre + rrtmg_sw_pre + rrtmg_sw + rrtmg_sw_post + rrtmg_lw_pre + rrtmg_lw + sgscloud_radpost + 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 + + noahmpdrv + flake_driver + sfc_sice + GFS_surface_loop_control_part2 + + + + GFS_surface_composites_post + sfc_diag + sfc_diag_post + GFS_surface_generic_post + mynnedmf_wrapper + 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 + + + + diff --git a/ccpp/suites/suite_RRFS_parallel.xml b/ccpp/suites/suite_RRFS_parallel.xml new file mode 100644 index 000000000..9f80faf24 --- /dev/null +++ b/ccpp/suites/suite_RRFS_parallel.xml @@ -0,0 +1,90 @@ + + + + + GFS_time_vary_pre + GFS_rrtmg_setup + GFS_rad_time_vary + GFS_phys_time_vary + + + + + GFS_suite_interstitial_rad_reset + sgscloud_radpre + GFS_rrtmg_pre + rrtmg_sw_pre + rrtmg_sw + rrtmg_sw_post + rrtmg_lw_pre + rrtmg_lw + sgscloud_radpost + 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 + + + + mynnsfc_wrapper + GFS_surface_loop_control_part1 + sfc_nst_pre + sfc_nst + sfc_nst_post + lsm_noah + flake_driver + sfc_sice + GFS_surface_loop_control_part2 + + + + GFS_surface_composites_post + sfc_diag + sfc_diag_post + GFS_surface_generic_post + mynnedmf_wrapper + GFS_GWD_generic_pre + + 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 + + GFS_DCNV_generic_post + GFS_SCNV_generic_pre + + GFS_SCNV_generic_post + GFS_suite_interstitial_4 + + GFS_MP_generic_pre + mp_thompson_pre + mp_thompson + mp_thompson_post + GFS_MP_generic_post + maximum_hourly_diagnostics + + + + + GFS_stochastics + + + + + From b3ecccbf449ba83dd75ca77ec3a8b44661f8beb0 Mon Sep 17 00:00:00 2001 From: "Yihua.Wu" Date: Mon, 12 Apr 2021 21:45:02 +0000 Subject: [PATCH 06/20] Pointed to the latest atmos_cubed_sphere --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 03a7ae7dc..6944f421b 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 03a7ae7dc0b93ca9eec0f9e133bfceccf004b083 +Subproject commit 6944f421bba37887394ef9552d8b88869f82dd49 From 6de90169662d7892e626b33b044c0a4ec58763cd Mon Sep 17 00:00:00 2001 From: "Yihua.Wu" Date: Tue, 13 Apr 2021 01:58:10 +0000 Subject: [PATCH 07/20] Fixed errors created during merging processes --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 7adb61fc7..e1f64173b 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 7adb61fc72a186badad3b296fbc994c034f5564d +Subproject commit e1f64173ba60c0b2fb8cdad995d3505889dd2f39 From 9db3db3a8781c2b5630758d6892d83c5e4d97e1b Mon Sep 17 00:00:00 2001 From: "Yihua.Wu" Date: Tue, 13 Apr 2021 02:07:29 +0000 Subject: [PATCH 08/20] Fixed some code errors created during merging processes --- ccpp/physics | 2 +- .../suite_FV3_GFS_v15_thompson_mynn_noah.xml | 90 ++++++++++++++++++ ...e_FV3_GFS_v15_thompson_mynn_noah_flake.xml | 91 ++++++++++++++++++ ...suite_FV3_GFS_v15_thompson_mynn_noahmp.xml | 91 ++++++++++++++++++ ...FV3_GFS_v15_thompson_mynn_noahmp_flake.xml | 92 +++++++++++++++++++ ccpp/suites/suite_RRFS_parallel.xml | 90 ++++++++++++++++++ 6 files changed, 455 insertions(+), 1 deletion(-) create mode 100644 ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah.xml create mode 100644 ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah_flake.xml create mode 100644 ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp.xml create mode 100644 ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp_flake.xml create mode 100644 ccpp/suites/suite_RRFS_parallel.xml diff --git a/ccpp/physics b/ccpp/physics index 990b9d041..dfeb51c6e 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 990b9d0416e340e40e4b136561a85f63d46671e2 +Subproject commit dfeb51c6e2e109f740037dc2228b43c031d584b8 diff --git a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah.xml b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah.xml new file mode 100644 index 000000000..39caf7bdc --- /dev/null +++ b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah.xml @@ -0,0 +1,90 @@ + + + + + + + GFS_time_vary_pre + GFS_rrtmg_setup + GFS_rad_time_vary + GFS_phys_time_vary + + + + + GFS_suite_interstitial_rad_reset + sgscloud_radpre + GFS_rrtmg_pre + rrtmg_sw_pre + rrtmg_sw + rrtmg_sw_post + rrtmg_lw_pre + rrtmg_lw + sgscloud_radpost + 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 + mynnedmf_wrapper + 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 + + + + diff --git a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah_flake.xml b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah_flake.xml new file mode 100644 index 000000000..c93ec9d69 --- /dev/null +++ b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah_flake.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 + sgscloud_radpre + GFS_rrtmg_pre + rrtmg_sw_pre + rrtmg_sw + rrtmg_sw_post + rrtmg_lw_pre + rrtmg_lw + sgscloud_radpost + 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 + flake_driver + sfc_sice + GFS_surface_loop_control_part2 + + + + GFS_surface_composites_post + sfc_diag + sfc_diag_post + GFS_surface_generic_post + mynnedmf_wrapper + 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 + + + + diff --git a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp.xml b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp.xml new file mode 100644 index 000000000..4fa1d2b09 --- /dev/null +++ b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp.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 + sgscloud_radpre + GFS_rrtmg_pre + rrtmg_sw_pre + rrtmg_sw + rrtmg_sw_post + rrtmg_lw_pre + rrtmg_lw + sgscloud_radpost + 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 + + noahmpdrv + sfc_sice + GFS_surface_loop_control_part2 + + + + GFS_surface_composites_post + sfc_diag + sfc_diag_post + GFS_surface_generic_post + mynnedmf_wrapper + 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 + + + + diff --git a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp_flake.xml b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp_flake.xml new file mode 100644 index 000000000..7eabf2fc1 --- /dev/null +++ b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp_flake.xml @@ -0,0 +1,92 @@ + + + + + + + GFS_time_vary_pre + GFS_rrtmg_setup + GFS_rad_time_vary + GFS_phys_time_vary + + + + + GFS_suite_interstitial_rad_reset + sgscloud_radpre + GFS_rrtmg_pre + rrtmg_sw_pre + rrtmg_sw + rrtmg_sw_post + rrtmg_lw_pre + rrtmg_lw + sgscloud_radpost + 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 + + noahmpdrv + flake_driver + sfc_sice + GFS_surface_loop_control_part2 + + + + GFS_surface_composites_post + sfc_diag + sfc_diag_post + GFS_surface_generic_post + mynnedmf_wrapper + 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 + + + + diff --git a/ccpp/suites/suite_RRFS_parallel.xml b/ccpp/suites/suite_RRFS_parallel.xml new file mode 100644 index 000000000..9f80faf24 --- /dev/null +++ b/ccpp/suites/suite_RRFS_parallel.xml @@ -0,0 +1,90 @@ + + + + + GFS_time_vary_pre + GFS_rrtmg_setup + GFS_rad_time_vary + GFS_phys_time_vary + + + + + GFS_suite_interstitial_rad_reset + sgscloud_radpre + GFS_rrtmg_pre + rrtmg_sw_pre + rrtmg_sw + rrtmg_sw_post + rrtmg_lw_pre + rrtmg_lw + sgscloud_radpost + 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 + + + + mynnsfc_wrapper + GFS_surface_loop_control_part1 + sfc_nst_pre + sfc_nst + sfc_nst_post + lsm_noah + flake_driver + sfc_sice + GFS_surface_loop_control_part2 + + + + GFS_surface_composites_post + sfc_diag + sfc_diag_post + GFS_surface_generic_post + mynnedmf_wrapper + GFS_GWD_generic_pre + + 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 + + GFS_DCNV_generic_post + GFS_SCNV_generic_pre + + GFS_SCNV_generic_post + GFS_suite_interstitial_4 + + GFS_MP_generic_pre + mp_thompson_pre + mp_thompson + mp_thompson_post + GFS_MP_generic_post + maximum_hourly_diagnostics + + + + + GFS_stochastics + + + + + From 9eca18e12e3480d700581273442448362346f4b8 Mon Sep 17 00:00:00 2001 From: "Yihua.Wu" Date: Tue, 13 Apr 2021 13:53:09 +0000 Subject: [PATCH 09/20] Removed some suites --- .../suite_FV3_GFS_v15_thompson_mynn_noah.xml | 90 ------------------ ...e_FV3_GFS_v15_thompson_mynn_noah_flake.xml | 91 ------------------ ...suite_FV3_GFS_v15_thompson_mynn_noahmp.xml | 91 ------------------ ...FV3_GFS_v15_thompson_mynn_noahmp_flake.xml | 92 ------------------- ccpp/suites/suite_RRFS_parallel.xml | 90 ------------------ 5 files changed, 454 deletions(-) delete mode 100644 ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah.xml delete mode 100644 ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah_flake.xml delete mode 100644 ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp.xml delete mode 100644 ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp_flake.xml delete mode 100644 ccpp/suites/suite_RRFS_parallel.xml diff --git a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah.xml b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah.xml deleted file mode 100644 index 39caf7bdc..000000000 --- a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - GFS_time_vary_pre - GFS_rrtmg_setup - GFS_rad_time_vary - GFS_phys_time_vary - - - - - GFS_suite_interstitial_rad_reset - sgscloud_radpre - GFS_rrtmg_pre - rrtmg_sw_pre - rrtmg_sw - rrtmg_sw_post - rrtmg_lw_pre - rrtmg_lw - sgscloud_radpost - 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 - mynnedmf_wrapper - 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 - - - - diff --git a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah_flake.xml b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah_flake.xml deleted file mode 100644 index c93ec9d69..000000000 --- a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noah_flake.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 - sgscloud_radpre - GFS_rrtmg_pre - rrtmg_sw_pre - rrtmg_sw - rrtmg_sw_post - rrtmg_lw_pre - rrtmg_lw - sgscloud_radpost - 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 - flake_driver - sfc_sice - GFS_surface_loop_control_part2 - - - - GFS_surface_composites_post - sfc_diag - sfc_diag_post - GFS_surface_generic_post - mynnedmf_wrapper - 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 - - - - diff --git a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp.xml b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp.xml deleted file mode 100644 index 4fa1d2b09..000000000 --- a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp.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 - sgscloud_radpre - GFS_rrtmg_pre - rrtmg_sw_pre - rrtmg_sw - rrtmg_sw_post - rrtmg_lw_pre - rrtmg_lw - sgscloud_radpost - 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 - - noahmpdrv - sfc_sice - GFS_surface_loop_control_part2 - - - - GFS_surface_composites_post - sfc_diag - sfc_diag_post - GFS_surface_generic_post - mynnedmf_wrapper - 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 - - - - diff --git a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp_flake.xml b/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp_flake.xml deleted file mode 100644 index 7eabf2fc1..000000000 --- a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_noahmp_flake.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - GFS_time_vary_pre - GFS_rrtmg_setup - GFS_rad_time_vary - GFS_phys_time_vary - - - - - GFS_suite_interstitial_rad_reset - sgscloud_radpre - GFS_rrtmg_pre - rrtmg_sw_pre - rrtmg_sw - rrtmg_sw_post - rrtmg_lw_pre - rrtmg_lw - sgscloud_radpost - 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 - - noahmpdrv - flake_driver - sfc_sice - GFS_surface_loop_control_part2 - - - - GFS_surface_composites_post - sfc_diag - sfc_diag_post - GFS_surface_generic_post - mynnedmf_wrapper - 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 - - - - diff --git a/ccpp/suites/suite_RRFS_parallel.xml b/ccpp/suites/suite_RRFS_parallel.xml deleted file mode 100644 index 9f80faf24..000000000 --- a/ccpp/suites/suite_RRFS_parallel.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - GFS_time_vary_pre - GFS_rrtmg_setup - GFS_rad_time_vary - GFS_phys_time_vary - - - - - GFS_suite_interstitial_rad_reset - sgscloud_radpre - GFS_rrtmg_pre - rrtmg_sw_pre - rrtmg_sw - rrtmg_sw_post - rrtmg_lw_pre - rrtmg_lw - sgscloud_radpost - 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 - - - - mynnsfc_wrapper - GFS_surface_loop_control_part1 - sfc_nst_pre - sfc_nst - sfc_nst_post - lsm_noah - flake_driver - sfc_sice - GFS_surface_loop_control_part2 - - - - GFS_surface_composites_post - sfc_diag - sfc_diag_post - GFS_surface_generic_post - mynnedmf_wrapper - GFS_GWD_generic_pre - - 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 - - GFS_DCNV_generic_post - GFS_SCNV_generic_pre - - GFS_SCNV_generic_post - GFS_suite_interstitial_4 - - GFS_MP_generic_pre - mp_thompson_pre - mp_thompson - mp_thompson_post - GFS_MP_generic_post - maximum_hourly_diagnostics - - - - - GFS_stochastics - - - - - From 085cb7dc1f48bb17eaa2e4b7c49508ef208a6128 Mon Sep 17 00:00:00 2001 From: "Yihua.Wu" Date: Tue, 13 Apr 2021 17:41:40 +0000 Subject: [PATCH 10/20] Corrected and merge error --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index dfeb51c6e..2742ecefb 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit dfeb51c6e2e109f740037dc2228b43c031d584b8 +Subproject commit 2742ecefb26c11e1bb75784a1dbd39128648a4b6 From 57db44fb841e613dce3436e98d941dab1ba39078 Mon Sep 17 00:00:00 2001 From: "Yihua.Wu" Date: Tue, 13 Apr 2021 18:10:31 +0000 Subject: [PATCH 11/20] Fixed some issues --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 2742ecefb..5411d4dd0 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 2742ecefb26c11e1bb75784a1dbd39128648a4b6 +Subproject commit 5411d4dd0a22feeec6c71221099889c9b363bb3e From f59edf488379cfdfbbd9a2004125d8bb38d53914 Mon Sep 17 00:00:00 2001 From: "Yihua.Wu" Date: Wed, 14 Apr 2021 16:54:34 +0000 Subject: [PATCH 12/20] Recode the polynomial equation and redefined lake as use_flake --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 5411d4dd0..bc75cd5b7 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 5411d4dd0a22feeec6c71221099889c9b363bb3e +Subproject commit bc75cd5b785c95566f6334c49683b75c10ef2872 From 7d00b827ef7c8fa7b55b0c09125995c62c61f8e4 Mon Sep 17 00:00:00 2001 From: "Yihua.Wu" Date: Thu, 15 Apr 2021 20:40:41 +0000 Subject: [PATCH 13/20] Fixed the orders of three parameters in sfc_nst.meta --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index bc75cd5b7..3163fbc3a 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit bc75cd5b785c95566f6334c49683b75c10ef2872 +Subproject commit 3163fbc3a12bd2dc4fda83d7931fbbc81b7a1ccd From 9fc9f6ee33fec75e7191b67723ee5891b08ca647 Mon Sep 17 00:00:00 2001 From: "Yihua.Wu" Date: Thu, 15 Apr 2021 20:58:09 +0000 Subject: [PATCH 14/20] Updated flake physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 3163fbc3a..59ab0cd94 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 3163fbc3a12bd2dc4fda83d7931fbbc81b7a1ccd +Subproject commit 59ab0cd940090f68091974840868ae2024d1c7d0 From 4ca5cd5ac0404ee32259e083ea7130828856d2bf Mon Sep 17 00:00:00 2001 From: "Yihua.Wu" Date: Thu, 15 Apr 2021 21:31:13 +0000 Subject: [PATCH 15/20] Updated flake physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 59ab0cd94..26aa3d62b 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 59ab0cd940090f68091974840868ae2024d1c7d0 +Subproject commit 26aa3d62ba981553a9c8d86afadfa716ad16a960 From 961e581cce621e1eec9b80972f226f97136938a1 Mon Sep 17 00:00:00 2001 From: "Yihua.Wu" Date: Fri, 16 Apr 2021 17:20:37 +0000 Subject: [PATCH 16/20] Updated flake --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 26aa3d62b..59ab0cd94 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 26aa3d62ba981553a9c8d86afadfa716ad16a960 +Subproject commit 59ab0cd940090f68091974840868ae2024d1c7d0 From 1af7dcd96ef7d62b6b15e0af474dcaf66c2e8173 Mon Sep 17 00:00:00 2001 From: "Yihua.Wu" Date: Fri, 16 Apr 2021 17:30:38 +0000 Subject: [PATCH 17/20] Updated flake ccpp-physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 3163fbc3a..59ab0cd94 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 3163fbc3a12bd2dc4fda83d7931fbbc81b7a1ccd +Subproject commit 59ab0cd940090f68091974840868ae2024d1c7d0 From c77fe0284d71e2309b74a33241d8ea217efd270f Mon Sep 17 00:00:00 2001 From: "Yihua.Wu" Date: Fri, 16 Apr 2021 17:55:26 +0000 Subject: [PATCH 18/20] Updated flake physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 59ab0cd94..b65792323 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 59ab0cd940090f68091974840868ae2024d1c7d0 +Subproject commit b65792323855b4a93308a595145e19b07049135f From 76cf7e1149e8bda4c9c4ff478bc6a44eff4a5913 Mon Sep 17 00:00:00 2001 From: "Yihua.Wu" Date: Fri, 16 Apr 2021 19:27:46 +0000 Subject: [PATCH 19/20] Reverted some lines in the sfc_nst.f --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 59ab0cd94..2d3b3c481 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 59ab0cd940090f68091974840868ae2024d1c7d0 +Subproject commit 2d3b3c4816e7132bf6cd3ebdff72473341b99aca From 55f4fef822478b75e7035f1fb7d4e8fddbeb2c92 Mon Sep 17 00:00:00 2001 From: "Yihua.Wu" Date: Fri, 16 Apr 2021 19:31:37 +0000 Subject: [PATCH 20/20] Reverted some lines in sfc_nst.f --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 59ab0cd94..2d3b3c481 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 59ab0cd940090f68091974840868ae2024d1c7d0 +Subproject commit 2d3b3c4816e7132bf6cd3ebdff72473341b99aca