From 59ef0ab4df372462064d077dcaf4fd83a1f60d71 Mon Sep 17 00:00:00 2001 From: "Jun.Wang" Date: Mon, 7 Jun 2021 02:52:35 +0000 Subject: [PATCH 1/4] set up release/P7b branch --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index afe6f27dd..d1f01df65 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,4 +9,4 @@ [submodule "ccpp/physics"] path = ccpp/physics url = https://github.com/NCAR/ccpp-physics - branch = main + branch = release/P7b From b65461ebabc7da13d06acdd9ab1dfccbbfbda915 Mon Sep 17 00:00:00 2001 From: Jun Wang <37633869+junwang-noaa@users.noreply.github.com> Date: Tue, 8 Jun 2021 21:09:20 -0400 Subject: [PATCH 2/4] release/P7b: update ccpp physics to with gcycle fix (#326) * update ccpp physics to gcycle_fix_p7b branch * point ccpp/phyics to release/P7b branch Co-authored-by: Jun Wang --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 24cc09ed0..4784db681 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 24cc09ed037c80659992cd3a9ef0900ed2d76785 +Subproject commit 4784db681636fd789ff39a46e43701c45baafdf8 From 926afeeedd355eb9fba6da29bb03f906af40f200 Mon Sep 17 00:00:00 2001 From: Jun Wang <37633869+junwang-noaa@users.noreply.github.com> Date: Mon, 14 Jun 2021 11:26:32 -0400 Subject: [PATCH 3/4] release/P7b: add P7b suite file (#329) * add suite_FV3_GFS_v16_coupled_nsstNoahmpUGWPv1.xml suite file --- ...e_FV3_GFS_v16_coupled_nsstNoahmpUGWPv1.xml | 96 +++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 ccpp/suites/suite_FV3_GFS_v16_coupled_nsstNoahmpUGWPv1.xml diff --git a/ccpp/suites/suite_FV3_GFS_v16_coupled_nsstNoahmpUGWPv1.xml b/ccpp/suites/suite_FV3_GFS_v16_coupled_nsstNoahmpUGWPv1.xml new file mode 100644 index 000000000..9843a96fc --- /dev/null +++ b/ccpp/suites/suite_FV3_GFS_v16_coupled_nsstNoahmpUGWPv1.xml @@ -0,0 +1,96 @@ + + + + + + + fv_sat_adj + + + + + 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 + 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 + noahmpdrv + sfc_cice + 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 + ugwpv1_gsldrag + ugwpv1_gsldrag_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 + gfdl_cloud_microphys + GFS_MP_generic_post + maximum_hourly_diagnostics + + + + + GFS_stochastics + phys_tend + + + + From b94c286e0e2a4afcdf82ecbf78a5aaee09173b90 Mon Sep 17 00:00:00 2001 From: Jun Wang <37633869+junwang-noaa@users.noreply.github.com> Date: Tue, 13 Jul 2021 18:32:13 -0400 Subject: [PATCH 4/4] fix the P7b run to run reproducibility issue (#341) * fix the omp threading reproducibility issue Co-authored-by: Jun Wang --- io/FV3GFS_io.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/io/FV3GFS_io.F90 b/io/FV3GFS_io.F90 index 364f38efd..94d30b220 100644 --- a/io/FV3GFS_io.F90 +++ b/io/FV3GFS_io.F90 @@ -1300,7 +1300,7 @@ subroutine sfc_prop_restart_read (Sfcprop, Atm_block, Model, fv_domain, warm_sta compute_tsfc_zorl_for_colstart: if (.not. warm_start) then if(Model%frac_grid) then ! 3-way composite if (Model%me == Model%master ) call mpp_error(NOTE, 'gfs_driver::surface_props_input - computing composite tsfc and zorl') -!$omp parallel do default(shared) private(nb, ix) +!$omp parallel do default(shared) private(nb, ix, tem1, tem) do nb = 1, Atm_block%nblks do ix = 1, Atm_block%blksz(nb) Sfcprop(nb)%tsfco(ix) = max(con_tice, Sfcprop(nb)%tsfco(ix)) ! this may break restart reproducibility