pressure is not density and weasdi is not snodi + #739 and #742 (#736)

* pressure is not density * wrong variable sent for snodi * explain lakedepth corruption safeguards * module_sf_ruclsm.f90: explain the snow_mosaic=0 line * add flag to track new freezing lake ice grids * change name of lake_freeze to flag_lakefreeze --------- Co-authored-by: Jili Dong <[email protected]>
NOAA-EMC · Dec 21, 2023 · 87a0cca · 87a0cca
1 parent f221fc5
commit 87a0cca
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/ccpp/data/CCPP_typedefs.F90 b/ccpp/data/CCPP_typedefs.F90
@@ -140,6 +140,7 @@ module CCPP_typedefs
     logical,               pointer      :: flag_cice(:)       => null()  !<
     logical,               pointer      :: flag_guess(:)      => null()  !<
     logical,               pointer      :: flag_iter(:)       => null()  !<
+    logical,               pointer      :: flag_lakefreeze(:) => null()  !<
     real (kind=kind_phys), pointer      :: ffmm_ice(:)        => null()  !<
     real (kind=kind_phys), pointer      :: ffmm_land(:)       => null()  !<
     real (kind=kind_phys), pointer      :: ffmm_water(:)      => null()  !<
@@ -607,6 +608,7 @@ subroutine gfs_interstitial_create (Interstitial, IM, Model)
     allocate (Interstitial%flag_cice       (IM))
     allocate (Interstitial%flag_guess      (IM))
     allocate (Interstitial%flag_iter       (IM))
+    allocate (Interstitial%flag_lakefreeze (IM))
     allocate (Interstitial%ffmm_ice        (IM))
     allocate (Interstitial%ffmm_land       (IM))
     allocate (Interstitial%ffmm_water      (IM))
@@ -1297,6 +1299,7 @@ subroutine gfs_interstitial_phys_reset (Interstitial, Model)
     Interstitial%flag_cice       = .false.
     Interstitial%flag_guess      = .false.
     Interstitial%flag_iter       = .true.
+    Interstitial%flag_lakefreeze = .false.
     Interstitial%ffmm_ice        = Model%huge
     Interstitial%ffmm_land       = Model%huge
     Interstitial%ffmm_water      = Model%huge

diff --git a/ccpp/data/CCPP_typedefs.meta b/ccpp/data/CCPP_typedefs.meta
@@ -890,6 +890,12 @@
   units = flag
   dimensions = (horizontal_loop_extent)
   type = logical
+[flag_lakefreeze]
+  standard_name = flag_for_lake_water_freeze
+  long_name = flag for lake water freeze
+  units = flag
+  dimensions = (horizontal_loop_extent)
+  type = logical
 [ffmm_water]
   standard_name = Monin_Obukhov_similarity_function_for_momentum_over_water
   long_name = Monin-Obukhov similarity function for momentum over water

diff --git a/ccpp/driver/GFS_diagnostics.F90 b/ccpp/driver/GFS_diagnostics.F90
@@ -4005,12 +4005,12 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
     idx = idx + 1
     ExtDiag(idx)%axes = 2
     ExtDiag(idx)%name = 'snodi'
-    ExtDiag(idx)%desc = 'water equivalent snow depth over ice'
+    ExtDiag(idx)%desc = 'snow depth over ice'
     ExtDiag(idx)%unit = 'mm'
     ExtDiag(idx)%mod_name = 'gfs_sfc'
     allocate (ExtDiag(idx)%data(nblks))
     do nb = 1,nblks
-      ExtDiag(idx)%data(nb)%var2 => sfcprop(nb)%weasdi(:)
+      ExtDiag(idx)%data(nb)%var2 => sfcprop(nb)%snodi(:)
     enddo
 
     idx = idx + 1

diff --git a/ccpp/physics b/ccpp/physics
+3 −1		physics/GFS_surface_composites_pre.F90
+22 −10		physics/clm_lake.f90
+31 −8		physics/clm_lake.meta
+6 −16		physics/module_sf_ruclsm.F90
+3 −1		physics/sfc_diff.f
+7 −0		physics/sfc_diff.meta