Merge pull request #312 from grantfirl/20220401_main_update

Update to CCPP main as of April 26, 2022 (including one-to-one schemes/files)
NCAR · Apr 27, 2022 · ea35bfb · ea35bfb
2 parents 548a2fa + a36183b
commit ea35bfb
Show file tree

Hide file tree

Showing 44 changed files with 4,822 additions and 4,583 deletions.
diff --git a/ccpp/config/ccpp_prebuild_config.py b/ccpp/config/ccpp_prebuild_config.py
@@ -27,6 +27,7 @@
     'ccpp/physics/physics/rte-rrtmgp/rte/mo_optical_props.F90',
     'ccpp/physics/physics/rte-rrtmgp/extensions/cloud_optics/mo_cloud_optics.F90',
     'ccpp/physics/physics/rte-rrtmgp/rte/mo_source_functions.F90',
+    'scm/src/CCPP_typedefs.F90',
     'scm/src/GFS_typedefs.F90',
     'scm/src/scm_kinds.F90',
     'scm/src/scm_type_defs.F90',
@@ -48,14 +49,17 @@
     'module_radlw_parameters' : {
         'module_radlw_parameters' : '',
         },
+    'CCPP_typedefs' : {
+        'GFS_interstitial_type' : 'physics%Interstitial',
+        'CCPP_typedefs' : '',
+        },
     'GFS_typedefs' : {
         'GFS_diag_type' : 'physics%Diag',
         'GFS_control_type' : 'physics%Model',
         'GFS_cldprop_type' : 'physics%Cldprop',
         'GFS_tbd_type' : 'physics%Tbd',
         'GFS_sfcprop_type' : 'physics%Sfcprop',
         'GFS_coupling_type' : 'physics%Coupling',
-        'GFS_interstitial_type' : 'physics%Interstitial',
         'GFS_statein_type' : 'physics%Statein',
         'GFS_radtend_type' : 'physics%Radtend',
         'GFS_grid_type' : 'physics%Grid',
@@ -97,21 +101,38 @@
     # 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
-    'ccpp/physics/physics/GFS_DCNV_generic.F90'             ,
-    'ccpp/physics/physics/GFS_GWD_generic.F90'              ,
-    'ccpp/physics/physics/GFS_MP_generic.F90'               ,
-    'ccpp/physics/physics/GFS_PBL_generic.F90'              ,
-    'ccpp/physics/physics/GFS_SCNV_generic.F90'             ,
+    'ccpp/physics/physics/GFS_DCNV_generic_pre.F90'         ,
+    'ccpp/physics/physics/GFS_DCNV_generic_post.F90'        ,
+    'ccpp/physics/physics/GFS_GWD_generic_pre.F90'          ,
+    'ccpp/physics/physics/GFS_GWD_generic_post.F90'         ,
+    'ccpp/physics/physics/GFS_MP_generic_pre.F90'           ,
+    'ccpp/physics/physics/GFS_MP_generic_post.F90'          ,
+    'ccpp/physics/physics/GFS_PBL_generic_pre.F90'          ,
+    'ccpp/physics/physics/GFS_PBL_generic_post.F90'         ,
+    'ccpp/physics/physics/GFS_SCNV_generic_pre.F90'         ,
+    'ccpp/physics/physics/GFS_SCNV_generic_post.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'              ,
-    'ccpp/physics/physics/GFS_suite_interstitial.F90'       ,
-    'ccpp/physics/physics/GFS_surface_generic.F90'          ,
-    'ccpp/physics/physics/GFS_surface_composites.F90'       ,
-    'ccpp/physics/physics/GFS_surface_loop_control.F90'     ,
+    'ccpp/physics/physics/GFS_suite_interstitial_rad_reset.F90',
+    'ccpp/physics/physics/GFS_suite_interstitial_phys_reset.F90',
+    'ccpp/physics/physics/GFS_suite_interstitial_1.F90'     ,
+    'ccpp/physics/physics/GFS_suite_interstitial_2.F90'     ,
+    'ccpp/physics/physics/GFS_suite_stateout_reset.F90'     ,
+    'ccpp/physics/physics/GFS_suite_stateout_update.F90'    ,
+    'ccpp/physics/physics/GFS_suite_interstitial_3.F90'     ,
+    'ccpp/physics/physics/GFS_suite_interstitial_4.F90'     ,
+    'ccpp/physics/physics/GFS_suite_interstitial_5.F90'     ,
+    'ccpp/physics/physics/GFS_surface_generic_pre.F90'      ,
+    'ccpp/physics/physics/GFS_surface_generic_post.F90'     ,
+    'ccpp/physics/physics/GFS_surface_composites_pre.F90'   ,
+    'ccpp/physics/physics/GFS_surface_composites_inter.F90' ,
+    'ccpp/physics/physics/GFS_surface_composites_post.F90'  ,
+    'ccpp/physics/physics/GFS_surface_loop_control_part1.F90' ,
+    'ccpp/physics/physics/GFS_surface_loop_control_part2.F90' ,
     'ccpp/physics/physics/GFS_time_vary_pre.scm.F90'        ,
 #    'ccpp/physics/physics/bl_acm.F90'                       ,
     'ccpp/physics/physics/cires_ugwp.F90'                   ,
@@ -121,19 +142,24 @@
     'ccpp/physics/physics/ugwpv1_gsldrag.F90'               ,
     'ccpp/physics/physics/ugwpv1_gsldrag_post.F90'          ,
     'ccpp/physics/physics/cnvc90.f'                         ,
+    'ccpp/physics/physics/cs_conv_pre.F90'                  ,
     'ccpp/physics/physics/cs_conv.F90'                      ,
+    'ccpp/physics/physics/cs_conv_post.F90'                 ,
     'ccpp/physics/physics/cs_conv_aw_adj.F90'               ,
     'ccpp/physics/physics/cu_ntiedtke_pre.F90'              ,
     'ccpp/physics/physics/cu_ntiedtke.F90'                  ,
     'ccpp/physics/physics/cu_ntiedtke_post.F90'             ,
-    'ccpp/physics/physics/dcyc2.f'                          ,
+    'ccpp/physics/physics/dcyc2t3.f'                        ,
     'ccpp/physics/physics/drag_suite.F90'                   ,
-    'ccpp/physics/physics/gcm_shoc.F90'                     ,
+    'ccpp/physics/physics/shoc.F90'                         ,
     'ccpp/physics/physics/get_prs_fv3.F90'                  ,
+    'ccpp/physics/physics/get_phi_fv3.F90'                  ,
     'ccpp/physics/physics/gfdl_cloud_microphys.F90'         ,
     'ccpp/physics/physics/gfdl_sfc_layer.F90'               ,
-    'ccpp/physics/physics/gscond.f'                         ,
+    'ccpp/physics/physics/zhaocarr_gscond.f'                ,
+    'ccpp/physics/physics/gwdc_pre.f'                       ,
     'ccpp/physics/physics/gwdc.f'                           ,
+    'ccpp/physics/physics/gwdc_post.f'                      ,
     'ccpp/physics/physics/gwdps.f'                          ,
     'ccpp/physics/physics/h2ophys.f'                        ,
     'ccpp/physics/physics/samfdeepcnv.f'                    ,
@@ -142,29 +168,30 @@
     'ccpp/physics/physics/shalcnv.F'                        ,
     'ccpp/physics/physics/maximum_hourly_diagnostics.F90'   ,
     'ccpp/physics/physics/m_micro.F90'                      ,
-    'ccpp/physics/physics/m_micro_interstitial.F90'         ,
+    'ccpp/physics/physics/m_micro_pre.F90'                  ,
+    'ccpp/physics/physics/m_micro_post.F90'                 ,
     'ccpp/physics/physics/cu_gf_driver_pre.F90'             ,
     'ccpp/physics/physics/cu_gf_driver.F90'                 ,
     'ccpp/physics/physics/cu_gf_driver_post.F90'            ,
-    'ccpp/physics/physics/moninedmf.f'                      ,
+    'ccpp/physics/physics/hedmf.f'                          ,
     'ccpp/physics/physics/moninshoc.f'                      ,
     'ccpp/physics/physics/satmedmfvdif.F'                   ,
     'ccpp/physics/physics/satmedmfvdifq.F'                  ,
     'ccpp/physics/physics/shinhongvdif.F90'                 ,
     'ccpp/physics/physics/ysuvdif.F90'                      ,
-    'ccpp/physics/physics/module_MYNNPBL_wrapper.F90'       ,
-    'ccpp/physics/physics/module_MYNNSFC_wrapper.F90'       ,
-    'ccpp/physics/physics/module_SGSCloud_RadPre.F90'       ,
-    'ccpp/physics/physics/module_SGSCloud_RadPost.F90'      ,
-    'ccpp/physics/physics/module_MYJSFC_wrapper.F90'        ,
-    'ccpp/physics/physics/module_MYJPBL_wrapper.F90'        ,
+    'ccpp/physics/physics/mynnpbl_wrapper.F90'              ,
+    'ccpp/physics/physics/mynnsfc_wrapper.F90'              ,
+    'ccpp/physics/physics/sgscloud_radpre.F90'              ,
+    'ccpp/physics/physics/sgscloud_radpost.F90'             ,
+    'ccpp/physics/physics/myjsfc_wrapper.F90'               ,
+    'ccpp/physics/physics/myjpbl_wrapper.F90'               ,
     'ccpp/physics/physics/mp_thompson_pre.F90'              ,
     'ccpp/physics/physics/mp_thompson.F90'                  ,
     'ccpp/physics/physics/mp_thompson_post.F90'             ,
     'ccpp/physics/physics/mp_nssl.F90'                      ,
     'ccpp/physics/physics/ozphys.f'                         ,
     'ccpp/physics/physics/ozphys_2015.f'                    ,
-    'ccpp/physics/physics/precpd.f'                         ,
+    'ccpp/physics/physics/zhaocarr_precpd.f'                ,
     'ccpp/physics/physics/phys_tend.F90'                    ,
     'ccpp/physics/physics/radlw_main.F90'                   ,
     'ccpp/physics/physics/radsw_main.F90'                   ,
@@ -173,16 +200,18 @@
     'ccpp/physics/physics/rrtmg_lw_post.F90'                ,
     'ccpp/physics/physics/rrtmg_lw_pre.F90'                 ,
     'ccpp/physics/physics/rrtmg_sw_post.F90'                ,
-    'ccpp/physics/physics/rrtmg_sw_pre.F90'                 ,
+    'ccpp/physics/physics/rad_sw_pre.F90'                   ,
     'ccpp/physics/physics/sfc_diag.f'                       ,
     'ccpp/physics/physics/sfc_diag_post.F90'                ,
-    'ccpp/physics/physics/sfc_drv_ruc.F90'                  ,
+    'ccpp/physics/physics/lsm_ruc.F90'                      ,
     'ccpp/physics/physics/sfc_cice.f'                       ,
     'ccpp/physics/physics/sfc_diff.f'                       ,
-    'ccpp/physics/physics/sfc_drv.f'                        ,
-    'ccpp/physics/physics/sfc_noahmp_drv.F90'               ,
+    'ccpp/physics/physics/lsm_noah.f'                       ,
+    'ccpp/physics/physics/noahmpdrv.F90'                    ,
     'ccpp/physics/physics/flake_driver.F90'                 ,
+    'ccpp/physics/physics/sfc_nst_pre.f'                    ,
     'ccpp/physics/physics/sfc_nst.f'                        ,
+    'ccpp/physics/physics/sfc_nst_post.f'                   ,
     'ccpp/physics/physics/sfc_ocean.F'                      ,
     'ccpp/physics/physics/sfc_sice.f'                       ,
     'ccpp/physics/physics/mp_fer_hires.F90'                 ,
@@ -192,22 +221,18 @@
     'ccpp/physics/physics/rrtmgp_lw_cloud_optics.F90'       ,
     'ccpp/physics/physics/rrtmgp_sw_gas_optics.F90'         ,
     'ccpp/physics/physics/rrtmgp_sw_cloud_optics.F90'       ,
-    'ccpp/physics/physics/rrtmgp_sw_aerosol_optics.F90'     ,
+    'ccpp/physics/physics/rrtmgp_aerosol_optics.F90'        ,
     'ccpp/physics/physics/rrtmgp_lw_rte.F90'                ,
     'ccpp/physics/physics/rrtmgp_sw_rte.F90'                ,
-    'ccpp/physics/physics/rrtmgp_lw_aerosol_optics.F90'     ,
     'ccpp/physics/physics/GFS_rrtmgp_setup.F90'             ,
     'ccpp/physics/physics/GFS_rrtmgp_pre.F90'               ,
     'ccpp/physics/physics/rrtmgp_lw_pre.F90'                ,
-    'ccpp/physics/physics/GFS_rrtmgp_sw_pre.F90'            ,
     'ccpp/physics/physics/GFS_rrtmgp_lw_post.F90'           ,
     'ccpp/physics/physics/rrtmgp_lw_cloud_sampling.F90'     ,
     'ccpp/physics/physics/rrtmgp_sw_cloud_sampling.F90'     ,
     'ccpp/physics/physics/GFS_cloud_diagnostics.F90'        ,
-    'ccpp/physics/physics/GFS_rrtmgp_thompsonmp_pre.F90'    ,
-    'ccpp/physics/physics/GFS_rrtmgp_gfdlmp_pre.F90'        ,
-    'ccpp/physics/physics/GFS_rrtmgp_zhaocarr_pre.F90'      ,
-    'ccpp/physics/physics/GFS_rrtmgp_cloud_overlap_pre.F90' ,
+    'ccpp/physics/physics/GFS_rrtmgp_cloud_mp.F90'          ,
+    'ccpp/physics/physics/GFS_rrtmgp_cloud_overlap.F90'     ,
     'ccpp/physics/physics/GFS_rrtmgp_sw_post.F90'
     ]
 

