Skip to content

Commit

Permalink
Update CICE with latest Consortium/main (#1672)
Browse files Browse the repository at this point in the history
* reverting the bug fix for ktherm=2 allows all cpld tests to pass
and the single datm test using ktherm=2 (datm_cdeps_gfs) to also pass
all other datm tests which use ktherm=1 fail

* confirm cice testb16d7fd is b4b for all datm/cpld tests

* update CICE and CICE gitmodule

* fix alignments in rt.conf, rt_gnu.conf
  • Loading branch information
DeniseWorthen committed Mar 29, 2023
1 parent 85dc0fd commit 7267be0
Show file tree
Hide file tree
Showing 9 changed files with 3,383 additions and 3,383 deletions.
2 changes: 1 addition & 1 deletion CICE-interface/CICE
Submodule CICE updated 33 files
+1 −1 cicecore/cicedyn/analysis/ice_history.F90
+6 −5 cicecore/cicedyn/dynamics/ice_dyn_shared.F90
+3 −1 cicecore/cicedyn/general/ice_flux.F90
+1 −1 cicecore/cicedyn/general/ice_init.F90
+4 −2 cicecore/cicedyn/general/ice_step_mod.F90
+287 −28 cicecore/cicedyn/infrastructure/comm/mpi/ice_boundary.F90
+338 −104 cicecore/cicedyn/infrastructure/comm/serial/ice_boundary.F90
+5 −1 cicecore/cicedyn/infrastructure/ice_grid.F90
+9 −8 cicecore/cicedyn/infrastructure/io/io_binary/ice_history_write.F90
+28 −7 cicecore/cicedyn/infrastructure/io/io_netcdf/ice_history_write.F90
+25 −6 cicecore/cicedyn/infrastructure/io/io_pio2/ice_history_write.F90
+6 −0 cicecore/cicedyn/infrastructure/io/io_pio2/ice_restart.F90
+2 −2 cicecore/drivers/direct/nemo_concepts/CICE_InitMod.F90
+2 −2 cicecore/drivers/standalone/cice/CICE_InitMod.F90
+472 −0 cicecore/drivers/unittest/halochk/CICE_InitMod.F90
+811 −0 cicecore/drivers/unittest/halochk/halochk.F90
+1 −2 cicecore/shared/ice_constants.F90
+4 −2 configuration/scripts/Makefile
+4 −2 configuration/scripts/cice_decomp.csh
+2 −0 configuration/scripts/options/set_env.halochk
+3 −0 configuration/scripts/options/set_nml.cyclic
+3 −0 configuration/scripts/options/set_nml.open
+3 −0 configuration/scripts/options/set_nml.tripole
+3 −0 configuration/scripts/options/set_nml.tripolet
+28 −13 configuration/scripts/tests/unittest_suite.ts
+4 −3 doc/source/cice_index.rst
+3 −0 doc/source/conf.py
+10 −0 doc/source/master_list.bib
+17 −9 doc/source/science_guide/sg_dynamics.rst
+1 −1 doc/source/user_guide/ug_case_settings.rst
+53 −10 doc/source/user_guide/ug_implementation.rst
+1 −0 doc/source/user_guide/ug_testing.rst
+1 −1 icepack
1,008 changes: 504 additions & 504 deletions tests/RegressionTests_acorn.intel.log

Large diffs are not rendered by default.

328 changes: 164 additions & 164 deletions tests/RegressionTests_cheyenne.gnu.log

Large diffs are not rendered by default.

1,022 changes: 511 additions & 511 deletions tests/RegressionTests_cheyenne.intel.log

Large diffs are not rendered by default.

1,018 changes: 509 additions & 509 deletions tests/RegressionTests_gaea.intel.log

Large diffs are not rendered by default.

330 changes: 165 additions & 165 deletions tests/RegressionTests_hera.gnu.log

Large diffs are not rendered by default.

1,048 changes: 524 additions & 524 deletions tests/RegressionTests_hera.intel.log

Large diffs are not rendered by default.

960 changes: 480 additions & 480 deletions tests/RegressionTests_jet.intel.log

Large diffs are not rendered by default.

1,050 changes: 525 additions & 525 deletions tests/RegressionTests_orion.intel.log

Large diffs are not rendered by default.

0 comments on commit 7267be0

Please sign in to comment.