update CICE with latest consortium/main (#1562)

* 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

Co-authored-by: JONG KIM <jong.kim@noaa.gov>
Co-authored-by: Brian Curtis <brian.curtis@noaa.gov>

CICE-interface/cice_files.cmake

@@ -13,44 +13,44 @@ list(APPEND cice_shared_files
   CICE/cicecore/shared/ice_spacecurve.F90
 
   #Analysis List:
-  CICE/cicecore/cicedynB/analysis/ice_diagnostics.F90
-  CICE/cicecore/cicedynB/analysis/ice_diagnostics_bgc.F90
-  CICE/cicecore/cicedynB/analysis/ice_history.F90
-  CICE/cicecore/cicedynB/analysis/ice_history_bgc.F90
-  CICE/cicecore/cicedynB/analysis/ice_history_drag.F90
-  CICE/cicecore/cicedynB/analysis/ice_history_fsd.F90
-  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
+  CICE/cicecore/cicedyn/analysis/ice_diagnostics.F90
+  CICE/cicecore/cicedyn/analysis/ice_diagnostics_bgc.F90
+  CICE/cicecore/cicedyn/analysis/ice_history.F90
+  CICE/cicecore/cicedyn/analysis/ice_history_bgc.F90
+  CICE/cicecore/cicedyn/analysis/ice_history_drag.F90
+  CICE/cicecore/cicedyn/analysis/ice_history_fsd.F90
+  CICE/cicecore/cicedyn/analysis/ice_history_mechred.F90
+  CICE/cicecore/cicedyn/analysis/ice_history_pond.F90
+  CICE/cicecore/cicedyn/analysis/ice_history_shared.F90
+  CICE/cicecore/cicedyn/analysis/ice_history_snow.F90
 
   #Dynamics List:
-  CICE/cicecore/cicedynB/dynamics/ice_dyn_eap.F90
-  CICE/cicecore/cicedynB/dynamics/ice_dyn_evp.F90
-  CICE/cicecore/cicedynB/dynamics/ice_dyn_evp_1d.F90
-  CICE/cicecore/cicedynB/dynamics/ice_dyn_shared.F90
-  CICE/cicecore/cicedynB/dynamics/ice_dyn_vp.F90
-  CICE/cicecore/cicedynB/dynamics/ice_transport_driver.F90
-  CICE/cicecore/cicedynB/dynamics/ice_transport_remap.F90
+  CICE/cicecore/cicedyn/dynamics/ice_dyn_eap.F90
+  CICE/cicecore/cicedyn/dynamics/ice_dyn_evp.F90
+  CICE/cicecore/cicedyn/dynamics/ice_dyn_evp_1d.F90
+  CICE/cicecore/cicedyn/dynamics/ice_dyn_shared.F90
+  CICE/cicecore/cicedyn/dynamics/ice_dyn_vp.F90
+  CICE/cicecore/cicedyn/dynamics/ice_transport_driver.F90
+  CICE/cicecore/cicedyn/dynamics/ice_transport_remap.F90
 
   #General List:
-  CICE/cicecore/cicedynB/general/ice_flux.F90
-  CICE/cicecore/cicedynB/general/ice_flux_bgc.F90
-  CICE/cicecore/cicedynB/general/ice_forcing.F90
-  CICE/cicecore/cicedynB/general/ice_forcing_bgc.F90
-  CICE/cicecore/cicedynB/general/ice_init.F90
-  CICE/cicecore/cicedynB/general/ice_state.F90
-  CICE/cicecore/cicedynB/general/ice_step_mod.F90
+  CICE/cicecore/cicedyn/general/ice_flux.F90
+  CICE/cicecore/cicedyn/general/ice_flux_bgc.F90
+  CICE/cicecore/cicedyn/general/ice_forcing.F90
+  CICE/cicecore/cicedyn/general/ice_forcing_bgc.F90
+  CICE/cicecore/cicedyn/general/ice_init.F90
+  CICE/cicecore/cicedyn/general/ice_state.F90
+  CICE/cicecore/cicedyn/general/ice_step_mod.F90
 
   #Infrastructure List
-  CICE/cicecore/cicedynB/infrastructure/ice_blocks.F90
-  CICE/cicecore/cicedynB/infrastructure/ice_domain.F90
-  CICE/cicecore/cicedynB/infrastructure/ice_grid.F90
-  CICE/cicecore/cicedynB/infrastructure/ice_read_write.F90
-  CICE/cicecore/cicedynB/infrastructure/ice_restart_driver.F90
-  CICE/cicecore/cicedynB/infrastructure/ice_restoring.F90
-  CICE/cicecore/cicedynB/infrastructure/ice_memusage.F90
-  CICE/cicecore/cicedynB/infrastructure/ice_memusage_gptl.c)
+  CICE/cicecore/cicedyn/infrastructure/ice_blocks.F90
+  CICE/cicecore/cicedyn/infrastructure/ice_domain.F90
+  CICE/cicecore/cicedyn/infrastructure/ice_grid.F90
+  CICE/cicecore/cicedyn/infrastructure/ice_read_write.F90
+  CICE/cicecore/cicedyn/infrastructure/ice_restart_driver.F90
+  CICE/cicecore/cicedyn/infrastructure/ice_restoring.F90
+  CICE/cicecore/cicedyn/infrastructure/ice_memusage.F90
+  CICE/cicecore/cicedyn/infrastructure/ice_memusage_gptl.c)
 
 
 #Icepack List:
