Changes to Logging and Initialization of the CLM Lake Model (Includi…

…ng PR#1863) (#1844) * Changes to logging and initialization of the CLM Lake Model. * merge ccpp-physics #91 (UFS-SRW v3.0.0 SciDoc updates) 1. Use ice thickness hice(i) to find the level in the lake where ice is zero. 2. Do not allow lake temperature to be below freezing point if there is no ice. 3. If there is no snow or ice, do not allow surface lake temperature to be below freezing point. These changes fixed the problem with large errors in the energy budget at the beginning of the cold-start run with lakes. 4. Added flag to turn on debug print statements in the CLM lake model. * explicitly turn of frac_ice for flake * t_grnd(i) should be t_grnd(c) ------------------------------------------------------------------- Co-authored-by: Samuel Trahan <samuel.trahan@noaa.gov> Co-authored-by: Grant Firl <grant.firl@noaa.gov>
ufs-community · Aug 22, 2023 · bef8280 · bef8280
1 parent 0eee0a8
commit bef8280
Show file tree

Hide file tree

Showing 12 changed files with 4,936 additions and 5,255 deletions.
diff --git a/FV3 b/FV3
diff --git a/tests/bl_date.conf b/tests/bl_date.conf
@@ -1,2 +1,2 @@
-export BL_DATE=20230816
+export BL_DATE=20230818
 
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -507,7 +507,7 @@ export LKM=0 # 0=no lake, 1=run lake model, 2=run both lake and nsst on lake poi
 export IOPT_LAKE=2 # 1=flake, 2=clm lake
 export LAKEFRAC_THRESHOLD=0.0 # lake fraction must be higher for lake model to run it
 export LAKEDEPTH_THRESHOLD=1.0 # lake must be deeper (in meters) for a lake model to run it
-export FRAC_ICE=.false.
+export FRAC_ICE=.true. # should be false for flake, true for clm_lake
 
 export CPL=.false.
 export CPLCHM=.false.

diff --git a/tests/logs/RegressionTests_acorn.log b/tests/logs/RegressionTests_acorn.log
diff --git a/tests/logs/RegressionTests_cheyenne.log b/tests/logs/RegressionTests_cheyenne.log
diff --git a/tests/logs/RegressionTests_gaea.log b/tests/logs/RegressionTests_gaea.log
diff --git a/tests/logs/RegressionTests_hera.log b/tests/logs/RegressionTests_hera.log
diff --git a/tests/logs/RegressionTests_orion.log b/tests/logs/RegressionTests_orion.log
diff --git a/tests/parm/control_flake.nml.IN b/tests/parm/control_flake.nml.IN
@@ -111,7 +111,7 @@ deflate_level=1
   lakefrac_threshold = @[LAKEFRAC_THRESHOLD] ! 0.15
   lakedepth_threshold = @[LAKEDEPTH_THRESHOLD] ! 0.5
   clm_lake_debug = .false.
-
+  frac_ice = @[FRAC_ICE] ! false for flake, true for clm lake
   fhzero       = 6
   h2o_phys     = .true.
   ldiag3d      = .false.

diff --git a/tests/tests/control_flake b/tests/tests/control_flake
@@ -33,6 +33,7 @@ export RESTART_INTERVAL=6
 
 export LKM=1
 export IOPT_LAKE=1
+export FRAC_ICE=.false.
 
 export DO_SPPT=.true.
 export DO_SHUM=.true.

diff --git a/tests/tests/control_flake_debug b/tests/tests/control_flake_debug
@@ -30,6 +30,7 @@ export OUTPUT_FH="0 1"
 
 export LKM=1
 export IOPT_LAKE=1
+export FRAC_ICE=.false.
 
 export DO_SPPT=.true.
 export DO_SHUM=.true.

diff --git a/tests/tests/rap_flake_debug b/tests/tests/rap_flake_debug
@@ -33,6 +33,7 @@ export CCPP_SUITE=FV3_RAP_flake
 export INPUT_NML=rap.nml.IN
 export FIELD_TABLE=field_table_thompson_aero_tke
 export DIAG_TABLE=diag_table_rap
+export FRAC_ICE=.false.
 
 export IMP_PHYSICS=8
 export DNATS=0
+6 −2		ccpp/data/GFS_typedefs.F90
+6 −0		ccpp/data/GFS_typedefs.meta
+2 −2		ccpp/driver/GFS_diagnostics.F90
+1 −1		ccpp/physics
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1,2 @@
		export BL_DATE=20230816
		export BL_DATE=20230818