Merge pull request NOAA-EMC#2 from climbfuji/merra2_thompson_updates_…

…dom_20211018 Merra2 thompson updates dom 20211018
ChunxiZhang-NOAA · Oct 18, 2021 · 433b3b3 · 433b3b3
2 parents ed900f2 + d11a8fa
commit 433b3b3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/ccpp/driver/GFS_diagnostics.F90 b/ccpp/driver/GFS_diagnostics.F90
@@ -3209,7 +3209,9 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
       do nb = 1,nblks
         ExtDiag(idx)%data(nb)%var3 => Statein(nb)%qgrs(:,:,Model%ntwa)
       enddo
+    endif
 
+    if (Model%ltaerosol) then
       idx = idx + 1
       ExtDiag(idx)%axes = 2
       ExtDiag(idx)%name = 'nwfa2d'
@@ -3233,7 +3235,9 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
       do nb = 1,nblks
         ExtDiag(idx)%data(nb)%var3 => Statein(nb)%qgrs(:,:,Model%ntia)
       enddo
+    endif
 
+    if (Model%ltaerosol) then
       idx = idx + 1
       ExtDiag(idx)%axes = 2
       ExtDiag(idx)%name = 'nifa2d'

diff --git a/ccpp/physics b/ccpp/physics
+2 −2		physics/GFS_PBL_generic.F90
+4 −4		physics/GFS_cloud_diagnostics.meta
+1 −2		physics/GFS_rrtmg_pre.F90
+4 −4		physics/GFS_rrtmgp_cloud_overlap_pre.meta
+4 −4		physics/GFS_rrtmgp_gfdlmp_pre.meta
+2 −2		physics/GFS_rrtmgp_lw_post.meta
+21 −4		physics/GFS_rrtmgp_pre.F90
+31 −4		physics/GFS_rrtmgp_pre.meta
+2 −2		physics/GFS_rrtmgp_sw_post.meta
+4 −4		physics/GFS_rrtmgp_thompsonmp_pre.meta
+4 −4		physics/GFS_rrtmgp_zhaocarr_pre.meta
+16 −20		physics/GFS_suite_interstitial.F90
+0 −32		physics/GFS_suite_interstitial.meta
+28 −38		physics/dcyc2.f
+10 −19		physics/dcyc2.meta
+2 −0		physics/module_MYNNPBL_wrapper.F90
+17 −14		physics/module_mp_thompson.F90
+100 −19		physics/mp_thompson.F90
+4 −4		physics/rrtmgp_lw_aerosol_optics.meta
+2 −2		physics/rrtmgp_lw_cloud_optics.meta
+9 −4		physics/rrtmgp_lw_gas_optics.F90
+22 −4		physics/rrtmgp_lw_gas_optics.meta
+1 −1		physics/rrtmgp_lw_rte.F90
+2 −2		physics/rrtmgp_lw_rte.meta
+66 −66		physics/rrtmgp_sampling.F90
+4 −4		physics/rrtmgp_sw_aerosol_optics.meta
+2 −2		physics/rrtmgp_sw_gas_optics.F90
+4 −4		physics/rrtmgp_sw_gas_optics.meta
+4 −4		physics/rrtmgp_sw_rte.meta