From 2e846cca23de430a0080945ed189ec0ec79806ef Mon Sep 17 00:00:00 2001 From: "Linlin.Pan" Date: Fri, 17 Apr 2020 18:16:15 +0000 Subject: [PATCH 1/6] adding a new suite using NOAH LSM without convection for SR release. The suite is tested in regional workflow. --- ccpp/suites/suite_FV3_GSD_SAR_v1.xml | 81 ++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 ccpp/suites/suite_FV3_GSD_SAR_v1.xml diff --git a/ccpp/suites/suite_FV3_GSD_SAR_v1.xml b/ccpp/suites/suite_FV3_GSD_SAR_v1.xml new file mode 100644 index 000000000..6cf4bc38e --- /dev/null +++ b/ccpp/suites/suite_FV3_GSD_SAR_v1.xml @@ -0,0 +1,81 @@ + + + + + + + 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 + mynnrad_pre + rrtmg_sw + rrtmg_sw_post + rrtmg_lw_pre + rrtmg_lw + mynnrad_post + 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 + dcyc2t3_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 + GFS_MP_generic_pre + mp_thompson_pre + mp_thompson + mp_thompson_post + GFS_MP_generic_post + maximum_hourly_diagnostics + + + + + GFS_stochastics + + + + From 2ae39b2cd5e7accf916ee1088e0f8ad60107544e Mon Sep 17 00:00:00 2001 From: "Linlin.Pan" Date: Tue, 19 May 2020 07:36:54 +0000 Subject: [PATCH 2/6] adding new suite RRFS_v0 for SRWeather release new file: ccpp/suites/suite_FV3_RRFS_v0.xml modified: gfsphysics/GFS_layer/GFS_typedefs.F90 tested on hera --- ccpp/suites/suite_FV3_RRFS_v0.xml | 80 +++++++++++++++++++++++++++ gfsphysics/GFS_layer/GFS_typedefs.F90 | 2 +- 2 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 ccpp/suites/suite_FV3_RRFS_v0.xml diff --git a/ccpp/suites/suite_FV3_RRFS_v0.xml b/ccpp/suites/suite_FV3_RRFS_v0.xml new file mode 100644 index 000000000..992e68fc0 --- /dev/null +++ b/ccpp/suites/suite_FV3_RRFS_v0.xml @@ -0,0 +1,80 @@ + + + + + + + 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 + mynnrad_pre + rrtmg_sw + rrtmg_sw_post + rrtmg_lw_pre + rrtmg_lw + mynnrad_post + 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 + GFS_MP_generic_pre + mp_thompson_pre + mp_thompson + mp_thompson_post + GFS_MP_generic_post + maximum_hourly_diagnostics + + + + + GFS_stochastics + + + + diff --git a/gfsphysics/GFS_layer/GFS_typedefs.F90 b/gfsphysics/GFS_layer/GFS_typedefs.F90 index 74598d522..bdc605d59 100644 --- a/gfsphysics/GFS_layer/GFS_typedefs.F90 +++ b/gfsphysics/GFS_layer/GFS_typedefs.F90 @@ -4123,7 +4123,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & endif if (Model%lsm == Model%lsm_noahmp .and. Model%iopt_snf == 4) then - if (Model%imp_physics /= Model%imp_physics_gfdl) stop 'iopt_snf == 4 must use GFDL MP' +! if (Model%imp_physics /= Model%imp_physics_gfdl) stop 'iopt_snf == 4 must use GFDL MP' endif print *,' nst_anl=',Model%nst_anl,' use_ufo=',Model%use_ufo,' frac_grid=',Model%frac_grid,& From 677548f4506bfd6a81912d9b9cd10e9eacacb887 Mon Sep 17 00:00:00 2001 From: "Linlin.Pan" Date: Mon, 1 Jun 2020 18:00:06 +0000 Subject: [PATCH 3/6] Updated suite_FV3_RRFS_v0.xml with noah lsm as a comment line Remove suite_FV3_GSD_SAR_v1.xml --- ccpp/suites/suite_FV3_GSD_SAR_v1.xml | 81 ---------------------------- ccpp/suites/suite_FV3_RRFS_v0.xml | 1 + 2 files changed, 1 insertion(+), 81 deletions(-) delete mode 100644 ccpp/suites/suite_FV3_GSD_SAR_v1.xml diff --git a/ccpp/suites/suite_FV3_GSD_SAR_v1.xml b/ccpp/suites/suite_FV3_GSD_SAR_v1.xml deleted file mode 100644 index 6cf4bc38e..000000000 --- a/ccpp/suites/suite_FV3_GSD_SAR_v1.xml +++ /dev/null @@ -1,81 +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 - mynnrad_pre - rrtmg_sw - rrtmg_sw_post - rrtmg_lw_pre - rrtmg_lw - mynnrad_post - 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 - dcyc2t3_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 - 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_RRFS_v0.xml b/ccpp/suites/suite_FV3_RRFS_v0.xml index 992e68fc0..e4d774dda 100644 --- a/ccpp/suites/suite_FV3_RRFS_v0.xml +++ b/ccpp/suites/suite_FV3_RRFS_v0.xml @@ -45,6 +45,7 @@ sfc_nst sfc_nst_post noahmpdrv + sfc_sice GFS_surface_loop_control_part2 From 5aafb43ef1fe554d4cb522f0cd11e48bbf50c2c9 Mon Sep 17 00:00:00 2001 From: "Linlin.Pan" Date: Mon, 1 Jun 2020 18:06:21 +0000 Subject: [PATCH 4/6] updated GFS_typedefs.F90 by comment out the empty if block --- gfsphysics/GFS_layer/GFS_typedefs.F90 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gfsphysics/GFS_layer/GFS_typedefs.F90 b/gfsphysics/GFS_layer/GFS_typedefs.F90 index bdc605d59..6ddc74fa2 100644 --- a/gfsphysics/GFS_layer/GFS_typedefs.F90 +++ b/gfsphysics/GFS_layer/GFS_typedefs.F90 @@ -4122,9 +4122,9 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & stop endif - if (Model%lsm == Model%lsm_noahmp .and. Model%iopt_snf == 4) then +! if (Model%lsm == Model%lsm_noahmp .and. Model%iopt_snf == 4) then ! if (Model%imp_physics /= Model%imp_physics_gfdl) stop 'iopt_snf == 4 must use GFDL MP' - endif +! endif print *,' nst_anl=',Model%nst_anl,' use_ufo=',Model%use_ufo,' frac_grid=',Model%frac_grid,& ' frac_grid_off=',frac_grid_off,' ignore_lake=',ignore_lake From 0988067a1e2c5cbdf4b05412a9b4b48308874b3f Mon Sep 17 00:00:00 2001 From: "Linlin.Pan" Date: Mon, 1 Jun 2020 21:37:37 +0000 Subject: [PATCH 5/6] keep suite_FV3_GSD_SAR_v1.xml for regional workflow --- ccpp/suites/suite_FV3_GSD_SAR_v1.xml | 81 ++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 ccpp/suites/suite_FV3_GSD_SAR_v1.xml diff --git a/ccpp/suites/suite_FV3_GSD_SAR_v1.xml b/ccpp/suites/suite_FV3_GSD_SAR_v1.xml new file mode 100644 index 000000000..6cf4bc38e --- /dev/null +++ b/ccpp/suites/suite_FV3_GSD_SAR_v1.xml @@ -0,0 +1,81 @@ + + + + + + + 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 + mynnrad_pre + rrtmg_sw + rrtmg_sw_post + rrtmg_lw_pre + rrtmg_lw + mynnrad_post + 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 + dcyc2t3_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 + GFS_MP_generic_pre + mp_thompson_pre + mp_thompson + mp_thompson_post + GFS_MP_generic_post + maximum_hourly_diagnostics + + + + + GFS_stochastics + + + + From 9057ea0e70dca9ee63698a57639a86b6cb73378e Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Sat, 6 Jun 2020 16:07:17 -0600 Subject: [PATCH 6/6] ccpp/suites/suite_FV3_GSD_SAR_v1.xml: bugfix, remove non-existent scheme dcyc2t3_post --- ccpp/suites/suite_FV3_GSD_SAR_v1.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/ccpp/suites/suite_FV3_GSD_SAR_v1.xml b/ccpp/suites/suite_FV3_GSD_SAR_v1.xml index 6cf4bc38e..d7afe473f 100644 --- a/ccpp/suites/suite_FV3_GSD_SAR_v1.xml +++ b/ccpp/suites/suite_FV3_GSD_SAR_v1.xml @@ -51,7 +51,6 @@ GFS_surface_composites_post - dcyc2t3_post sfc_diag sfc_diag_post GFS_surface_generic_post