Various CCPP PRs: change vertical dimension and long name of dku/dkt,…

… UGWP bugfixes, LTP bugfixes, sfcsub update, framework update (ufs-community#291) * ugwpv1_gsldrag bug fixes, and GFS_typdefs updates associated with diag flags for ugwpv1_gsldrag and GFS_DCNV_generic.F90 * Change vertical dimension of arrays atmosphere_heat_diffusivity (aka dkt) and atmosphere_momentum_diffusivity (aka dku), update long names * Updaate .gitmodules and submodule pointers for ccpp-framework and ccpp-physics for code review and testing * Update descriptions of dku and dkt in ccpp/driver/GFS_diagnostics.F90 to match what is in the CCPP metadata * Revert .gitmodules and update submodule pointers for ccpp-framework and ccpp-physics Co-authored-by: Michael Toy <[email protected]>
NOAA-PSL · Apr 28, 2021 · 28888f0 · 28888f0
1 parent 6c529fa
commit 28888f0
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 18 deletions.
diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90
@@ -5779,8 +5779,7 @@ subroutine diag_create (Diag, IM, Model)
       allocate (Diag%tav_ugwp  (IM,Model%levs) )
     endif
 
-    if (Model%do_ugwp_v1 .or. Model%gwd_opt==33 .or. Model%gwd_opt==22 &
-                         .or. Model%gwd_opt==3  .or. Model%gwd_opt==2) then
+    if (Model%do_ugwp_v1 .or. Model%gwd_opt==33 .or. Model%gwd_opt==22) then
       allocate (Diag%dudt_ogw  (IM,Model%levs))
       allocate (Diag%dvdt_ogw  (IM,Model%levs))
       allocate (Diag%dudt_obl  (IM,Model%levs))
@@ -5805,8 +5804,8 @@ subroutine diag_create (Diag, IM, Model)
     allocate (Diag%refl_10cm(IM,Model%levs))
 
     !--- New PBL Diagnostics
-    allocate (Diag%dkt(IM,Model%levs-1))
-    allocate (Diag%dku(IM,Model%levs-1))
+    allocate (Diag%dkt(IM,Model%levs))
+    allocate (Diag%dku(IM,Model%levs))
 
     !--  New max hourly diag.
     allocate (Diag%refdmax(IM))
@@ -6051,8 +6050,7 @@ subroutine diag_phys_zero (Diag, Model, linit, iauwindow_center)
     Diag%dtdt_gw     = zero
     Diag%kdis_gw     = zero
 
-    if (Model%do_ugwp_v1 .or. Model%gwd_opt==33 .or. Model%gwd_opt==22 &
-                         .or. Model%gwd_opt==3  .or. Model%gwd_opt==2) then
+    if (Model%do_ugwp_v1 .or. Model%gwd_opt==33 .or. Model%gwd_opt==22) then
       Diag%dudt_ogw    = zero
       Diag%dvdt_ogw    = zero
       Diag%dudt_obl    = zero
@@ -6539,8 +6537,7 @@ subroutine interstitial_create (Interstitial, IM, Model)
     allocate (Interstitial%zngw            (IM)           )
 
 ! CIRES UGWP v1
-    if (Model%do_ugwp_v1 .or. Model%gwd_opt==33 .or. Model%gwd_opt==22 &
-                         .or. Model%gwd_opt==3  .or. Model%gwd_opt==2) then
+    if (Model%do_ugwp_v1) then
       allocate (Interstitial%dudt_ngw        (IM,Model%levs))
       allocate (Interstitial%dvdt_ngw        (IM,Model%levs))
       allocate (Interstitial%dtdt_ngw        (IM,Model%levs))
@@ -7149,8 +7146,7 @@ subroutine interstitial_phys_reset (Interstitial, Model)
     Interstitial%zngw            = clear_val
 
 ! CIRES UGWP v1
-    if (Model%do_ugwp_v1 .or. Model%gwd_opt==33 .or. Model%gwd_opt==22 &
-                         .or. Model%gwd_opt==3  .or. Model%gwd_opt==2) then
+    if (Model%do_ugwp_v1) then
       Interstitial%dudt_ngw        = clear_val
       Interstitial%dvdt_ngw        = clear_val
       Interstitial%dtdt_ngw        = clear_val

diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta
@@ -6940,16 +6940,16 @@
   kind = kind_phys
 [dkt]
   standard_name = atmosphere_heat_diffusivity
-  long_name = diffusivity for heat
+  long_name = atmospheric heat diffusivity
   units = m2 s-1
-  dimensions = (horizontal_loop_extent,vertical_dimension_minus_one)
+  dimensions = (horizontal_loop_extent,vertical_dimension)
   type = real
   kind = kind_phys
 [dku]
   standard_name = atmosphere_momentum_diffusivity
-  long_name = diffusivity for momentum
+  long_name = atmospheric momentum diffusivity
   units = m2 s-1
-  dimensions = (horizontal_loop_extent,vertical_dimension_minus_one)
+  dimensions = (horizontal_loop_extent,vertical_dimension)
   type = real
   kind = kind_phys
 [cldfra]

diff --git a/ccpp/driver/GFS_diagnostics.F90 b/ccpp/driver/GFS_diagnostics.F90
@@ -1936,7 +1936,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
     idx = idx + 1
     ExtDiag(idx)%axes = 3
     ExtDiag(idx)%name = 'dkt'
-    ExtDiag(idx)%desc = 'Eddy diffusivity for heat'
+    ExtDiag(idx)%desc = 'Atmospheric heat diffusivity'
     ExtDiag(idx)%unit = 'm2s-1'
     ExtDiag(idx)%mod_name = 'gfs_phys'
     allocate (ExtDiag(idx)%data(nblks))
@@ -1947,7 +1947,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
     idx = idx + 1
     ExtDiag(idx)%axes = 3
     ExtDiag(idx)%name = 'dku'
-    ExtDiag(idx)%desc = 'Eddy diffusivity for momentum'
+    ExtDiag(idx)%desc = 'Atmospheric momentum diffusivity'
     ExtDiag(idx)%unit = 'm2s-1'
     ExtDiag(idx)%mod_name = 'gfs_phys'
     allocate (ExtDiag(idx)%data(nblks))

diff --git a/ccpp/framework b/ccpp/framework
diff --git a/ccpp/physics b/ccpp/physics
+4 −4		physics/GFS_DCNV_generic.F90
+1 −2		physics/GFS_PBL_generic.F90
+2 −2		physics/GFS_PBL_generic.meta
+10 −10		physics/GFS_rrtmg_pre.F90
+0 −354		physics/cires_orowam2017.F90
+0 −1		physics/cires_ugwpv1_oro.F90
+1 −1		physics/module_MYJPBL_wrapper.F90
+2 −2		physics/module_MYJPBL_wrapper.meta
+1 −1		physics/moninedmf.f
+4 −4		physics/moninedmf.meta
+1 −1		physics/moninshoc.f
+2 −2		physics/moninshoc.meta
+1 −1		physics/satmedmfvdifq.F
+4 −4		physics/satmedmfvdifq.meta
+110 −83		physics/sfcsub.F
+0 −1		physics/ugwp_driver_v0.F
+26 −14		physics/ugwpv1_gsldrag.F90