Merge pull request ESCOMP#118 from mvdebolskiy/pr-test-updates

update ccs and fates
mvdebolskiy · Feb 28, 2025 · 4e11412 · 4e11412
2 parents ce6b973 + d8c6817
commit 4e11412
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -28,7 +28,7 @@
 [submodule "fates"]
 path = src/fates
 url = https://github.com/NorESMhub/fates
-fxtag = sci.1.78.3_api.36.1.0_noresm_v1
+fxtag = sci.1.78.3_api.36.1.0_noresm_v2
 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
@@ -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.38
+fxtag = ccs_config_noresm0.0.40./
 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

diff --git a/ccs_config b/ccs_config
diff --git a/src/fates b/src/fates
+2 −2		machines/betzy/config_batch.xml
+26 −8		machines/betzy/config_machines.xml
+16 −0		machines/betzy/gnu_betzy.cmake
+7 −0		modelgrid_aliases_nuopc.xml