@@ -90,50 +90,50 @@ list(APPEND icepack_files
 )
 
 list(APPEND cice_shared_files_c
-  CICE/cicecore/cicedynB/infrastructure/ice_shr_reprosum86.c
+  CICE/cicecore/cicedyn/infrastructure/ice_shr_reprosum86.c
 )
 
 #-- Using MPI
 list(APPEND cice_mpi_comm_files
-  CICE/cicecore/cicedynB/infrastructure/comm/mpi/ice_boundary.F90
-  CICE/cicecore/cicedynB/infrastructure/comm/mpi/ice_broadcast.F90
-  CICE/cicecore/cicedynB/infrastructure/comm/mpi/ice_communicate.F90
-  CICE/cicecore/cicedynB/infrastructure/comm/mpi/ice_exit.F90
-  CICE/cicecore/cicedynB/infrastructure/comm/mpi/ice_gather_scatter.F90
-  CICE/cicecore/cicedynB/infrastructure/comm/mpi/ice_global_reductions.F90
-  CICE/cicecore/cicedynB/infrastructure/comm/mpi/ice_reprosum.F90
-  CICE/cicecore/cicedynB/infrastructure/comm/mpi/ice_timers.F90
+  CICE/cicecore/cicedyn/infrastructure/comm/mpi/ice_boundary.F90
+  CICE/cicecore/cicedyn/infrastructure/comm/mpi/ice_broadcast.F90
+  CICE/cicecore/cicedyn/infrastructure/comm/mpi/ice_communicate.F90
+  CICE/cicecore/cicedyn/infrastructure/comm/mpi/ice_exit.F90
+  CICE/cicecore/cicedyn/infrastructure/comm/mpi/ice_gather_scatter.F90
+  CICE/cicecore/cicedyn/infrastructure/comm/mpi/ice_global_reductions.F90
+  CICE/cicecore/cicedyn/infrastructure/comm/mpi/ice_reprosum.F90
+  CICE/cicecore/cicedyn/infrastructure/comm/mpi/ice_timers.F90
 )
 
 #-- Using Serial
 list(APPEND cice_serial_comm_files
-  CICE/cicecore/cicedynB/infrastructure/comm/serial/ice_boundary.F90
-  CICE/cicecore/cicedynB/infrastructure/comm/serial/ice_broadcast.F90
-  CICE/cicecore/cicedynB/infrastructure/comm/serial/ice_communicate.F90
-  CICE/cicecore/cicedynB/infrastructure/comm/serial/ice_exit.F90
-  CICE/cicecore/cicedynB/infrastructure/comm/serial/ice_gather_scatter.F90
-  CICE/cicecore/cicedynB/infrastructure/comm/serial/ice_global_reductions.F90
-  CICE/cicecore/cicedynB/infrastructure/comm/serial/ice_reprosum.F90
-  CICE/cicecore/cicedynB/infrastructure/comm/serial/ice_timers.F90
+  CICE/cicecore/cicedyn/infrastructure/comm/serial/ice_boundary.F90
+  CICE/cicecore/cicedyn/infrastructure/comm/serial/ice_broadcast.F90
+  CICE/cicecore/cicedyn/infrastructure/comm/serial/ice_communicate.F90
+  CICE/cicecore/cicedyn/infrastructure/comm/serial/ice_exit.F90
+  CICE/cicecore/cicedyn/infrastructure/comm/serial/ice_gather_scatter.F90
+  CICE/cicecore/cicedyn/infrastructure/comm/serial/ice_global_reductions.F90
+  CICE/cicecore/cicedyn/infrastructure/comm/serial/ice_reprosum.F90
+  CICE/cicecore/cicedyn/infrastructure/comm/serial/ice_timers.F90
 )
 
 #-- Using binary IO
 list(APPEND cice_binary_io_files
-  CICE/cicecore/cicedynB/infrastructure/io/io_binary/ice_history_write.F90
-  CICE/cicecore/cicedynB/infrastructure/io/io_binary/ice_restart.F90
+  CICE/cicecore/cicedyn/infrastructure/io/io_binary/ice_history_write.F90
+  CICE/cicecore/cicedyn/infrastructure/io/io_binary/ice_restart.F90
 )
 
 #-- Using NetCDF IO
 list(APPEND cice_netcdf_io_files
-  CICE/cicecore/cicedynB/infrastructure/io/io_netcdf/ice_history_write.F90
-  CICE/cicecore/cicedynB/infrastructure/io/io_netcdf/ice_restart.F90
+  CICE/cicecore/cicedyn/infrastructure/io/io_netcdf/ice_history_write.F90
+  CICE/cicecore/cicedyn/infrastructure/io/io_netcdf/ice_restart.F90
 )
 
 #PIO2 I/O List:
 list(APPEND cice_pio2_io_files
-  CICE/cicecore/cicedynB/infrastructure/io/io_pio2/ice_history_write.F90
-  CICE/cicecore/cicedynB/infrastructure/io/io_pio2/ice_pio.F90
-  CICE/cicecore/cicedynB/infrastructure/io/io_pio2/ice_restart.F90
+  CICE/cicecore/cicedyn/infrastructure/io/io_pio2/ice_history_write.F90
+  CICE/cicecore/cicedyn/infrastructure/io/io_pio2/ice_pio.F90
+  CICE/cicecore/cicedyn/infrastructure/io/io_pio2/ice_restart.F90
 )
 
 #-- Using NUOPC CMEPS driver