"update for CCPP-Chem p8 physics"

.gitmodules

@@ -9,7 +9,7 @@
 [submodule "ccpp/physics"]
   path = ccpp/physics
   url = https://github.com/haiqinli/ccpp-physics
-  branch = gsl/develop
+  branch = gsl/develop-chem2
 [submodule "upp"]
   path = upp
   url = https://github.com/NOAA-EMC/UPP

ccpp/config/ccpp_prebuild_config.py

@@ -234,7 +234,19 @@
     'physics/physics/GFS_cloud_diagnostics.F90',
     'physics/physics/GFS_rrtmgp_cloud_mp.F90',
     'physics/physics/GFS_rrtmgp_cloud_overlap.F90',
-    'physics/physics/GFS_rrtmgp_sw_post.F90'
+    'physics/physics/GFS_rrtmgp_sw_post.F90',
+    # Chemistry
+    'physics/gsdchem/gsd_chem_seas_wrapper.F90',
+    'physics/gsdchem/gsd_chem_dust_wrapper.F90',
+    'physics/gsdchem/gsd_chem_anthropogenic_wrapper.F90',
+    'physics/gsdchem/gsd_chem_plume_wrapper.F90',
+    'physics/gsdchem/gsd_chem_dmsemis_wrapper.F90',
+    'physics/gsdchem/gsd_chem_gocart_wrapper.F90',
+    'physics/gsdchem/gsd_chem_rad_wrapper.F90',
+    'physics/gsdchem/gsd_chem_drydep_wrapper.F90',
+    'physics/gsdchem/gsd_chem_lsdep_wrapper.F90',
+    'physics/gsdchem/gsd_chem_settling_wrapper.F90',
+    'physics/gsdchem/gsd_chem_diag_wrapper.F90'
     ]
 
 # Default build dir, relative to current working directory,

ccpp/data/CCPP_typedefs.F90

@@ -1033,7 +1033,7 @@ subroutine gfs_interstitial_setup_tracers(Interstitial, Model)
     Interstitial%ntrwx            = 0
 
     ! perform aerosol convective transport and PBL diffusion
-    Interstitial%trans_aero = Model%cplchm .and. Model%trans_trac
+    Interstitial%trans_aero = (Model%cplchm .or. Model%cplchp) .and. Model%trans_trac
 
     if (Model%imp_physics == Model%imp_physics_thompson) then
       if (Model%ltaerosol) then
@@ -1112,7 +1112,7 @@ subroutine gfs_interstitial_setup_tracers(Interstitial, Model)
       endif
     endif
 
-    if (Model%cplchm) then
+    if (Model%cplchm .or. Model%cplchp) then
       ! Only the following microphysics schemes are supported with coupled chemistry
       if (Model%imp_physics == Model%imp_physics_zhao_carr) then
         Interstitial%nvdiff = 3