diff --git a/ccpp/framework b/ccpp/framework
diff --git a/ccpp/physics b/ccpp/physics
diff --git a/ccpp/suites/suite_HAFS_v0_hwrf.xml b/ccpp/suites/suite_HAFS_v0_hwrf.xml
@@ -18,7 +18,7 @@
       <scheme>rrtmg_lw_pre</scheme>
       <scheme>rrtmg_lw</scheme>
       <scheme>rrtmg_lw_post</scheme>
-      <scheme>rrtmg_sw_pre</scheme>
+      <scheme>rad_sw_pre</scheme>
       <scheme>rrtmg_sw</scheme>
       <scheme>rrtmg_sw_post</scheme>
       <scheme>GFS_rrtmg_post</scheme>

diff --git a/ccpp/suites/suite_HAFS_v0_hwrf_ps.xml b/ccpp/suites/suite_HAFS_v0_hwrf_ps.xml
@@ -18,7 +18,7 @@
       <scheme>rrtmg_lw_pre</scheme>
       <scheme>rrtmg_lw</scheme>
       <scheme>rrtmg_lw_post</scheme>
-      <scheme>rrtmg_sw_pre</scheme>
+      <scheme>rad_sw_pre</scheme>
       <scheme>rrtmg_sw</scheme>
       <scheme>rrtmg_sw_post</scheme>
       <scheme>GFS_rrtmg_post</scheme>

