From f4a05be98d872065e3ec456ee2b18c4e23ada88f Mon Sep 17 00:00:00 2001 From: Rosie Fisher Date: Mon, 14 Oct 2024 15:14:15 +0200 Subject: [PATCH 01/11] Update .gitmodules to look at the drydep dates branch. --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 402ffcadf8..f792b3cfb9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -27,8 +27,8 @@ # [submodule "fates"] path = src/fates -url = https://github.com/NGEET/fates -fxtag = sci.1.78.2_api.36.0.0 +url = https://github.com/rosiealice/fates +fxtag = drydep_main fxrequired = AlwaysRequired # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed fxDONOTUSEurl = https://github.com/NCAR/fates-release From 2f4b355cfae374bf5c3a93bae571ca779d3fc876 Mon Sep 17 00:00:00 2001 From: Rosie Fisher Date: Tue, 15 Oct 2024 10:40:27 +0200 Subject: [PATCH 02/11] Revert accidental change to .gitmodules I meant to do this on the drydep branch. Hope this fixes the error. --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index f792b3cfb9..402ffcadf8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -27,8 +27,8 @@ # [submodule "fates"] path = src/fates -url = https://github.com/rosiealice/fates -fxtag = drydep_main +url = https://github.com/NGEET/fates +fxtag = sci.1.78.2_api.36.0.0 fxrequired = AlwaysRequired # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed fxDONOTUSEurl = https://github.com/NCAR/fates-release From bd3a2e8fe3abc794a77b01717eb6b59ca3f90d6c Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Fri, 15 Nov 2024 17:01:20 +0100 Subject: [PATCH 03/11] updated cime --- cime | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime b/cime index 422ddaa770..909cb49897 160000 --- a/cime +++ b/cime @@ -1 +1 @@ -Subproject commit 422ddaa770a3cea6e83a60c9700ebce77acaceed +Subproject commit 909cb498978b2386318e56ea686d28e469224cd0 From 06f50df3d0b21db80008e4ef773b992af43e45b7 Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Fri, 15 Nov 2024 17:02:56 +0100 Subject: [PATCH 04/11] updated ccs_config --- ccs_config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccs_config b/ccs_config index 69a958581e..daa8195aa6 160000 --- a/ccs_config +++ b/ccs_config @@ -1 +1 @@ -Subproject commit 69a958581ecd2d32ee9cb1c38bcd3847b8b920bf +Subproject commit daa8195aa6a817e1ba5a6b88c058aac77c17b425 From 433028eadc77634cf0e2c8ac9f3e2ff46d6e0ec1 Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Sun, 17 Nov 2024 10:37:44 +0100 Subject: [PATCH 05/11] updated cime --- cime | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime b/cime index 909cb49897..f4a63723ea 160000 --- a/cime +++ b/cime @@ -1 +1 @@ -Subproject commit 909cb498978b2386318e56ea686d28e469224cd0 +Subproject commit f4a63723ead19bf5391abf21e5d49bd3741f7e39 From 13f8ff9c2bd4d0ec3383f0948049187f29ffe3d5 Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Sun, 17 Nov 2024 10:42:18 +0100 Subject: [PATCH 06/11] udpated .gitmodules --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index a3c4157850..fde6fe2361 100644 --- a/.gitmodules +++ b/.gitmodules @@ -64,7 +64,7 @@ fxtag = cesm-coupling.n02_v2.1.2 fxrequired = ToplevelRequired # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute - + [submodule "ccs_config"] path = ccs_config url = https://github.com/NorESMhub/ccs_config_noresm.git @@ -76,7 +76,7 @@ fxDONOTUSEurl = https://github.com/NorESMhub/ccs_config_noresm [submodule "cime"] path = cime url = https://github.com/ESMCI/cime -fxtag = cime6.0.246 +fxtag = cime6.1.28_noresm_v0 fxrequired = ToplevelRequired # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed fxDONOTUSEurl = https://github.com/ESMCI/cime From a76706f4c0e33bd2b2590a81b124a212ec1fa6f0 Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Sun, 17 Nov 2024 11:16:26 +0100 Subject: [PATCH 07/11] updated buildnml to ctsm5.3.011 --- cime_config/buildnml | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/cime_config/buildnml b/cime_config/buildnml index 414811abe6..e06b9388c7 100644 --- a/cime_config/buildnml +++ b/cime_config/buildnml @@ -75,8 +75,7 @@ def buildnml(case, caseroot, compname): run_reftod = case.get_value("RUN_REFTOD") start_tod = case.get_value("START_TOD") glc_nec = case.get_value("GLC_NEC") - cism_use_antarctica = case.get_value("CISM_USE_ANTARCTICA") - dglc_use_antarctica = case.get_value("DGLC_USE_ANTARCTICA") + glc_use_antarctica = case.get_value("GLC_USE_ANTARCTICA") mask = case.get_value("MASK_GRID") driver = case.get_value("COMP_INTERFACE").lower() @@ -247,12 +246,9 @@ def buildnml(case, caseroot, compname): else: nomeg = "" - glc_use_antarctica = cism_use_antarctica if glc_use_antarctica is None: - glc_use_antarctica = dglc_use_antarctica - if glc_use_antarctica is None: - # This is the case for compsets without CISM or DGLC, where the - # CISM_USE_ANTARCTICA and DGLC_USE_ANTARCTICA xml variables are not defined + # This is the case for compsets with SGLC where the GLC_USE_ANTARCTICA xml + # variable isn't defined glc_use_antarctica_flag = "" elif isinstance(glc_use_antarctica, bool): if glc_use_antarctica: @@ -260,16 +256,10 @@ def buildnml(case, caseroot, compname): else: glc_use_antarctica_flag = "" else: - if cism_use_antarctia: - expect( - False, - "Unexpected value for CISM_USE_ANTARCTICA: {}".format(cism_use_antarctica), - ) - else: - expect( - False, - "Unexpected value for DGLC_USE_ANTARCTICA: {}".format(dglc_use_antarctica), - ) + expect( + False, + "Unexpected value for GLC_USE_ANTARCTICA: {}".format(glc_use_antarctica), + ) if clm_nml_use_case != "UNSET": usecase = "-use_case %s" % clm_nml_use_case From 401d758b0ba7f26ca09b3919713cb98f199c929c Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Sun, 17 Nov 2024 11:38:35 +0100 Subject: [PATCH 08/11] updated ccs_config --- ccs_config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccs_config b/ccs_config index daa8195aa6..3640d984aa 160000 --- a/ccs_config +++ b/ccs_config @@ -1 +1 @@ -Subproject commit daa8195aa6a817e1ba5a6b88c058aac77c17b425 +Subproject commit 3640d984aad755c2b536abe2ddbcb428cca130ae From 2b3555882574a9ff6ab1ecda12ff10d05fe5ea29 Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Sun, 17 Nov 2024 11:40:11 +0100 Subject: [PATCH 09/11] updated .gitmodules --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index fde6fe2361..6fec3d4a11 100644 --- a/.gitmodules +++ b/.gitmodules @@ -68,7 +68,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute [submodule "ccs_config"] path = ccs_config url = https://github.com/NorESMhub/ccs_config_noresm.git -fxtag = ccs_config_noresm0.0.33 +fxtag = ccs_config_noresm0.0.38 fxrequired = ToplevelRequired # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed fxDONOTUSEurl = https://github.com/NorESMhub/ccs_config_noresm From cbe6f93842d894c9ea1c374b24a104958e0f6b22 Mon Sep 17 00:00:00 2001 From: mvdebolskiy Date: Mon, 18 Nov 2024 19:34:48 +0100 Subject: [PATCH 10/11] update cime and submodules to be consistent with cime6.1 --- .gitmodules | 16 ++++++++-------- cime | 2 +- components/cdeps | 2 +- components/cmeps | 2 +- components/mizuRoute | 2 +- libraries/parallelio | 2 +- share | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6fec3d4a11..c6b16d384f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -60,7 +60,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/MOSART [submodule "mizuRoute"] path = components/mizuRoute url = https://github.com/ESCOMP/mizuRoute -fxtag = cesm-coupling.n02_v2.1.2 +fxtag = cesm-coupling.n02_v2.1.3 fxrequired = ToplevelRequired # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute @@ -75,7 +75,7 @@ fxDONOTUSEurl = https://github.com/NorESMhub/ccs_config_noresm [submodule "cime"] path = cime -url = https://github.com/ESMCI/cime +url = https://github.com/NorESMhub/cime fxtag = cime6.1.28_noresm_v0 fxrequired = ToplevelRequired # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed @@ -83,8 +83,8 @@ fxDONOTUSEurl = https://github.com/ESMCI/cime [submodule "cmeps"] path = components/cmeps -url = https://github.com/ESCOMP/CMEPS.git -fxtag = cmeps0.14.77 +url = https://github.com/NorESMhub/CMEPS.git +fxtag = cmeps1.0.20_noresm_v0 fxrequired = ToplevelRequired # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git @@ -92,15 +92,15 @@ fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git [submodule "cdeps"] path = components/cdeps url = https://github.com/ESCOMP/CDEPS.git -fxtag = cdeps1.0.48 +fxtag = cdeps1.0.53 fxrequired = ToplevelRequired # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS.git [submodule "share"] path = share -url = https://github.com/ESCOMP/CESM_share -fxtag = share1.0.19 +url = https://github.com/NorESMhub/NorESM_share +fxtag = share1.1.2_noresm_v0 fxrequired = ToplevelRequired # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed fxDONOTUSEurl = https://github.com/ESCOMP/CESM_share @@ -116,7 +116,7 @@ fxDONOTUSEurl = https://github.com/MCSclimate/MCT [submodule "parallelio"] path = libraries/parallelio url = https://github.com/NCAR/ParallelIO -fxtag = pio2_6_2 +fxtag = pio2_6_3 fxrequired = ToplevelRequired # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed fxDONOTUSEurl = https://github.com/NCAR/ParallelIO diff --git a/cime b/cime index f4a63723ea..7c52a0bf16 160000 --- a/cime +++ b/cime @@ -1 +1 @@ -Subproject commit f4a63723ead19bf5391abf21e5d49bd3741f7e39 +Subproject commit 7c52a0bf16190ae6b6d1b73ac3521fc3bb920981 diff --git a/components/cdeps b/components/cdeps index 7b0b3a8272..f6bc97483a 160000 --- a/components/cdeps +++ b/components/cdeps @@ -1 +1 @@ -Subproject commit 7b0b3a827241c53d296ec877cb1f59966bf5e5bf +Subproject commit f6bc97483a1bfb7352c6c5610a13ed898a86990b diff --git a/components/cmeps b/components/cmeps index 47fb4e633a..1d456df89c 160000 --- a/components/cmeps +++ b/components/cmeps @@ -1 +1 @@ -Subproject commit 47fb4e633a76ec6d60969b1af751f90790387246 +Subproject commit 1d456df89ce4a1aefe7cf9f5564c53ebe3dab41f diff --git a/components/mizuRoute b/components/mizuRoute index 81c720c7ee..2ff305a029 160000 --- a/components/mizuRoute +++ b/components/mizuRoute @@ -1 +1 @@ -Subproject commit 81c720c7ee51f9c69f2934f696078c42f4493565 +Subproject commit 2ff305a0292cb06789de6cfea7ad3cc0d6173493 diff --git a/libraries/parallelio b/libraries/parallelio index f52ade0756..6539ef05ae 160000 --- a/libraries/parallelio +++ b/libraries/parallelio @@ -1 +1 @@ -Subproject commit f52ade075619b32fa141993b5665b0fe099befc2 +Subproject commit 6539ef05ae7584ec570a56fdab9f7dfb336c2b80 diff --git a/share b/share index 4b9dc4871a..b26285a01b 160000 --- a/share +++ b/share @@ -1 +1 @@ -Subproject commit 4b9dc4871a259f00f35bb47708d876cb7dcdf75c +Subproject commit b26285a01ba00c2c7f31182708827096b1bf93a8 From 89e8406f1d4c6d94cc45d00644fe5c1813597356 Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Mon, 18 Nov 2024 20:05:33 +0100 Subject: [PATCH 11/11] updated cime submodule --- cime | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime b/cime index 7c52a0bf16..f4a63723ea 160000 --- a/cime +++ b/cime @@ -1 +1 @@ -Subproject commit 7c52a0bf16190ae6b6d1b73ac3521fc3bb920981 +Subproject commit f4a63723ead19bf5391abf21e5d49bd3741f7e39