From 3f5a24c0f1d7c16a0a771d76992b688e932ecd17 Mon Sep 17 00:00:00 2001 From: Jun Wang Date: Tue, 21 Sep 2021 13:42:15 +0000 Subject: [PATCH 1/5] update ccpp with CCPP PR#731 --- .gitmodules | 4 ++-- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index afe6f27dd..887c36e9a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,5 +8,5 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/NCAR/ccpp-physics - branch = main + url = https://github.com/junwang-noaa/ccpp-physics + branch = noahmp_rstfix diff --git a/ccpp/physics b/ccpp/physics index 84c6144f5..a1fd2c627 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 84c6144f5412fe0f1ac88e377516f8df5d00f3a7 +Subproject commit a1fd2c627219d64617b681eb7ca0c699f2aeba56 From ec8aa8385c5d6e33a71b13bc3220b617b7dce6bb Mon Sep 17 00:00:00 2001 From: "Jun.Wang" Date: Tue, 21 Sep 2021 13:48:59 +0000 Subject: [PATCH 2/5] add FV3 standalone P7 suite file --- .../suite_FV3_GFS_v16_nsstNoahmpUGWPv1.xml | 94 +++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 ccpp/suites/suite_FV3_GFS_v16_nsstNoahmpUGWPv1.xml diff --git a/ccpp/suites/suite_FV3_GFS_v16_nsstNoahmpUGWPv1.xml b/ccpp/suites/suite_FV3_GFS_v16_nsstNoahmpUGWPv1.xml new file mode 100644 index 000000000..27bd85442 --- /dev/null +++ b/ccpp/suites/suite_FV3_GFS_v16_nsstNoahmpUGWPv1.xml @@ -0,0 +1,94 @@ + + + + + + + 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_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 + 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 + phys_tend + + + + + GFS_stochastics + + + + From 7987974b2bc1608c5eded52e0342e76a58d94cb1 Mon Sep 17 00:00:00 2001 From: "Jun.Wang" Date: Thu, 23 Sep 2021 17:32:39 +0000 Subject: [PATCH 3/5] update ccpp --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index a1fd2c627..badab05ea 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit a1fd2c627219d64617b681eb7ca0c699f2aeba56 +Subproject commit badab05eaed335ea51c9e909e67d0331c58cc96d From 4ebe2ec2e5d8a5cfb4ac8b18b2ba83dd937efa62 Mon Sep 17 00:00:00 2001 From: "Jun.Wang" Date: Thu, 23 Sep 2021 17:57:10 +0000 Subject: [PATCH 4/5] fix the filename with full time for netcdf output --- io/module_wrt_grid_comp.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/io/module_wrt_grid_comp.F90 b/io/module_wrt_grid_comp.F90 index f3d366ff8..7fa3f8037 100644 --- a/io/module_wrt_grid_comp.F90 +++ b/io/module_wrt_grid_comp.F90 @@ -1412,7 +1412,7 @@ subroutine wrt_run(wrt_comp, imp_state_write, exp_state_write,clock,rc) if (nsout > 0) then ndig = max(log10(nf_hours+0.5)+1., 3.) write(cform, '("(I",I1,".",I1,",A1,I2.2,A1,I2.2)")') ndig, ndig - write(cfhour, cform) nf_hours,':',nf_minutes,':',nseconds + write(cfhour, cform) nf_hours,'-',nf_minutes,'-',nseconds else ndig = max(log10(nf_hours+0.5)+1., 3.) write(cform, '("(I",I1,".",I1,")")') ndig, ndig From f0a466b9590c960634c05501eaa91ff64432e536 Mon Sep 17 00:00:00 2001 From: "Jun.Wang" Date: Fri, 24 Sep 2021 13:49:52 +0000 Subject: [PATCH 5/5] point back to NCAR ccpp physics repo --- .gitmodules | 6 ++---- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index bdb0855bb..a54f243ae 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,7 +8,5 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - #url = https://github.com/NCAR/ccpp-physics - #branch = main - url = https://github.com/junwang-noaa/ccpp-physics - branch = noahmp_rstfix + url = https://github.com/NCAR/ccpp-physics + branch = main diff --git a/ccpp/physics b/ccpp/physics index badab05ea..a9237ce6d 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit badab05eaed335ea51c9e909e67d0331c58cc96d +Subproject commit a9237ce6d74c5be0842c1626d122b18c32aa7947