diff --git a/ccpp/suites/suite_HAFS_v0_hwrf_thompson.xml b/ccpp/suites/suite_HAFS_v0_hwrf_thompson.xml
@@ -19,7 +19,7 @@
       <scheme>rrtmg_lw_pre</scheme>
       <scheme>rrtmg_lw</scheme>
       <scheme>rrtmg_lw_post</scheme>
-      <scheme>rrtmg_sw_pre</scheme>
+      <scheme>rad_sw_pre</scheme>
       <scheme>rrtmg_sw</scheme>
       <scheme>rrtmg_sw_post</scheme>
       <scheme>GFS_rrtmg_post</scheme>

diff --git a/ccpp/suites/suite_HAFS_v0_hwrf_thompson_ps.xml b/ccpp/suites/suite_HAFS_v0_hwrf_thompson_ps.xml
@@ -19,7 +19,7 @@
       <scheme>rrtmg_lw_pre</scheme>
       <scheme>rrtmg_lw</scheme>
       <scheme>rrtmg_lw_post</scheme>
-      <scheme>rrtmg_sw_pre</scheme>
+      <scheme>rad_sw_pre</scheme>
       <scheme>rrtmg_sw</scheme>
       <scheme>rrtmg_sw_post</scheme>
       <scheme>GFS_rrtmg_post</scheme>

