From 16aad127c810ea127e8d63479fbecbf4c8f08ff8 Mon Sep 17 00:00:00 2001
From: Matthew Thompson <matthew.thompson@nasa.gov>
Date: Tue, 19 Dec 2023 09:25:29 -0500
Subject: [PATCH] Update components to match GEOSgcm main as of 2023-Dec-19

---
 CHANGELOG.md    | 14 ++++++++++++++
 components.yaml |  8 ++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 76d558a..84f481c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Deprecated
 
+## [2.12.0] - 2023-12-19
+
+### Changed
+
+- Update to `components.yaml` to match GEOSgcm `main` as of 2023-12-19
+  - ESMA_env v4.22.0 → v4.24.0
+    - Update to Baselibs 7.17.0
+  - GEOS_Util v2.0.4 → v2.0.5
+    - Fix in remap_restarts.py for regridding from MERRA2 at non-72 level resolutions
+  - MAPL v2.42.0 → v2.42.4
+    - Various minor fixes found by NAG compiler
+  - fvdycore geos/v2.8.0 → geos/v2.8.1
+    - Fix when running with stretched grid
+
 ## [2.11.0] - 2023-12-01
 
 ### Changed
diff --git a/components.yaml b/components.yaml
index ce98c33..1afcd30 100644
--- a/components.yaml
+++ b/components.yaml
@@ -5,7 +5,7 @@ GEOSfvdycore:
 env:
   local: ./@env
   remote: ../ESMA_env.git
-  tag: v4.22.0
+  tag: v4.24.0
   develop: main
 
 cmake:
@@ -29,13 +29,13 @@ GMAO_Shared:
 GEOS_Util:
   local: ./src/Shared/@GMAO_Shared/@GEOS_Util
   remote: ../GEOS_Util.git
-  tag: v2.0.4
+  tag: v2.0.5
   develop: main
 
 MAPL:
   local: ./src/Shared/@MAPL
   remote: ../MAPL.git
-  tag: v2.42.0
+  tag: v2.42.4
   develop: develop
 
 FMS:
@@ -53,6 +53,6 @@ FVdycoreCubed_GridComp:
 fvdycore:
   local: ./src/Components/@FVdycoreCubed_GridComp/@fvdycore
   remote: ../GFDL_atmos_cubed_sphere.git
-  tag: geos/v2.8.0
+  tag: geos/v2.8.1
   develop: geos/develop