Merge branch 'develop' into rrfsv1-to-ufs/dev4

ufs-community · Dec 3, 2024 · bff2391 · bff2391
2 parents e25c84a + a3c3bb5
commit bff2391
Show file tree

Hide file tree

Showing 11 changed files with 2,057 additions and 2,152 deletions.
diff --git a/CICE-interface/CICE b/CICE-interface/CICE
diff --git a/tests/bl_date.conf b/tests/bl_date.conf
@@ -1 +1 @@
-export BL_DATE=20241121
+export BL_DATE=20241127
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -1218,6 +1218,7 @@ export_cice6() {
   CICE_DIAGFREQ=$(( (FHMAX*3600)/DT_CICE ))
   export CICE_DIAGFREQ
   export CICE_HISTFREQ_N="0, 0, 6, 0, 0"
+  export CICE_hist_suffix="'x','x','x','x','x'"
   export CICE_HIST_AVG=.true.
   export CICE_HISTORY_DIR=./history/
   export CICE_INCOND_DIR=./history/

diff --git a/tests/logs/RegressionTests_acorn.log b/tests/logs/RegressionTests_acorn.log
diff --git a/tests/logs/RegressionTests_derecho.log b/tests/logs/RegressionTests_derecho.log
diff --git a/tests/logs/RegressionTests_gaea.log b/tests/logs/RegressionTests_gaea.log
diff --git a/tests/logs/RegressionTests_hercules.log b/tests/logs/RegressionTests_hercules.log
diff --git a/tests/logs/RegressionTests_jet.log b/tests/logs/RegressionTests_jet.log
diff --git a/tests/logs/RegressionTests_orion.log b/tests/logs/RegressionTests_orion.log
diff --git a/tests/logs/RegressionTests_wcoss2.log b/tests/logs/RegressionTests_wcoss2.log
diff --git a/tests/parm/ice_in.IN b/tests/parm/ice_in.IN
@@ -50,6 +50,7 @@
     histfreq            = 'm','d','h','1','x'
     histfreq_n          = @[CICE_HISTFREQ_N]
     hist_avg            = @[CICE_HIST_AVG]
+    hist_suffix         = @[CICE_hist_suffix]
     history_dir         = '@[CICE_HISTORY_DIR]'
     history_file        = 'iceh'
     write_ic            = .true.
+2 −4		cicecore/cicedyn/general/ice_flux.F90
+0 −2		cicecore/cicedyn/general/ice_forcing.F90
+18 −8		cicecore/cicedyn/general/ice_init.F90
+12 −17		cicecore/cicedyn/general/ice_step_mod.F90
+1 −2		cicecore/cicedyn/infrastructure/ice_domain.F90
+142 −192		cicecore/cicedyn/infrastructure/ice_grid.F90
+49 −106		cicecore/cicedyn/infrastructure/ice_read_write.F90
+1 −1		cicecore/cicedyn/infrastructure/io/io_netcdf/ice_restart.F90
+6 −0		cicecore/cicedyn/infrastructure/io/io_pio2/ice_history_write.F90
+22 −0		cicecore/cicedyn/infrastructure/io/io_pio2/ice_pio.F90
+13 −4		cicecore/cicedyn/infrastructure/io/io_pio2/ice_restart.F90
+10 −12		cicecore/drivers/mct/cesm1/CICE_InitMod.F90
+1 −3		cicecore/drivers/mct/cesm1/ice_prescribed_mod.F90
+4 −4		cicecore/drivers/nuopc/cmeps/CICE_InitMod.F90
+33 −32		cicecore/drivers/nuopc/cmeps/ice_comp_nuopc.F90
+10 −1		cicecore/drivers/nuopc/cmeps/ice_shr_methods.F90
+4 −4		cicecore/drivers/nuopc/dmi/CICE_InitMod.F90
+4 −4		cicecore/drivers/standalone/cice/CICE_InitMod.F90
+4 −4		cicecore/drivers/unittest/gridavgchk/CICE_InitMod.F90
+4 −4		cicecore/drivers/unittest/halochk/CICE_InitMod.F90
+4 −4		cicecore/drivers/unittest/opticep/CICE_InitMod.F90
+1 −4		cicecore/drivers/unittest/opticep/ice_init_column.F90
+13 −18		cicecore/drivers/unittest/opticep/ice_step_mod.F90
+4 −4		cicecore/drivers/unittest/sumchk/CICE_InitMod.F90
+1 −4		cicecore/shared/ice_init_column.F90
+1 −1		cicecore/version.txt
+11 −0		configuration/scripts/cice.batch.csh
+0 −1		configuration/scripts/ice_in
+2 −2		configuration/scripts/machines/Macros.gadi_intel
+8 −0		configuration/scripts/options/set_nml.histhrly
+9 −13		configuration/scripts/tests/base_suite.ts
+3 −0		configuration/scripts/tests/io_suite.ts
+2 −2		doc/source/conf.py
+0 −1		doc/source/user_guide/ug_case_settings.rst
+17 −8		doc/source/user_guide/ug_implementation.rst
+1 −1		icepack