diff --git a/ccpp/suites/suite_SCM_GFS_v15p2.xml b/ccpp/suites/suite_SCM_GFS_v15p2.xml
@@ -14,7 +14,7 @@
       <scheme>GFS_suite_interstitial_rad_reset</scheme>
       <scheme>GFS_rrtmg_pre</scheme>
       <scheme>GFS_radiation_surface</scheme>
-      <scheme>rrtmg_sw_pre</scheme>
+      <scheme>rad_sw_pre</scheme>
       <scheme>rrtmg_sw</scheme>
       <scheme>rrtmg_sw_post</scheme>
       <scheme>rrtmg_lw_pre</scheme>

diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_ACM_ps.xml b/ccpp/suites/suite_SCM_GFS_v15p2_ACM_ps.xml
@@ -14,7 +14,7 @@
       <scheme>GFS_suite_interstitial_rad_reset</scheme>
       <scheme>GFS_rrtmg_pre</scheme>
       <scheme>GFS_radiation_surface</scheme>
-      <scheme>rrtmg_sw_pre</scheme>
+      <scheme>rad_sw_pre</scheme>
       <scheme>rrtmg_sw</scheme>
       <scheme>rrtmg_sw_post</scheme>
       <scheme>rrtmg_lw_pre</scheme>

diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_FA.xml b/ccpp/suites/suite_SCM_GFS_v15p2_FA.xml
@@ -14,7 +14,7 @@
       <scheme>GFS_suite_interstitial_rad_reset</scheme>
       <scheme>GFS_rrtmg_pre</scheme>
       <scheme>GFS_radiation_surface</scheme>
