From 6bb4e12f8dc279f9fe4b686d2ea9831cd30c01d5 Mon Sep 17 00:00:00 2001
From: Matthew Thompson <matthew.thompson@nasa.gov>
Date: Mon, 21 Oct 2024 14:31:58 -0400
Subject: [PATCH 1/2] Update components.yaml to match GEOSgcm main as of
 2024-Oct-21

---
 components.yaml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/components.yaml b/components.yaml
index 482f5d06..d82a0b34 100644
--- a/components.yaml
+++ b/components.yaml
@@ -5,19 +5,19 @@ GEOSldas:
 env:
   local: ./@env
   remote: ../ESMA_env.git
-  tag: v4.29.0
+  tag: v4.29.1
   develop: main
 
 cmake:
   local: ./@cmake
   remote: ../ESMA_cmake.git
-  tag: v3.48.0
+  tag: v3.52.0
   develop: develop
 
 ecbuild:
   local: ./@cmake/@ecbuild
   remote: ../ecbuild.git
-  tag: geos/v1.3.0
+  tag: geos/v1.4.0
 
 NCEP_Shared:
   local: ./src/Shared/@NCEP_Shared
@@ -29,7 +29,7 @@ NCEP_Shared:
 GMAO_Shared:
   local: ./src/Shared/@GMAO_Shared
   remote: ../GMAO_Shared.git
-  tag: v1.9.8
+  tag: v1.9.9
   sparse: ./config/GMAO_Shared.sparse
   develop: main
 
@@ -40,16 +40,18 @@ GEOS_Util:
   sparse: ./config/GEOS_Util.sparse
   develop: main
 
+# When updating the MAPL version, also update the MAPL version in the
+# CMakeLists.txt file for non-Baselibs builds
 MAPL:
   local: ./src/Shared/@MAPL
   remote: ../MAPL.git
-  tag: v2.47.1
+  tag: v2.50.1
   develop: develop
 
 GEOSldas_GridComp:
   local: ./src/Components/@GEOSldas_GridComp
   remote: ../GEOSldas_GridComp.git
-  branch: develop
+  branch: feature/mathomp4/add-impi-support-ldas
   develop: develop
 
 GEOSgcm_GridComp:

From 1d77103db6e90401df6af30df8892ecf9f2e17d4 Mon Sep 17 00:00:00 2001
From: Rolf Reichle <54944691+gmao-rreichle@users.noreply.github.com>
Date: Tue, 22 Oct 2024 09:07:06 -0400
Subject: [PATCH 2/2] Change GEOSldas_GridComp branch back to develop
 (components.yaml)

---
 components.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components.yaml b/components.yaml
index d82a0b34..b6fffb14 100644
--- a/components.yaml
+++ b/components.yaml
@@ -51,7 +51,7 @@ MAPL:
 GEOSldas_GridComp:
   local: ./src/Components/@GEOSldas_GridComp
   remote: ../GEOSldas_GridComp.git
-  branch: feature/mathomp4/add-impi-support-ldas
+  branch: develop
   develop: develop
 
 GEOSgcm_GridComp: