diff --git a/.gitmodules b/.gitmodules index a3775fc12d..9c6e0d219f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,8 +28,10 @@ branch = dev/emc [submodule "CICE"] path = CICE-interface/CICE - url = https://github.com/NOAA-EMC/CICE - branch = emc/develop + #url = https://github.com/NOAA-EMC/CICE + #branch = emc/develop + url = https://github.com/DeniseWorthen/CICE + branch = feature/updcice [submodule "CDEPS"] path = CDEPS-interface/CDEPS url = https://github.com/NOAA-EMC/CDEPS diff --git a/CICE-interface/CICE b/CICE-interface/CICE index d41c61dd33..84427a6d5a 160000 --- a/CICE-interface/CICE +++ b/CICE-interface/CICE @@ -1 +1 @@ -Subproject commit d41c61dd332d5803d31408be1b9e8ef611856049 +Subproject commit 84427a6d5a73b764d89d4092e9d8b56da475e7f5 diff --git a/CICE-interface/cice_files.cmake b/CICE-interface/cice_files.cmake index 4b0b2f7421..e8114bfd4e 100644 --- a/CICE-interface/cice_files.cmake +++ b/CICE-interface/cice_files.cmake @@ -86,7 +86,6 @@ list(APPEND icepack_files CICE/icepack/columnphysics/icepack_wavefracspec.F90 CICE/icepack/columnphysics/icepack_zbgc.F90 CICE/icepack/columnphysics/icepack_zbgc_shared.F90 - CICE/icepack/columnphysics/icepack_zsalinity.F90 ) list(APPEND cice_shared_files_c