-      <scheme>rrtmg_sw_pre</scheme>
+      <scheme>rad_sw_pre</scheme>
       <scheme>rrtmg_sw</scheme>
       <scheme>rrtmg_sw_post</scheme>
       <scheme>rrtmg_lw_pre</scheme>

diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_MYJ.xml b/ccpp/suites/suite_SCM_GFS_v15p2_MYJ.xml
@@ -14,7 +14,7 @@
       <scheme>GFS_suite_interstitial_rad_reset</scheme>
       <scheme>GFS_rrtmg_pre</scheme>
       <scheme>GFS_radiation_surface</scheme>
-      <scheme>rrtmg_sw_pre</scheme>
+      <scheme>rad_sw_pre</scheme>
       <scheme>rrtmg_sw</scheme>
       <scheme>rrtmg_sw_post</scheme>
       <scheme>rrtmg_lw_pre</scheme>

diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_RRTMGP.xml b/ccpp/suites/suite_SCM_GFS_v15p2_RRTMGP.xml
@@ -14,18 +14,18 @@
       <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_rrtmgp_cloud_mp</scheme>
+      <scheme>GFS_rrtmgp_cloud_overlap</scheme>
       <scheme>GFS_cloud_diagnostics</scheme>
-      <scheme>GFS_rrtmgp_sw_pre</scheme>
+      <scheme>rad_sw_pre</scheme>
+      <scheme>rrtmgp_aerosol_optics</scheme>
       <scheme>rrtmgp_sw_gas_optics</scheme>
