Use feature CICE branch

NickSzapiro-NOAA · Nov 18, 2024 · 3fd0332 · 3fd0332
1 parent 6b0f516
commit 3fd0332
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -28,8 +28,8 @@
   branch = dev/emc
 [submodule "CICE"]
   path = CICE-interface/CICE
-  url = https://github.com/NOAA-EMC/CICE
-  branch = develop
+  url = https://github.com/NickSzapiro-NOAA/CICE
+  branch = sync_cice_2024-11
 [submodule "CDEPS"]
   path = CDEPS-interface/CDEPS
   url = https://github.com/NOAA-EMC/CDEPS

diff --git a/CICE-interface/CICE b/CICE-interface/CICE
+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