Merge pull request #108 from grantfirl/ufs-dev-PR92

UFS-dev PR#92
NCAR · Jan 16, 2024 · c96f7fe · c96f7fe
2 parents 4f76537 + 5063b27
commit c96f7fe
Show file tree

Hide file tree

Showing 9 changed files with 768 additions and 765 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/bl_date.ncar.conf b/tests/bl_date.ncar.conf
@@ -1,2 +1,2 @@
-export BL_DATE=20240110
+export BL_DATE=20240116
 
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -501,7 +501,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_hera.log b/tests/logs/RegressionTests_hera.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