Update CICE for advanced snow physics, history file timestamping and …

…history file precision (#757) * Update Icepack and CICE for advanced snow fixes * Fix history file time-stamp when inital time is not a seconds=0.0 * Fix history file precision when double precision is specified
ufs-community · Sep 20, 2021 · 2b2e861 · 2b2e861
1 parent 9007b8b
commit 2b2e861
Show file tree

Hide file tree

Showing 15 changed files with 2,388 additions and 5,492 deletions.
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
+73 −12		cicecore/cicedynB/analysis/ice_diagnostics.F90
+7 −8		cicecore/cicedynB/analysis/ice_diagnostics_bgc.F90
+136 −90		cicecore/cicedynB/analysis/ice_history.F90
+1 −1		cicecore/cicedynB/analysis/ice_history_fsd.F90
+4 −4		cicecore/cicedynB/analysis/ice_history_pond.F90
+51 −48		cicecore/cicedynB/analysis/ice_history_shared.F90
+430 −0		cicecore/cicedynB/analysis/ice_history_snow.F90
+6 −6		cicecore/cicedynB/dynamics/ice_dyn_eap.F90
+112 −115		cicecore/cicedynB/dynamics/ice_dyn_evp.F90
+1,856 −2,050		cicecore/cicedynB/dynamics/ice_dyn_evp_1d.F90
+22 −25		cicecore/cicedynB/dynamics/ice_dyn_shared.F90
+22 −22		cicecore/cicedynB/dynamics/ice_dyn_vp.F90
+21 −4		cicecore/cicedynB/dynamics/ice_transport_driver.F90
+7 −0		cicecore/cicedynB/general/ice_flux.F90
+206 −3		cicecore/cicedynB/general/ice_forcing.F90
+261 −43		cicecore/cicedynB/general/ice_init.F90
+190 −30		cicecore/cicedynB/general/ice_step_mod.F90
+132 −1		cicecore/cicedynB/infrastructure/comm/mpi/ice_boundary.F90
+14 −124		cicecore/cicedynB/infrastructure/comm/mpi/ice_gather_scatter.F90
+132 −1		cicecore/cicedynB/infrastructure/comm/serial/ice_boundary.F90
+8 −32		cicecore/cicedynB/infrastructure/comm/serial/ice_gather_scatter.F90
+1 −1		cicecore/cicedynB/infrastructure/ice_domain.F90
+39 −15		cicecore/cicedynB/infrastructure/ice_grid.F90
+615 −150		cicecore/cicedynB/infrastructure/ice_read_write.F90
+53 −8		cicecore/cicedynB/infrastructure/io/io_binary/ice_restart.F90
+95 −262		cicecore/cicedynB/infrastructure/io/io_netcdf/ice_history_write.F90
+13 −2		cicecore/cicedynB/infrastructure/io/io_netcdf/ice_restart.F90
+248 −200		cicecore/cicedynB/infrastructure/io/io_pio2/ice_history_write.F90
+52 −14		cicecore/cicedynB/infrastructure/io/io_pio2/ice_pio.F90
+17 −6		cicecore/cicedynB/infrastructure/io/io_pio2/ice_restart.F90
+1 −1		cicecore/drivers/nuopc/cmeps/ice_import_export.F90
+43 −9		cicecore/drivers/standalone/cice/CICE_InitMod.F90
+20 −7		cicecore/drivers/standalone/cice/CICE_RunMod.F90
+6 −26		cicecore/drivers/unittest/bcstchk/bcstchk.F90
+28 −5		cicecore/drivers/unittest/calchk/calchk.F90
+3 −2		cicecore/drivers/unittest/helloworld/helloworld.F90
+4 −3		cicecore/drivers/unittest/sumchk/sumchk.F90
+11 −0		cicecore/shared/ice_arrays_column.F90
+31 −2		cicecore/shared/ice_calendar.F90
+6 −0		cicecore/shared/ice_fileunits.F90
+67 −10		cicecore/shared/ice_init_column.F90
+90 −1		cicecore/shared/ice_restart_column.F90
+1 −1		cicecore/version.txt
+17 −0		configuration/scripts/cice.batch.csh
+6 −0		configuration/scripts/cice.launch.csh
+1 −1		configuration/scripts/cice.run.setup.csh
+40 −1		configuration/scripts/ice_in
+56 −0		configuration/scripts/machines/Macros.gaea_intel
+1 −1		configuration/scripts/machines/Macros.onyx_cray
+1 −1		configuration/scripts/machines/Macros.onyx_gnu
+34 −0		configuration/scripts/machines/env.gaea_intel
+7 −6		configuration/scripts/machines/env.onyx_cray
+7 −6		configuration/scripts/machines/env.onyx_gnu
+7 −6		configuration/scripts/machines/env.onyx_intel
+1 −1		configuration/scripts/options/set_nml.alt04
+1 −0		configuration/scripts/options/set_nml.evp1d
+2 −2		configuration/scripts/options/set_nml.gx1prod
+19 −0		configuration/scripts/options/set_nml.gx1prod15
+1 −0		configuration/scripts/options/set_nml.histinst
+0 −1		configuration/scripts/options/set_nml.kevp102
+9 −1		configuration/scripts/options/set_nml.qc
+7 −0		configuration/scripts/options/set_nml.run10year
+5 −0		configuration/scripts/options/set_nml.snw30percent
+10 −0		configuration/scripts/options/set_nml.snwITDrdg
+15 −0		configuration/scripts/options/set_nml.snwgrain
+9 −0		configuration/scripts/tests/QC/cice.t-test.py
+6 −3		configuration/scripts/tests/base_suite.ts
+2 −2		configuration/scripts/tests/comparelog.csh
+6 −0		configuration/scripts/tests/io_suite.ts
+4 −0		configuration/scripts/tests/prod_suite.ts
+1 −0		configuration/scripts/tests/reprosum_suite.ts
+18 −9		configuration/scripts/tests/test_unittest.script
+33 −1		doc/source/cice_index.rst
+2 −2		doc/source/conf.py
+10 −1		doc/source/developer_guide/dg_driver.rst
+14 −24		doc/source/developer_guide/dg_dynamics.rst
+1 −1		doc/source/developer_guide/dg_forcing.rst
+90 −81		doc/source/science_guide/sg_dynamics.rst
+5 −1		doc/source/science_guide/sg_tracers.rst
+ −		doc/source/user_guide/figures/CICE_Bgrid.png
+37 −2		doc/source/user_guide/ug_case_settings.rst
+27 −12		doc/source/user_guide/ug_implementation.rst
+9 −0		doc/source/user_guide/ug_testing.rst
+0 −3		doc/source/user_guide/ug_troubleshooting.rst
+1 −1		icepack