ufs-community · DeniseWorthen · Sep 20, 2021 · Mar 27, 2021 · Mar 27, 2021 · Mar 27, 2021
diff --git a/CICE-interface/CICE b/CICE-interface/CICE
diff --git a/CICE-interface/cice_files.cmake b/CICE-interface/cice_files.cmake
@@ -22,6 +22,7 @@ list(APPEND cice_shared_files
   CICE/cicecore/cicedynB/analysis/ice_history_mechred.F90
   CICE/cicecore/cicedynB/analysis/ice_history_pond.F90
   CICE/cicecore/cicedynB/analysis/ice_history_shared.F90
+  CICE/cicecore/cicedynB/analysis/ice_history_snow.F90
 
   #Dynamics List:
   CICE/cicecore/cicedynB/dynamics/ice_dyn_eap.F90
@@ -74,6 +75,7 @@ list(APPEND icepack_files
   CICE/icepack/columnphysics/icepack_orbital.F90
   CICE/icepack/columnphysics/icepack_parameters.F90
   CICE/icepack/columnphysics/icepack_shortwave.F90
+  CICE/icepack/columnphysics/icepack_snow.F90
   CICE/icepack/columnphysics/icepack_therm_0layer.F90
   CICE/icepack/columnphysics/icepack_therm_bl99.F90
   CICE/icepack/columnphysics/icepack_therm_itd.F90

diff --git a/tests/RegressionTests_cheyenne.gnu.log b/tests/RegressionTests_cheyenne.gnu.log
diff --git a/tests/RegressionTests_cheyenne.intel.log b/tests/RegressionTests_cheyenne.intel.log
diff --git a/tests/RegressionTests_gaea.intel.log b/tests/RegressionTests_gaea.intel.log
diff --git a/tests/RegressionTests_hera.gnu.log b/tests/RegressionTests_hera.gnu.log
diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log
diff --git a/tests/RegressionTests_jet.intel.log b/tests/RegressionTests_jet.intel.log
diff --git a/tests/RegressionTests_orion.intel.log b/tests/RegressionTests_orion.intel.log
diff --git a/tests/RegressionTests_wcoss_cray.log b/tests/RegressionTests_wcoss_cray.log
diff --git a/tests/RegressionTests_wcoss_dell_p3.log b/tests/RegressionTests_wcoss_dell_p3.log
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -403,7 +403,7 @@ fi
 WLCLK_dflt=30
 # Longer default walltime on Gaea
 if [[ $MACHINE_ID = gaea.* ]]; then
-  WLCLK_dflt=120
+  WLCLK_dflt=180
 fi
 
 export WLCLK=$WLCLK_dflt

diff --git a/tests/fv3_conf/compile_slurm.IN_gaea b/tests/fv3_conf/compile_slurm.IN_gaea
@@ -7,7 +7,7 @@
 #SBATCH --partition=eslogin
 #SBATCH --nodes=1
 #SBATCH --ntasks-per-node=8
-#SBATCH --time=30
+#SBATCH --time=180
 #SBATCH --job-name="@[JBNME]"
 
 set -eux

diff --git a/tests/parm/ice_in_template b/tests/parm/ice_in_template
@@ -93,7 +93,7 @@
     kdyn            = 1
     ndte            = 120
     revised_evp     = .false.
-    kevp_kernel     = 0
+    evp_algorithm   = 'standard_2d'
     brlx            = 300.0
     arlx            = 300.0
     ssh_stress      = 'coupled'
@@ -138,6 +138,10 @@
     pndaspect       = 0.8
 /
 
+&snow_nml
+    snwredist       = 'none'
+/
+
 &forcing_nml
     formdrag        = .false.
     atmbndy         = 'default'

diff --git a/tests/rt.sh b/tests/rt.sh
@@ -415,7 +415,7 @@ if [[ $TESTS_FILE =~ '35d' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20210907
+BL_DATE=20210915
 if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]]; then
   RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
 else