ufs-community · DeniseWorthen · Aug 4, 2020 · Nov 20, 2019 · Nov 22, 2019 · Nov 22, 2019
diff --git a/CICE_SRC b/CICE_SRC
diff --git a/parm/ice_in_template b/parm/ice_in_template
@@ -80,7 +80,7 @@
 &thermo_nml
     kitd              = 1
   , ktherm            = 1
-  , conduct           = 'bubbly'
+  , conduct           = 'MU71'
   , a_rapid_mode      =  0.5e-3
   , Rac_rapid_mode    =    10.0
   , aspect_rapid_mode =     1.0

diff --git a/tests/Compile_hera.intel.log b/tests/Compile_hera.intel.log
diff --git a/tests/Compile_orion.intel.log b/tests/Compile_orion.intel.log
diff --git a/tests/Compile_wcoss_dell_p3.log b/tests/Compile_wcoss_dell_p3.log
diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log
diff --git a/tests/RegressionTests_orion.intel.log b/tests/RegressionTests_orion.intel.log
diff --git a/tests/RegressionTests_wcoss_dell_p3.log b/tests/RegressionTests_wcoss_dell_p3.log
diff --git a/tests/rt.sh b/tests/rt.sh
@@ -425,7 +425,7 @@ fi
 if [[ $MACHINE_ID = cheyenne.* ]]; then
   RTPWD=${RTPWD:-$DISKNM/develop-20200210/${COMPILER^^}}
 else
-  RTPWD=${RTPWD:-$DISKNM/FV3-MOM6-CICE5/develop-20200718}
+  RTPWD=${RTPWD:-$DISKNM/FV3-MOM6-CICE5/develop-20200731}
 fi
 
 shift $((OPTIND-1))
+4 −2		lanl_cice/source/ice_shortwave.F90
+1 −0		lanl_cice_cap/cice_cap.F90