From 74298102c0d0627563195d206d163fdd9bc0c7a8 Mon Sep 17 00:00:00 2001
From: Matthew Thompson <matthew.thompson@nasa.gov>
Date: Tue, 6 Jul 2021 16:03:24 -0400
Subject: [PATCH 1/3] Update components to be in line with GCM

---
 components.yaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/components.yaml b/components.yaml
index bd797392..7e80e7c4 100644
--- a/components.yaml
+++ b/components.yaml
@@ -5,13 +5,13 @@ GEOSadas:
 env:
   local: ./@env
   remote: ../ESMA_env.git
-  tag: v3.2.1
+  tag: v3.3.0
   develop: main
 
 cmake:
   local: ./@cmake
   remote: ../ESMA_cmake.git
-  tag: v3.4.2
+  tag: v3.5.0
   develop: develop
 
 ecbuild:
@@ -34,7 +34,7 @@ GMAO_Shared:
 MAPL:
   local: ./src/Shared/@MAPL
   remote: ../MAPL.git
-  tag: v2.6.7
+  tag: v2.7.0
   develop: develop
 
 FMS:
@@ -71,7 +71,7 @@ GEOSagcmPert_GridComp:
 FVdycoreCubed_GridComp:
   local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp
   remote: ../FVdycoreCubed_GridComp.git
-  tag: v1.2.13
+  tag: v1.2.15
   develop: develop
 
 fvdycore:
@@ -121,7 +121,7 @@ mom6:
 GEOSgcm_App:
   local: ./src/Applications/@GEOSgcm_App
   remote: ../GEOSgcm_App.git
-  tag: v1.4.1
+  tag: v1.5.2
   develop: develop
 
 UMD_Etc:

From 8b9e56faa448a8f2dc55213c975bf8dad28ac278 Mon Sep 17 00:00:00 2001
From: Matthew Thompson <matthew.thompson@nasa.gov>
Date: Wed, 7 Jul 2021 09:25:47 -0400
Subject: [PATCH 2/3] Update components.yaml

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

diff --git a/components.yaml b/components.yaml
index 7e80e7c4..f047256c 100644
--- a/components.yaml
+++ b/components.yaml
@@ -46,7 +46,7 @@ FMS:
 GEOSana_GridComp:
   local: ./src/Components/@GEOSana_GridComp
   remote: ../GEOSana_GridComp.git
-  tag: v1.4.1
+  branch: bugfix/mathomp4/geos-state-compiler-error
   develop: develop
 
 GEOSgcm_GridComp:

From af8d327da95cd40e0afbdf53a730fccf7c3a9e88 Mon Sep 17 00:00:00 2001
From: Matthew Thompson <matthew.thompson@nasa.gov>
Date: Wed, 21 Jul 2021 08:28:45 -0400
Subject: [PATCH 3/3] Update to GEOSana_GridComp v1.4.2

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

diff --git a/components.yaml b/components.yaml
index f047256c..e7bc38b4 100644
--- a/components.yaml
+++ b/components.yaml
@@ -11,7 +11,7 @@ env:
 cmake:
   local: ./@cmake
   remote: ../ESMA_cmake.git
-  tag: v3.5.0
+  tag: v3.5.2
   develop: develop
 
 ecbuild:
@@ -46,7 +46,7 @@ FMS:
 GEOSana_GridComp:
   local: ./src/Components/@GEOSana_GridComp
   remote: ../GEOSana_GridComp.git
-  branch: bugfix/mathomp4/geos-state-compiler-error
+  tag: v1.4.2
   develop: develop
 
 GEOSgcm_GridComp:
@@ -101,8 +101,8 @@ geos-chem:
 GOCART:
   local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp/@GOCART
   remote: ../GOCART.git
-  sparse: ./config/GOCART.sparse
   tag: v1.0.1
+  sparse: ./config/GOCART.sparse
   develop: develop
 
 mom:
@@ -116,7 +116,7 @@ mom6:
   remote: ../MOM6.git
   tag: geos/v2.0.1
   develop: dev/gfdl
-  recurse_submodules: True
+  recurse_submodules: true
 
 GEOSgcm_App:
   local: ./src/Applications/@GEOSgcm_App