From c8c77ff25670433b0bfe73e26a36257e366aa56d Mon Sep 17 00:00:00 2001 From: yuchengt900 Date: Fri, 23 Aug 2024 09:15:37 -0400 Subject: [PATCH] Update FMS and coupler to 2024.03, also update xmls --- .gitmodules | 16 ++++++++-------- src/FMS | 2 +- src/coupler | 2 +- xmls/NWA12/CEFI_NWA12_cobalt.xml | 4 ++-- xmls/NWA12/CEFI_NWA12_cobalt_fms2_yaml.xml | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.gitmodules b/.gitmodules index 1e56ab510..1476e9be7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -30,14 +30,6 @@ path = src/ice_param url = https://github.com/NOAA-GFDL/ice_param.git branch = 2024.02 -[submodule "src/FMS"] - path = src/FMS - url = https://github.com/NOAA-GFDL/FMS.git - branch = 2024.02 -[submodule "src/coupler"] - path = src/coupler - url = https://github.com/NOAA-GFDL/FMScoupler.git - branch = 2024.02 [submodule "src/ocean_BGC"] path = src/ocean_BGC url = https://github.com/NOAA-CEFI-Regional-Ocean-Modeling/ocean_BGC.git @@ -46,3 +38,11 @@ path = src/MOM6 url = https://github.com/NOAA-CEFI-Regional-Ocean-Modeling/MOM6.git branch = dev/cefi +[submodule "src/FMS"] + path = src/FMS + url = https://github.com/NOAA-GFDL/FMS.git + branch = 2024.03 +[submodule "src/coupler"] + path = src/coupler + url = https://github.com/NOAA-GFDL/FMScoupler.git + branch = 2024.03 diff --git a/src/FMS b/src/FMS index 8bf0739af..f703b8297 160000 --- a/src/FMS +++ b/src/FMS @@ -1 +1 @@ -Subproject commit 8bf0739afa3078a650c2a9d503716ed46fc65183 +Subproject commit f703b82972701a4e32a46d4d44a15f9fc2debb27 diff --git a/src/coupler b/src/coupler index e8a3bc093..e84cf65f1 160000 --- a/src/coupler +++ b/src/coupler @@ -1 +1 @@ -Subproject commit e8a3bc093b8018b0a28a5a3405728a0d3b82441f +Subproject commit e84cf65f1622c31f3143a793c11378f050398907 diff --git a/xmls/NWA12/CEFI_NWA12_cobalt.xml b/xmls/NWA12/CEFI_NWA12_cobalt.xml index e9fb56c5a..5398720cf 100644 --- a/xmls/NWA12/CEFI_NWA12_cobalt.xml +++ b/xmls/NWA12/CEFI_NWA12_cobalt.xml @@ -40,10 +40,10 @@ frecheck -r layout -p ncrc6.intel23 -x CEFI_NWA12_cobalt.xml CEFI_NWA12_COBALT_V - + - + diff --git a/xmls/NWA12/CEFI_NWA12_cobalt_fms2_yaml.xml b/xmls/NWA12/CEFI_NWA12_cobalt_fms2_yaml.xml index 240ba9fd6..c79cc9f42 100644 --- a/xmls/NWA12/CEFI_NWA12_cobalt_fms2_yaml.xml +++ b/xmls/NWA12/CEFI_NWA12_cobalt_fms2_yaml.xml @@ -40,10 +40,10 @@ frecheck -r layout -p ncrc6.intel23 -x CEFI_NWA12_cobalt_fms2_yaml.xml CEFI_NWA1 - + - +