Unify the usage of Diag%dkt and Interstitial%dkt and change the stand…

…ard_names for dkt/dku back to atmosphere_heat/momentum_diffusivity.
NCAR · Apr 20, 2021 · 28c815a · 28c815a
1 parent 4c84630
commit 28c815a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/physics/GFS_debug.F90 b/physics/GFS_debug.F90
@@ -657,6 +657,8 @@ subroutine GFS_diagtoscreen_run (Model, Statein, Stateout, Sfcprop, Coupling,
                      if(Model%lradar) then
                        call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Diag%refl_10cm   ',  Diag%refl_10cm)
                      end if
+                     call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Diag%dkt         ',    Diag%dkt)
+                     call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Diag%dku         ',    Diag%dku)
                      ! CCPP/MYNNPBL only
                      if (Model%do_mynnedmf) then
                        if (Model%bl_mynn_output .ne. 0) then
@@ -1068,7 +1070,6 @@ subroutine GFS_interstitialtoscreen_run (Model, Statein, Stateout, Sfcprop, Coup
                      call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%del                 ', Interstitial%del                     )
                      call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%del_gz              ', Interstitial%del_gz                  )
                      call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%delr                ', Interstitial%delr                    )
-                     call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%dkt                 ', Interstitial%dkt                     )
                      call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%dlength             ', Interstitial%dlength                 )
                      call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%dqdt                ', Interstitial%dqdt                    )
                      call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%dqsfc1              ', Interstitial%dqsfc1                  )

diff --git a/physics/moninedmf.meta b/physics/moninedmf.meta
@@ -420,7 +420,7 @@
   intent = inout
   optional = F
 [dkt]
-  standard_name = atmosphere_heat_diffusivity_from_gfspbl
+  standard_name = atmosphere_heat_diffusivity
   long_name = diffusivity for heat
   units = m2 s-1
   dimensions = (horizontal_loop_extent,vertical_dimension_minus_one)
@@ -429,7 +429,7 @@
   intent = out
   optional = F
 [dku]
-  standard_name = atmosphere_momentum_diffusivity_from_gfspbl
+  standard_name = atmosphere_momentum_diffusivity
   long_name = diffusivity for momentum
   units = m2 s-1
   dimensions = (horizontal_loop_extent,vertical_dimension_minus_one)

diff --git a/physics/satmedmfvdifq.meta b/physics/satmedmfvdifq.meta
@@ -532,7 +532,7 @@
   intent = out
   optional = F
 [dkt]
-  standard_name = atmosphere_heat_diffusivity_from_gfspbl
+  standard_name = atmosphere_heat_diffusivity
   long_name = diffusivity for heat
   units = m2 s-1
   dimensions = (horizontal_loop_extent,vertical_dimension_minus_one)
@@ -541,7 +541,7 @@
   intent = out
   optional = F
 [dku]
-  standard_name = atmosphere_momentum_diffusivity_from_gfspbl
+  standard_name = atmosphere_momentum_diffusivity
   long_name = diffusivity for momentum
   units = m2 s-1
   dimensions = (horizontal_loop_extent,vertical_dimension_minus_one)