From bcdb838e0b134cadd21e9cac98e0c480eb4fe6dd Mon Sep 17 00:00:00 2001 From: Nick Szapiro Date: Mon, 13 May 2024 16:28:20 +0000 Subject: [PATCH] Revert .gitmodules and update CICE hash --- .gitmodules | 10 ++++------ CICE-interface/CICE | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.gitmodules b/.gitmodules index 600a8c2625..a3775fc12d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -24,14 +24,12 @@ branch = emc/develop [submodule "MOM6"] path = MOM6-interface/MOM6 - #url = https://github.com/NOAA-EMC/MOM6 - #branch = dev/emc - url = https://github.com/jiandewang/MOM6 - branch = feature/update-to-main-20240508 + url = https://github.com/NOAA-EMC/MOM6 + branch = dev/emc [submodule "CICE"] path = CICE-interface/CICE - url = https://github.com/NickSzapiro-NOAA/CICE - branch = cice_sync + url = https://github.com/NOAA-EMC/CICE + branch = emc/develop [submodule "CDEPS"] path = CDEPS-interface/CDEPS url = https://github.com/NOAA-EMC/CDEPS diff --git a/CICE-interface/CICE b/CICE-interface/CICE index 500073c608..9c0cd8d3ba 160000 --- a/CICE-interface/CICE +++ b/CICE-interface/CICE @@ -1 +1 @@ -Subproject commit 500073c60809f6f887194d3e79c1d632d1b5ed26 +Subproject commit 9c0cd8d3ba5963d01711094a3c81b6358fcb8367