From e567ebbb5eded9d9980a0339981e0558cda0fd0b Mon Sep 17 00:00:00 2001
From: Matthew Thompson <matthew.thompson@nasa.gov>
Date: Tue, 25 May 2021 12:19:50 -0400
Subject: [PATCH 1/2] Updates for v10.19.1

---
 CHANGELOG.md    | 11 +++++++++++
 CMakeLists.txt  |  2 +-
 components.yaml | 10 +++++-----
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a6e3c8e..0230a2bf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## [10.19.1] - 2021-05-25
+
+### Zero-diff to previous release: NO
+### Restart Changes: NO
+### History Changes: NO
+
+Major changes include:
+
+1. Upgrade to MAPL v2.7.0 which changes how programs set up command line options.
+2. Update to FVdycoreCubed_GridComp v1.2.15 and GEOSgcm_App v1.5.1 for compatibility with MAPL v2.7.0.
+
 ## [10.19.0] - 2021-05-14
 
 ### Zero-diff to previous release: NO
diff --git a/CMakeLists.txt b/CMakeLists.txt
index da605436..10102b36 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ cmake_policy (SET CMP0054 NEW)
 
 project (
   GEOSgcm
-  VERSION 10.19.0
+  VERSION 10.19.1
   LANGUAGES Fortran CXX C)  # Note - CXX is required for ESMF
 
 if ("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}")
diff --git a/components.yaml b/components.yaml
index 4a49a3ef..10167379 100644
--- a/components.yaml
+++ b/components.yaml
@@ -29,14 +29,14 @@ NCEP_Shared:
 GMAO_Shared:
   local: ./src/Shared/@GMAO_Shared
   remote: ../GMAO_Shared.git
-  tag: v1.4.1
+  tag: v1.4.2
   sparse: ./config/GMAO_Shared.sparse
   develop: main
 
 MAPL:
   local: ./src/Shared/@MAPL
   remote: ../MAPL.git
-  tag: v2.6.8
+  tag: v2.7.0
   develop: develop
 
 FMS:
@@ -48,14 +48,14 @@ FMS:
 GEOSgcm_GridComp:
   local: ./src/Components/@GEOSgcm_GridComp
   remote: ../GEOSgcm_GridComp.git
-  tag: v1.12.1
+  tag: v1.12.2
   sparse: ./config/GEOSgcm_GridComp.sparse
   develop: develop
 
 FVdycoreCubed_GridComp:
   local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSsuperdyn_GridComp/@FVdycoreCubed_GridComp
   remote: ../FVdycoreCubed_GridComp.git
-  tag: v1.2.14
+  tag: v1.2.15
   develop: develop
 
 fvdycore:
@@ -105,7 +105,7 @@ mom6:
 GEOSgcm_App:
   local: ./src/Applications/@GEOSgcm_App
   remote: ../GEOSgcm_App.git
-  tag: v1.5.0
+  tag: v1.5.1
   develop: develop
 
 UMD_Etc:

From 5e830368e8a76224ed5c9d16a921a5e1908ae7c0 Mon Sep 17 00:00:00 2001
From: Scott Rabenhorst <53346946+sdrabenh@users.noreply.github.com>
Date: Tue, 25 May 2021 12:35:54 -0400
Subject: [PATCH 2/2] Update CHANGELOG.md

---
 CHANGELOG.md | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0230a2bf..a88659ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,14 +2,21 @@
 
 ## [10.19.1] - 2021-05-25
 
-### Zero-diff to previous release: NO
+### Zero-diff to previous release: YES
 ### Restart Changes: NO
-### History Changes: NO
+### History Changes: YES
 
 Major changes include:
 
 1. Upgrade to MAPL v2.7.0 which changes how programs set up command line options.
 2. Update to FVdycoreCubed_GridComp v1.2.15 and GEOSgcm_App v1.5.1 for compatibility with MAPL v2.7.0.
+3. Enable GEOSgcm to output the configuration values in `GEOS_SurfaceGridComp.rc`.
+4. Fixes a bug in the export of `SSKINW` (an internal state of Openwater) that was being filled incorrectly leading to `MAPL_UNDEF`. Now there are actual values.
+5. Merged changes present in GEOSadas-5_27_1_p3 that never made it into the GIT repo: revised stochastic perturbation tendency exports.
+6. A bug fix to prevent a seg-fault during the calculation of the GEOS-Chem lightning flash rate due to an array size mismatch.
+7. Add ability to write out energy components to file.
+8. Update gitignore for mepo updates.
+9. Follow MAPL's change to add a new `MAPL_CapOptions` constructor.
 
 ## [10.19.0] - 2021-05-14