-      <scheme>rrtmgp_sw_aerosol_optics</scheme>
       <scheme>rrtmgp_sw_cloud_optics</scheme>
       <scheme>rrtmgp_sw_cloud_sampling</scheme>
       <scheme>rrtmgp_sw_rte</scheme>
       <scheme>GFS_rrtmgp_sw_post</scheme>
       <scheme>rrtmgp_lw_pre</scheme>
       <scheme>rrtmgp_lw_gas_optics</scheme>
-      <scheme>rrtmgp_lw_aerosol_optics</scheme>
       <scheme>rrtmgp_lw_cloud_optics</scheme>
       <scheme>rrtmgp_lw_cloud_sampling</scheme>
       <scheme>rrtmgp_lw_rte</scheme>

diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_RRTMGP_ps.xml b/ccpp/suites/suite_SCM_GFS_v15p2_RRTMGP_ps.xml
@@ -14,18 +14,18 @@
       <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_rrtmgp_cloud_mp</scheme>
+      <scheme>GFS_rrtmgp_cloud_overlap</scheme>
       <scheme>GFS_cloud_diagnostics</scheme>
-      <scheme>GFS_rrtmgp_sw_pre</scheme>
+      <scheme>rad_sw_pre</scheme>
+      <scheme>rrtmgp_aerosol_optics</scheme>
       <scheme>rrtmgp_sw_gas_optics</scheme>
-      <scheme>rrtmgp_sw_aerosol_optics</scheme>
       <scheme>rrtmgp_sw_cloud_optics</scheme>
       <scheme>rrtmgp_sw_cloud_sampling</scheme>
       <scheme>rrtmgp_sw_rte</scheme>
       <scheme>GFS_rrtmgp_sw_post</scheme>
       <scheme>rrtmgp_lw_pre</scheme>
       <scheme>rrtmgp_lw_gas_optics</scheme>
-      <scheme>rrtmgp_lw_aerosol_optics</scheme>
       <scheme>rrtmgp_lw_cloud_optics</scheme>
       <scheme>rrtmgp_lw_cloud_sampling</scheme>
       <scheme>rrtmgp_lw_rte</scheme>

diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_YSU_ps.xml b/ccpp/suites/suite_SCM_GFS_v15p2_YSU_ps.xml
@@ -14,7 +14,7 @@
       <scheme>GFS_suite_interstitial_rad_reset</scheme>
       <scheme>GFS_rrtmg_pre</scheme>
       <scheme>GFS_radiation_surface</scheme>
-      <scheme>rrtmg_sw_pre</scheme>
+      <scheme>rad_sw_pre</scheme>
       <scheme>rrtmg_sw</scheme>
       <scheme>rrtmg_sw_post</scheme>
       <scheme>rrtmg_lw_pre</scheme>

diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_no_nsst.xml b/ccpp/suites/suite_SCM_GFS_v15p2_no_nsst.xml
@@ -14,7 +14,7 @@
       <scheme>GFS_suite_interstitial_rad_reset</scheme>
       <scheme>GFS_rrtmg_pre</scheme>
       <scheme>GFS_radiation_surface</scheme>
