update CICE branch

DeniseWorthen · Sep 24, 2024 · e2b982a · e2b982a
1 parent a13b87e
commit e2b982a
Show file tree

Hide file tree

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

diff --git a/CICE-interface/CICE b/CICE-interface/CICE
+ −		LICENSE.pdf
+5 −5		cice.setup
+1 −1		cicecore/cicedyn/dynamics/ice_dyn_core1d.F90
+6 −6		cicecore/cicedyn/dynamics/ice_dyn_evp.F90
+3 −0		cicecore/cicedyn/general/ice_forcing.F90
+6 −3		cicecore/cicedyn/general/ice_init.F90
+18 −18		cicecore/cicedyn/infrastructure/comm/mpi/ice_gather_scatter.F90
+16 −16		cicecore/cicedyn/infrastructure/comm/serial/ice_gather_scatter.F90
+60 −58		cicecore/cicedyn/infrastructure/ice_domain.F90
+12 −2		cicecore/cicedyn/infrastructure/ice_grid.F90
+33 −1		cicecore/cicedyn/infrastructure/ice_memusage.F90
+7 −4		cicecore/cicedyn/infrastructure/io/io_binary/ice_restart.F90
+29 −0		cicecore/cicedyn/infrastructure/io/io_netcdf/ice_history_write.F90
+22 −0		cicecore/cicedyn/infrastructure/io/io_netcdf/ice_restart.F90
+8 −2		cicecore/cicedyn/infrastructure/io/io_pio2/ice_pio.F90
+1 −6		cicecore/cicedyn/infrastructure/io/io_pio2/ice_restart.F90
+2 −2		cicecore/drivers/direct/hadgem3/CICE.F90
+2 −2		cicecore/drivers/mct/cesm1/CICE_copyright.txt
+2 −2		cicecore/drivers/nuopc/cmeps/CICE_copyright.txt
+5 −5		cicecore/drivers/nuopc/cmeps/cice_wrapper_mod.F90
+11 −5		cicecore/drivers/nuopc/cmeps/ice_comp_nuopc.F90
+4 −0		cicecore/drivers/nuopc/cmeps/ice_prescribed_mod.F90
+2 −2		cicecore/drivers/nuopc/cmeps/ice_shr_methods.F90
+2 −2		cicecore/drivers/nuopc/dmi/CICE.F90
+2 −2		cicecore/drivers/standalone/cice/CICE.F90
+2 −2		cicecore/drivers/unittest/opticep/CICE.F90
+436 −650		cicecore/shared/ice_distribution.F90
+1 −10		cicecore/shared/ice_domain_size.F90
+1 −1		cicecore/version.txt
+25 −0		configuration/scripts/cice.batch.csh
+12 −0		configuration/scripts/cice.launch.csh
+2 −1		configuration/scripts/cice_decomp.csh
+56 −0		configuration/scripts/ciceplots.csh
+148 −0		configuration/scripts/ciceplots2d.py
+2 −1		configuration/scripts/ice_in
+1 −1		configuration/scripts/machines/Macros.compy_intel
+73 −0		configuration/scripts/machines/Macros.gadi_intel
+1 −1		configuration/scripts/machines/Macros.gaffney_gnu
+1 −1		configuration/scripts/machines/Macros.gaffney_intel
+1 −1		configuration/scripts/machines/Macros.izumi_nag
+1 −1		configuration/scripts/machines/Macros.koehr_intel
+1 −1		configuration/scripts/machines/Macros.mustang_intel18
+1 −1		configuration/scripts/machines/Macros.mustang_intel19
+1 −1		configuration/scripts/machines/Macros.mustang_intel20
+1 −1		configuration/scripts/machines/env.chicoma_intel
+56 −0		configuration/scripts/machines/env.gadi_intel
+4 −3		configuration/scripts/machines/env.hera_intel
+3 −0		configuration/scripts/machines/environment.yml
+2 −0		configuration/scripts/options/set_nml.congel
+7 −0		configuration/scripts/options/set_nml.run8year
+2 −0		configuration/scripts/tests/base_suite.ts
+27 −24		configuration/scripts/tests/decomp_suite.ts
+9 −9		configuration/scripts/tests/first_suite.ts
+27 −27		configuration/scripts/tests/gridsys_suite.ts
+24 −24		configuration/scripts/tests/perf_suite.ts
+1 −1		configuration/scripts/tests/prod_suite.ts
+13 −0		configuration/scripts/tests/unittest_suite.ts
+0 −129		configuration/scripts/timeseries.csh
+59 −41		configuration/scripts/timeseries.py
+3 −3		doc/source/conf.py
+3 −2		doc/source/developer_guide/dg_scripts.rst
+1 −1		doc/source/intro/copyright.rst
+1 −2		doc/source/science_guide/sg_coupling.rst
+21 −19		doc/source/science_guide/sg_dynamics.rst
+8 −1		doc/source/user_guide/ug_case_settings.rst
+16 −11		doc/source/user_guide/ug_implementation.rst
+42 −64		doc/source/user_guide/ug_running.rst
+1 −1		icepack