Skip to content

Commit

Permalink
Merge pull request NCAR#261 from grantfirl/update_for_ccpp-physics_PR…
Browse files Browse the repository at this point in the history 
…_627

changes related to ccpp-physics PR#627
  • Loading branch information
@grantfirl
grantfirl authored Jun 17, 2021
2 parents 153b319 + 48b9613 commit 08ad563
Show file tree
Hide file tree
Showing 36 changed files with 364 additions and 122 deletions.
2 changes: 2 additions & 0 deletions ccpp/config/ccpp_prebuild_config.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
'ccpp/physics/physics/h2o_def.f',
'ccpp/physics/physics/ozne_def.f',
'ccpp/physics/physics/radlw_param.f',
'ccpp/physics/physics/radiation_surface.f',
'scm/src/GFS_typedefs.F90',
'scm/src/scm_kinds.F90',
'scm/src/scm_type_defs.F90',
Expand Down Expand Up @@ -102,6 +103,7 @@
'ccpp/physics/physics/GFS_SCNV_generic.F90' ,
'ccpp/physics/physics/GFS_phys_time_vary.scm.F90' ,
'ccpp/physics/physics/GFS_rad_time_vary.scm.F90' ,
'ccpp/physics/physics/GFS_radiation_surface.F90' ,
'ccpp/physics/physics/GFS_rrtmg_post.F90' ,
'ccpp/physics/physics/GFS_rrtmg_pre.F90' ,
'ccpp/physics/physics/GFS_rrtmg_setup.F90' ,
Expand Down
2 changes: 1 addition & 1 deletion ccpp/framework
Submodule framework updated 5 files
+1 −0 scripts/common.py
+23 −17 scripts/metadata_parser.py
+39 −8 scripts/mkstatic.py
+2 −0 src/ccpp_types.F90
+6 −0 src/ccpp_types.meta
2 changes: 1 addition & 1 deletion ccpp/physics
Submodule physics updated 90 files
+105 −8 physics/GFS_debug.F90
+92 −0 physics/GFS_debug.meta
+41 −23 physics/GFS_phys_time_vary.fv3.F90
+68 −15 physics/GFS_phys_time_vary.fv3.meta
+41 −22 physics/GFS_phys_time_vary.scm.F90
+68 −15 physics/GFS_phys_time_vary.scm.meta
+201 −0 physics/GFS_radiation_surface.F90
+531 −0 physics/GFS_radiation_surface.meta
+16 −51 physics/GFS_rrtmg_setup.F90
+10 −18 physics/GFS_rrtmg_setup.meta
+3 −3 physics/GFS_rrtmgp_pre.meta
+16 −22 physics/GFS_rrtmgp_setup.F90
+9 −17 physics/GFS_rrtmgp_setup.meta
+26 −86 physics/GFS_rrtmgp_sw_pre.F90
+12 −279 physics/GFS_rrtmgp_sw_pre.meta
+3 −3 physics/GFS_rrtmgp_thompsonmp_pre.meta
+130 −36 physics/GFS_surface_composites.F90
+215 −49 physics/GFS_surface_composites.meta
+2 −3 physics/GFS_surface_generic.F90
+0 −9 physics/GFS_surface_generic.meta
+10 −1 physics/cires_ugwp.F90
+8 −0 physics/cires_ugwp.meta
+14 −2 physics/cu_gf_driver.F90
+32 −0 physics/cu_gf_driver.meta
+19 −1 physics/cu_ntiedtke.F90
+32 −0 physics/cu_ntiedtke.meta
+18 −1 physics/drag_suite.F90
+30 −0 physics/drag_suite.meta
+16 −1 physics/gcm_shoc.F90
+30 −0 physics/gcm_shoc.meta
+38 −2 physics/gscond.f
+41 −0 physics/gscond.meta
+16 −1 physics/h2ophys.f
+30 −0 physics/h2ophys.meta
+16 −1 physics/module_MYJPBL_wrapper.F90
+30 −0 physics/module_MYJPBL_wrapper.meta
+17 −1 physics/module_MYJSFC_wrapper.F90
+30 −0 physics/module_MYJSFC_wrapper.meta
+10 −2 physics/module_MYNNPBL_wrapper.F90
+8 −0 physics/module_MYNNPBL_wrapper.meta
+10 −1 physics/module_MYNNSFC_wrapper.F90
+9 −1 physics/module_MYNNSFC_wrapper.meta
+118 −432 physics/module_mp_thompson.F90
+31 −15 physics/module_sf_ruclsm.F90
+12 −2 physics/moninedmf.f
+8 −0 physics/moninedmf.meta
+18 −1 physics/moninshoc.f
+30 −0 physics/moninshoc.meta
+58 −28 physics/mp_thompson.F90
+33 −1 physics/mp_thompson.meta
+36 −1 physics/precpd.f
+46 −0 physics/precpd.meta
+325 −391 physics/radiation_surface.f
+15 −0 physics/radiation_surface.meta
+8 −26 physics/rrtmg_lw_pre.F90
+1 −117 physics/rrtmg_lw_pre.meta
+1 −1 physics/rrtmg_sw_post.F90
+6 −58 physics/rrtmg_sw_pre.F90
+0 −268 physics/rrtmg_sw_pre.meta
+6 −26 physics/rrtmgp_lw_pre.F90
+4 −102 physics/rrtmgp_lw_pre.meta
+1 −1 physics/rrtmgp_sw_gas_optics.meta
+17 −1 physics/samfdeepcnv.f
+38 −0 physics/samfdeepcnv.meta
+17 −1 physics/samfshalcnv.f
+38 −0 physics/samfshalcnv.meta
+10 −1 physics/satmedmfvdif.F
+10 −0 physics/satmedmfvdif.meta
+11 −1 physics/satmedmfvdifq.F
+8 −0 physics/satmedmfvdifq.meta
+8 −6 physics/sfc_diag.f
+8 −0 physics/sfc_diag.meta
+75 −32 physics/sfc_diff.f
+35 −0 physics/sfc_diff.meta
+11 −1 physics/sfc_drv.f
+16 −0 physics/sfc_drv.meta
+199 −72 physics/sfc_drv_ruc.F90
+417 −30 physics/sfc_drv_ruc.meta
+12 −2 physics/sfc_noahmp_drv.F90
+26 −10 physics/sfc_noahmp_drv.meta
+24 −17 physics/sfc_nst.f
+8 −0 physics/sfc_nst.meta
+36 −29 physics/sfc_sice.f
+8 −0 physics/sfc_sice.meta
+16 −1 physics/shinhongvdif.F90
+30 −0 physics/shinhongvdif.meta
+10 −2 physics/unified_ugwp.F90
+8 −0 physics/unified_ugwp.meta
+16 −1 physics/ysuvdif.F90
+30 −0 physics/ysuvdif.meta
1 change: 1 addition & 0 deletions ccpp/physics_namelists/input_GSD_v1.nml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
do_skeb = .false.
lsm = 3
lsoil_lsm = 9
kice = 9
iopt_dveg = 2
iopt_crs = 1
iopt_btr = 1
Expand Down
1 change: 1 addition & 0 deletions ccpp/suites/suite_HAFS_v0_hwrf.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<subcycle loop="1">
<scheme>GFS_suite_interstitial_rad_reset</scheme>
<scheme>GFS_rrtmg_pre</scheme>
<scheme>GFS_radiation_surface</scheme>
<scheme>rrtmg_lw_pre</scheme>
<scheme>rrtmg_lw</scheme>
<scheme>rrtmg_lw_post</scheme>
Expand Down
1 change: 1 addition & 0 deletions ccpp/suites/suite_HAFS_v0_hwrf_ps.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<subcycle loop="1">
<scheme>GFS_suite_interstitial_rad_reset</scheme>
<scheme>GFS_rrtmg_pre</scheme>
<scheme>GFS_radiation_surface</scheme>
<scheme>rrtmg_lw_pre</scheme>
<scheme>rrtmg_lw</scheme>
<scheme>rrtmg_lw_post</scheme>
Expand Down
1 change: 1 addition & 0 deletions ccpp/suites/suite_HAFS_v0_hwrf_thompson.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<scheme>GFS_suite_interstitial_rad_reset</scheme>
<!-- <scheme>sgscloud_radpre</scheme> -->
<scheme>GFS_rrtmg_pre</scheme>
<scheme>GFS_radiation_surface</scheme>
<scheme>rrtmg_lw_pre</scheme>
<scheme>rrtmg_lw</scheme>
<scheme>rrtmg_lw_post</scheme>
Expand Down
1 change: 1 addition & 0 deletions ccpp/suites/suite_HAFS_v0_hwrf_thompson_ps.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<scheme>GFS_suite_interstitial_rad_reset</scheme>
<!-- <scheme>sgscloud_radpre</scheme> -->
<scheme>GFS_rrtmg_pre</scheme>
<scheme>GFS_radiation_surface</scheme>
<scheme>rrtmg_lw_pre</scheme>
<scheme>rrtmg_lw</scheme>
<scheme>rrtmg_lw_post</scheme>
Expand Down
1 change: 1 addition & 0 deletions ccpp/suites/suite_SCM_GFS_v15p2.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<subcycle loop="1">
<scheme>GFS_suite_interstitial_rad_reset</scheme>
<scheme>GFS_rrtmg_pre</scheme>
<scheme>GFS_radiation_surface</scheme>
<scheme>rrtmg_sw_pre</scheme>
<scheme>rrtmg_sw</scheme>
<scheme>rrtmg_sw_post</scheme>
Expand Down
1 change: 1 addition & 0 deletions ccpp/suites/suite_SCM_GFS_v15p2_ACM_ps.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<subcycle loop="1">
<scheme>GFS_suite_interstitial_rad_reset</scheme>
<scheme>GFS_rrtmg_pre</scheme>
<scheme>GFS_radiation_surface</scheme>
<scheme>rrtmg_sw_pre</scheme>
<scheme>rrtmg_sw</scheme>
<scheme>rrtmg_sw_post</scheme>
Expand Down
1 change: 1 addition & 0 deletions ccpp/suites/suite_SCM_GFS_v15p2_FA.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<subcycle loop="1">
<scheme>GFS_suite_interstitial_rad_reset</scheme>
<scheme>GFS_rrtmg_pre</scheme>
<scheme>GFS_radiation_surface</scheme>
<scheme>rrtmg_sw_pre</scheme>
<scheme>rrtmg_sw</scheme>
<scheme>rrtmg_sw_post</scheme>
Expand Down
1 change: 1 addition & 0 deletions ccpp/suites/suite_SCM_GFS_v15p2_MYJ.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<subcycle loop="1">
<scheme>GFS_suite_interstitial_rad_reset</scheme>
<scheme>GFS_rrtmg_pre</scheme>
<scheme>GFS_radiation_surface</scheme>
<scheme>rrtmg_sw_pre</scheme>
<scheme>rrtmg_sw</scheme>
<scheme>rrtmg_sw_post</scheme>
Expand Down
1 change: 1 addition & 0 deletions ccpp/suites/suite_SCM_GFS_v15p2_RRTMGP.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<subcycle loop="1">
<scheme>GFS_suite_interstitial_rad_reset</scheme>
<scheme>GFS_rrtmgp_pre</scheme>
<scheme>GFS_radiation_surface</scheme>
<scheme>GFS_rrtmgp_gfdlmp_pre</scheme>
<scheme>GFS_cloud_diagnostics</scheme>
<scheme>GFS_rrtmgp_sw_pre</scheme>
Expand Down
1 change: 1 addition & 0 deletions ccpp/suites/suite_SCM_GFS_v15p2_RRTMGP_ps.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<subcycle loop="1">
<scheme>GFS_suite_interstitial_rad_reset</scheme>
<scheme>GFS_rrtmgp_pre</scheme>
<scheme>GFS_radiation_surface</scheme>
<scheme>GFS_rrtmgp_gfdlmp_pre</scheme>
<scheme>GFS_cloud_diagnostics</scheme>
<scheme>GFS_rrtmgp_sw_pre</scheme>
Expand Down
1 change: 1 addition & 0 deletions ccpp/suites/suite_SCM_GFS_v15p2_YSU_ps.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<subcycle loop="1">
<scheme>GFS_suite_interstitial_rad_reset</scheme>
<scheme>GFS_rrtmg_pre</scheme>
<scheme>GFS_radiation_surface</scheme>
<scheme>rrtmg_sw_pre</scheme>
<scheme>rrtmg_sw</scheme>
<scheme>rrtmg_sw_post</scheme>
Expand Down
1 change: 1 addition & 0 deletions ccpp/suites/suite_SCM_GFS_v15p2_no_nsst.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<subcycle loop="1">
<scheme>GFS_suite_interstitial_rad_reset</scheme>
<scheme>GFS_rrtmg_pre</scheme>
<scheme>GFS_radiation_surface</scheme>
<scheme>rrtmg_sw_pre</scheme>
<scheme>rrtmg_sw</scheme>
<scheme>rrtmg_sw_post</scheme>
Expand Down
1 change: 1 addition & 0 deletions ccpp/suites/suite_SCM_GFS_v15p2_no_nsst_ps.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<subcycle loop="1">
<scheme>GFS_suite_interstitial_rad_reset</scheme>
<scheme>GFS_rrtmg_pre</scheme>
<scheme>GFS_radiation_surface</scheme>
<scheme>rrtmg_sw_pre</scheme>
<scheme>rrtmg_sw</scheme>
<scheme>rrtmg_sw_post</scheme>
Expand Down
1 change: 1 addition & 0 deletions ccpp/suites/suite_SCM_GFS_v15p2_noahmp.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<subcycle loop="1">
<scheme>GFS_suite_interstitial_rad_reset</scheme>
<scheme>GFS_rrtmg_pre</scheme>
<scheme>GFS_radiation_surface</scheme>
<scheme>rrtmg_sw_pre</scheme>
<scheme>rrtmg_sw</scheme>
<scheme>rrtmg_sw_post</scheme>
Expand Down
1 change: 1 addition & 0 deletions ccpp/suites/suite_SCM_GFS_v15p2_ps.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<subcycle loop="1">
<scheme>GFS_suite_interstitial_rad_reset</scheme>
<scheme>GFS_rrtmg_pre</scheme>
<scheme>GFS_radiation_surface</scheme>
<scheme>rrtmg_sw_pre</scheme>
<scheme>rrtmg_sw</scheme>
<scheme>rrtmg_sw_post</scheme>
Expand Down
1 change: 1 addition & 0 deletions ccpp/suites/suite_SCM_GFS_v15p2_saYSU_ps.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<subcycle loop="1">
<scheme>GFS_suite_interstitial_rad_reset</scheme>
<scheme>GFS_rrtmg_pre</scheme>
<scheme>GFS_radiation_surface</scheme>
<scheme>rrtmg_sw_pre</scheme>
<scheme>rrtmg_sw</scheme>
<scheme>rrtmg_sw_post</scheme>
Expand Down
1 change: 1 addition & 0 deletions ccpp/suites/suite_SCM_GFS_v16.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<subcycle loop="1">
<scheme>GFS_suite_interstitial_rad_reset</scheme>
<scheme>GFS_rrtmg_pre</scheme>
<scheme>GFS_radiation_surface</scheme>
<scheme>rrtmg_sw_pre</scheme>
<scheme>rrtmg_sw</scheme>
<scheme>rrtmg_sw_post</scheme>
Expand Down
1 change: 1 addition & 0 deletions ccpp/suites/suite_SCM_GFS_v16_RRTMGP.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<subcycle loop="1">
<scheme>GFS_suite_interstitial_rad_reset</scheme>
<scheme>GFS_rrtmgp_pre</scheme>
<scheme>GFS_radiation_surface</scheme>
<scheme>GFS_rrtmgp_gfdlmp_pre</scheme>
<scheme>GFS_cloud_diagnostics</scheme>
<scheme>GFS_rrtmgp_sw_pre</scheme>
Expand Down
1 change: 1 addition & 0 deletions ccpp/suites/suite_SCM_GFS_v16_RRTMGP_ps.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<subcycle loop="1">
<scheme>GFS_suite_interstitial_rad_reset</scheme>
<scheme>GFS_rrtmgp_pre</scheme>
<scheme>GFS_radiation_surface</scheme>
<scheme>GFS_rrtmgp_gfdlmp_pre</scheme>
<scheme>GFS_cloud_diagnostics</scheme>
<scheme>GFS_rrtmgp_sw_pre</scheme>
Expand Down
1 change: 1 addition & 0 deletions ccpp/suites/suite_SCM_GFS_v16_no_nsst.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<subcycle loop="1">
<scheme>GFS_suite_interstitial_rad_reset</scheme>
<scheme>GFS_rrtmg_pre</scheme>
<scheme>GFS_radiation_surface</scheme>
<scheme>rrtmg_sw_pre</scheme>
<scheme>rrtmg_sw</scheme>
<scheme>rrtmg_sw_post</scheme>
Expand Down
1 change: 1 addition & 0 deletions ccpp/suites/suite_SCM_GFS_v16_no_nsst_ps.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<subcycle loop="1">
<scheme>GFS_suite_interstitial_rad_reset</scheme>
<scheme>GFS_rrtmg_pre</scheme>
<scheme>GFS_radiation_surface</scheme>
<scheme>rrtmg_sw_pre</scheme>
<scheme>rrtmg_sw</scheme>
<scheme>rrtmg_sw_post</scheme>
Expand Down
1 change: 1 addition & 0 deletions ccpp/suites/suite_SCM_GFS_v16_ps.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<subcycle loop="1">
<scheme>GFS_suite_interstitial_rad_reset</scheme>
<scheme>GFS_rrtmg_pre</scheme>
<scheme>GFS_radiation_surface</scheme>
<scheme>rrtmg_sw_pre</scheme>
<scheme>rrtmg_sw</scheme>
<scheme>rrtmg_sw_post</scheme>
Expand Down
1 change: 1 addition & 0 deletions ccpp/suites/suite_SCM_GFS_v16_ugwpv1.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<subcycle loop="1">
<scheme>GFS_suite_interstitial_rad_reset</scheme>
<scheme>GFS_rrtmg_pre</scheme>
<scheme>GFS_radiation_surface</scheme>
<scheme>rrtmg_sw_pre</scheme>
<scheme>rrtmg_sw</scheme>
<scheme>rrtmg_sw_post</scheme>
Expand Down
1 change: 1 addition & 0 deletions ccpp/suites/suite_SCM_GSD_v1.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<scheme>GFS_suite_interstitial_rad_reset</scheme>
<scheme>sgscloud_radpre</scheme>
<scheme>GFS_rrtmg_pre</scheme>
<scheme>GFS_radiation_surface</scheme>
<scheme>rrtmg_sw_pre</scheme>
<scheme>rrtmg_sw</scheme>
<scheme>rrtmg_sw_post</scheme>
Expand Down
1 change: 1 addition & 0 deletions ccpp/suites/suite_SCM_GSD_v1_ps.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<scheme>GFS_suite_interstitial_rad_reset</scheme>
<scheme>sgscloud_radpre</scheme>
<scheme>GFS_rrtmg_pre</scheme>
<scheme>GFS_radiation_surface</scheme>
<scheme>rrtmg_sw_pre</scheme>
<scheme>rrtmg_sw</scheme>
<scheme>rrtmg_sw_post</scheme>
Expand Down
1 change: 1 addition & 0 deletions ccpp/suites/suite_SCM_RRFS_v1alpha.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<scheme>GFS_suite_interstitial_rad_reset</scheme>
<scheme>sgscloud_radpre</scheme>
<scheme>GFS_rrtmg_pre</scheme>
<scheme>GFS_radiation_surface</scheme>
<scheme>rrtmg_sw_pre</scheme>
<scheme>rrtmg_sw</scheme>
<scheme>rrtmg_sw_post</scheme>
Expand Down
1 change: 1 addition & 0 deletions ccpp/suites/suite_SCM_RRFS_v1alpha_ps.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<scheme>GFS_suite_interstitial_rad_reset</scheme>
<scheme>sgscloud_radpre</scheme>
<scheme>GFS_rrtmg_pre</scheme>
<scheme>GFS_radiation_surface</scheme>
<scheme>rrtmg_sw_pre</scheme>
<scheme>rrtmg_sw</scheme>
<scheme>rrtmg_sw_post</scheme>
Expand Down
1 change: 1 addition & 0 deletions ccpp/suites/suite_SCM_csawmg.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<subcycle loop="1">
<scheme>GFS_suite_interstitial_rad_reset</scheme>
<scheme>GFS_rrtmg_pre</scheme>
<scheme>GFS_radiation_surface</scheme>
<scheme>rrtmg_sw_pre</scheme>
<scheme>rrtmg_sw</scheme>
<scheme>rrtmg_sw_post</scheme>
Expand Down
1 change: 1 addition & 0 deletions ccpp/suites/suite_SCM_csawmg_ps.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<subcycle loop="1">
<scheme>GFS_suite_interstitial_rad_reset</scheme>
<scheme>GFS_rrtmg_pre</scheme>
<scheme>GFS_radiation_surface</scheme>
<scheme>rrtmg_sw_pre</scheme>
<scheme>rrtmg_sw</scheme>
<scheme>rrtmg_sw_post</scheme>
Expand Down
Loading

0 comments on commit 08ad563

Please sign in to comment.