-      <scheme>rrtmg_sw_pre</scheme>
+      <scheme>rad_sw_pre</scheme>
       <scheme>rrtmg_sw</scheme>
       <scheme>rrtmg_sw_post</scheme>
       <scheme>rrtmg_lw_pre</scheme>

diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_no_nsst_ps.xml b/ccpp/suites/suite_SCM_GFS_v15p2_no_nsst_ps.xml
@@ -14,7 +14,7 @@
       <scheme>GFS_suite_interstitial_rad_reset</scheme>
       <scheme>GFS_rrtmg_pre</scheme>
       <scheme>GFS_radiation_surface</scheme>
-      <scheme>rrtmg_sw_pre</scheme>
+      <scheme>rad_sw_pre</scheme>
       <scheme>rrtmg_sw</scheme>
       <scheme>rrtmg_sw_post</scheme>
       <scheme>rrtmg_lw_pre</scheme>

diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_noahmp.xml b/ccpp/suites/suite_SCM_GFS_v15p2_noahmp.xml
@@ -14,7 +14,7 @@
       <scheme>GFS_suite_interstitial_rad_reset</scheme>
       <scheme>GFS_rrtmg_pre</scheme>
       <scheme>GFS_radiation_surface</scheme>
-      <scheme>rrtmg_sw_pre</scheme>
+      <scheme>rad_sw_pre</scheme>
       <scheme>rrtmg_sw</scheme>
       <scheme>rrtmg_sw_post</scheme>
       <scheme>rrtmg_lw_pre</scheme>

diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_ps.xml b/ccpp/suites/suite_SCM_GFS_v15p2_ps.xml
@@ -14,7 +14,7 @@
       <scheme>GFS_suite_interstitial_rad_reset</scheme>
       <scheme>GFS_rrtmg_pre</scheme>
       <scheme>GFS_radiation_surface</scheme>
-      <scheme>rrtmg_sw_pre</scheme>
+      <scheme>rad_sw_pre</scheme>
       <scheme>rrtmg_sw</scheme>
       <scheme>rrtmg_sw_post</scheme>
       <scheme>rrtmg_lw_pre</scheme>

diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_saYSU_ps.xml b/ccpp/suites/suite_SCM_GFS_v15p2_saYSU_ps.xml
@@ -14,7 +14,7 @@
       <scheme>GFS_suite_interstitial_rad_reset</scheme>
       <scheme>GFS_rrtmg_pre</scheme>
       <scheme>GFS_radiation_surface</scheme>
-      <scheme>rrtmg_sw_pre</scheme>
+      <scheme>rad_sw_pre</scheme>
       <scheme>rrtmg_sw</scheme>
       <scheme>rrtmg_sw_post</scheme>
       <scheme>rrtmg_lw_pre</scheme>

diff --git a/ccpp/suites/suite_SCM_GFS_v16.xml b/ccpp/suites/suite_SCM_GFS_v16.xml
@@ -14,7 +14,7 @@
       <scheme>GFS_suite_interstitial_rad_reset</scheme>
       <scheme>GFS_rrtmg_pre</scheme>
       <scheme>GFS_radiation_surface</scheme>
-      <scheme>rrtmg_sw_pre</scheme>
+      <scheme>rad_sw_pre</scheme>
       <scheme>rrtmg_sw</scheme>
       <scheme>rrtmg_sw_post</scheme>
       <scheme>rrtmg_lw_pre</scheme>
+19 −10		scripts/metadata2html.py
+43 −0		scripts/metadata_table.py
+0 −1		src/CMakeLists.txt
+0 −27		src/ccpp_api.F90
+0 −230		test/nemsfv3gfs/regression_test_nemsfv3gfs.py
+0 −32		test/nemsfv3gfs/regression_test_nemsfv3gfs_cheyenne.cfg
+0 −32		test/nemsfv3gfs/regression_test_nemsfv3gfs_macbook_dom.cfg
+0 −6		test/nemsfv3gfs/setenv_cheyenne.sh