diff --git a/ccpp/config/ccpp_prebuild_config.py b/ccpp/config/ccpp_prebuild_config.py index 634c3a951..8652aa877 100755 --- a/ccpp/config/ccpp_prebuild_config.py +++ b/ccpp/config/ccpp_prebuild_config.py @@ -96,11 +96,16 @@ # Relative path to source (from where ccpp_prebuild.py is called) : [ list of physics sets in which scheme may be called ]; # current restrictions are that each scheme can only belong to one physics set, and all schemes within one group in the # suite definition file have to belong to the same physics set - 'physics/physics/GFS_DCNV_generic.F90', - 'physics/physics/GFS_GWD_generic.F90', - 'physics/physics/GFS_MP_generic.F90', - 'physics/physics/GFS_PBL_generic.F90', - 'physics/physics/GFS_SCNV_generic.F90', + 'physics/physics/GFS_DCNV_generic_pre.F90', + 'physics/physics/GFS_DCNV_generic_post.F90', + 'physics/physics/GFS_GWD_generic_pre.F90', + 'physics/physics/GFS_GWD_generic_post.F90', + 'physics/physics/GFS_MP_generic_pre.F90', + 'physics/physics/GFS_MP_generic_post.F90', + 'physics/physics/GFS_PBL_generic_pre.F90', + 'physics/physics/GFS_PBL_generic_post.F90', + 'physics/physics/GFS_SCNV_generic_pre.F90', + 'physics/physics/GFS_SCNV_generic_post.F90', 'physics/physics/GFS_debug.F90', 'physics/physics/GFS_phys_time_vary.fv3.F90', 'physics/physics/GFS_rad_time_vary.fv3.F90', @@ -109,10 +114,22 @@ 'physics/physics/GFS_rrtmg_pre.F90', 'physics/physics/GFS_rrtmg_setup.F90', 'physics/physics/GFS_stochastics.F90', - 'physics/physics/GFS_suite_interstitial.F90', - 'physics/physics/GFS_surface_generic.F90', - 'physics/physics/GFS_surface_composites.F90', - 'physics/physics/GFS_surface_loop_control.F90', + 'physics/physics/GFS_suite_interstitial_rad_reset.F90', + 'physics/physics/GFS_suite_interstitial_phys_reset.F90', + 'physics/physics/GFS_suite_interstitial_1.F90', + 'physics/physics/GFS_suite_interstitial_2.F90', + 'physics/physics/GFS_suite_stateout_reset.F90', + 'physics/physics/GFS_suite_stateout_update.F90', + 'physics/physics/GFS_suite_interstitial_3.F90', + 'physics/physics/GFS_suite_interstitial_4.F90', + 'physics/physics/GFS_suite_interstitial_5.F90', + 'physics/physics/GFS_surface_generic_pre.F90', + 'physics/physics/GFS_surface_generic_post.F90', + 'physics/physics/GFS_surface_composites_pre.F90', + 'physics/physics/GFS_surface_composites_inter.F90', + 'physics/physics/GFS_surface_composites_post.F90', + 'physics/physics/GFS_surface_loop_control_part1.F90', + 'physics/physics/GFS_surface_loop_control_part2.F90', 'physics/physics/GFS_time_vary_pre.fv3.F90', 'physics/physics/cires_ugwp.F90', 'physics/physics/cires_ugwp_post.F90', @@ -121,20 +138,25 @@ 'physics/physics/ugwpv1_gsldrag.F90', 'physics/physics/ugwpv1_gsldrag_post.F90', 'physics/physics/cnvc90.f', + 'physics/physics/cs_conv_pre.F90', 'physics/physics/cs_conv.F90', + 'physics/physics/cs_conv_post.F90', 'physics/physics/cs_conv_aw_adj.F90', 'physics/physics/cu_ntiedtke_pre.F90', 'physics/physics/cu_ntiedtke.F90', 'physics/physics/cu_ntiedtke_post.F90', - 'physics/physics/dcyc2.f', + 'physics/physics/dcyc2t3.f', 'physics/physics/drag_suite.F90', - 'physics/physics/gcm_shoc.F90', + 'physics/physics/shoc.F90', 'physics/physics/get_prs_fv3.F90', + 'physics/physics/get_phi_fv3.F90', 'physics/physics/gfdl_cloud_microphys.F90', - 'physics/physics/gfdl_fv_sat_adj.F90', + 'physics/physics/fv_sat_adj.F90', 'physics/physics/gfdl_sfc_layer.F90', - 'physics/physics/gscond.f', + 'physics/physics/zhaocarr_gscond.f', + 'physics/physics/gwdc_pre.f', 'physics/physics/gwdc.f', + 'physics/physics/gwdc_post.f', 'physics/physics/gwdps.f', 'physics/physics/h2ophys.f', 'physics/physics/samfdeepcnv.f', @@ -143,29 +165,30 @@ 'physics/physics/shalcnv.F', 'physics/physics/maximum_hourly_diagnostics.F90', 'physics/physics/m_micro.F90', - 'physics/physics/m_micro_interstitial.F90', + 'physics/physics/m_micro_pre.F90', + 'physics/physics/m_micro_post.F90', 'physics/physics/cu_gf_driver_pre.F90', 'physics/physics/cu_gf_driver.F90', 'physics/physics/cu_gf_driver_post.F90', - 'physics/physics/moninedmf.f', + 'physics/physics/hedmf.f', 'physics/physics/moninshoc.f', 'physics/physics/satmedmfvdif.F', 'physics/physics/satmedmfvdifq.F', 'physics/physics/shinhongvdif.F90', 'physics/physics/ysuvdif.F90', - 'physics/physics/module_MYNNPBL_wrapper.F90', - 'physics/physics/module_MYNNSFC_wrapper.F90', - 'physics/physics/module_SGSCloud_RadPre.F90', - 'physics/physics/module_SGSCloud_RadPost.F90', - 'physics/physics/module_MYJSFC_wrapper.F90', - 'physics/physics/module_MYJPBL_wrapper.F90', + 'physics/physics/mynnpbl_wrapper.F90', + 'physics/physics/mynnsfc_wrapper.F90', + 'physics/physics/sgscloud_radpre.F90', + 'physics/physics/sgscloud_radpost.F90', + 'physics/physics/myjsfc_wrapper.F90', + 'physics/physics/myjpbl_wrapper.F90', 'physics/physics/mp_thompson_pre.F90', 'physics/physics/mp_thompson.F90', 'physics/physics/mp_thompson_post.F90', 'physics/physics/mp_nssl.F90' , 'physics/physics/ozphys.f', 'physics/physics/ozphys_2015.f', - 'physics/physics/precpd.f', + 'physics/physics/zhaocarr_precpd.f', 'physics/physics/phys_tend.F90', 'physics/physics/radlw_main.F90', 'physics/physics/radsw_main.F90', @@ -177,13 +200,15 @@ 'physics/physics/rad_sw_pre.F90', 'physics/physics/sfc_diag.f', 'physics/physics/sfc_diag_post.F90', - 'physics/physics/sfc_drv_ruc.F90', + 'physics/physics/lsm_ruc.F90', 'physics/physics/sfc_cice.f', 'physics/physics/sfc_diff.f', - 'physics/physics/sfc_drv.f', - 'physics/physics/sfc_noahmp_drv.F90', + 'physics/physics/lsm_noah.f', + 'physics/physics/noahmpdrv.F90', 'physics/physics/flake_driver.F90', + 'physics/physics/sfc_nst_pre.f', 'physics/physics/sfc_nst.f', + 'physics/physics/sfc_nst_post.f', 'physics/physics/sfc_ocean.F', 'physics/physics/sfc_sice.f', # HAFS FER_HIRES diff --git a/ccpp/physics b/ccpp/physics index 860245ca7..7e3535134 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 860245ca7e7f35b52cfffd941ec3f9afba1a9bdf +Subproject commit 7e3535134272169e5ae4690aa47e4e9325aefc64