From 38f11c2d4d7eff409c4069fa06baf60dec1587d9 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Wed, 6 Nov 2024 11:01:18 -0700 Subject: [PATCH 1/2] Update mpi-serial to version that builds on Izumi --- .gitmodules | 2 +- libraries/mpi-serial | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 78a24f5789..e812c4c63a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -116,7 +116,7 @@ fxDONOTUSEurl = https://github.com/NCAR/ParallelIO [submodule "mpi-serial"] path = libraries/mpi-serial url = https://github.com/ESMCI/mpi-serial -fxtag = MPIserial_2.5.0 +fxtag = MPIserial_2.5.1 fxrequired = ToplevelRequired # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed fxDONOTUSEurl = https://github.com/ESMCI/mpi-serial diff --git a/libraries/mpi-serial b/libraries/mpi-serial index 2c44fb3d32..39416b7546 160000 --- a/libraries/mpi-serial +++ b/libraries/mpi-serial @@ -1 +1 @@ -Subproject commit 2c44fb3d327be7c6429894bc5d4de769f3486848 +Subproject commit 39416b754652bd281a89e86b37734aa5f3ffafd6 From 2a6348f11631ab63f3b8b6ebadc012e7ccb2a78b Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Fri, 8 Nov 2024 15:26:21 -0700 Subject: [PATCH 2/2] A fix for mpi-serial on Izumi from Jim with an update in ccs_config --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index e812c4c63a..ed23904527 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/ESMCI/ccs_config_cesm.git -fxtag = ccs_config_cesm1.0.8 +fxtag = ccs_config_cesm1.0.10 fxrequired = ToplevelRequired # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git