From 77607cf8ac1970b3035dfd9ddcc79b860730828b Mon Sep 17 00:00:00 2001
From: Benjamin Auer <benjamin.m.auer@nasa.gov>
Date: Tue, 24 May 2022 11:07:01 -0400
Subject: [PATCH 1/2] fixes #1522

---
 CHANGELOG.md            |  2 ++
 griddedio/GriddedIO.F90 | 12 +++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 428acf5dccd3..aff94d16a22a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Adding missing _RETURN and _VERIFY macros in GriddedIO.F90
+
 ### Added
 
 ### Changed
diff --git a/griddedio/GriddedIO.F90 b/griddedio/GriddedIO.F90
index 84b5b63dfb0c..d28851bfbb43 100644
--- a/griddedio/GriddedIO.F90
+++ b/griddedio/GriddedIO.F90
@@ -198,6 +198,7 @@ subroutine CreateFileMetaData(this,items,bundle,timeInfo,vdata,ogrid,global_attr
               call s_iter%next()
            enddo
         end if
+        _RETURN(_SUCCESS)
 
      end subroutine CreateFileMetaData
 
@@ -323,12 +324,14 @@ subroutine CreateVariable(this,itemName,rc)
            newField = MAPL_FieldCreate(field,this%output_grid,lm=this%vData%lm,rc=status)
            _VERIFY(status)
            call MAPL_FieldBundleAdd(this%output_bundle,newField,rc=status)
+           _VERIFY(status)
         else
            newField = MAPL_FieldCreate(field,this%output_grid,rc=status)
            _VERIFY(status)
            call MAPL_FieldBundleAdd(this%output_bundle,newField,rc=status)
+           _VERIFY(status)
         end if
-        
+        _RETURN(_SUCCESS)
 
      end subroutine CreateVariable
 
@@ -389,7 +392,7 @@ subroutine bundlepost(this,filename,oClients,rc)
 
         tindex = size(this%times)
         if (tindex==1) then
-           call this%stage2DLatLon(filename,oClients=oClients,rc=status)
+           call this%stage2DLatLon(filename,oClients=oClients,_RC)
         end if
 
         if (this%vdata%regrid_type==VERTICAL_METHOD_ETA2LEV) then
@@ -545,6 +548,7 @@ subroutine RegridScalar(this,itemName,rc)
         end if
 
         if (allocated(ptr3d_inter)) deallocate(ptr3d_inter)
+        _RETURN(_SUCCESS)
 
      end subroutine RegridScalar
 
@@ -711,6 +715,7 @@ subroutine RegridVector(this,xName,yName,rc)
 
         if (allocated(xptr3d_inter)) deallocate(xptr3d_inter)
         if (allocated(yptr3d_inter)) deallocate(yptr3d_inter)
+        _RETURN(_SUCCESS)
 
      end subroutine RegridVector
 
@@ -786,7 +791,7 @@ subroutine stage2DLatLon(this, fileName, oClients, rc)
          call oClients%collective_stage_data(this%write_collection_id,trim(filename),'corner_lats', &
               ref,start=localStart, global_start=GlobalStart, global_count=GlobalCount)
      end if
-
+     _RETURN(_SUCCESS)
 
   end subroutine stage2DLatLon
   
@@ -855,6 +860,7 @@ subroutine stageData(this, field, fileName, tIndex, oClients, rc)
       end if
       call oClients%collective_stage_data(this%write_collection_id,trim(filename),trim(fieldName), &
            ref,start=localStart, global_start=GlobalStart, global_count=GlobalCount)
+      _RETURN(_SUCCESS)
 
   end subroutine stageData
 

From 33599f962e1014606068d76dd6e7a8a149cdf6fd Mon Sep 17 00:00:00 2001
From: Matthew Thompson <matthew.thompson@nasa.gov>
Date: Tue, 24 May 2022 12:10:59 -0400
Subject: [PATCH 2/2] Fix CI. Update changelog and cmakelists for 2.21.1
 release

---
 .circleci/config.yml | 8 +++++---
 CHANGELOG.md         | 7 +++++++
 CMakeLists.txt       | 2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d29591f9f0e0..1a5b8d8dfff7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -73,11 +73,13 @@ workflows:
           resource_class: xlarge
           repo: GEOSadas
           checkout_fixture: true
-          fixture_branch: develop
+          # This branch on GEOSadas will be used to track subrepos needed
+          # for GEOSadas + MAPL develop much like how we do with MAPL 3
+          fixture_branch: feature/mathomp4/mapldevelop
           checkout_mapl_branch: true
-          mepodevelop: true
-          develop_repos: "cmake GEOSana_GridComp" # GEOSadas needs some extra branches to work with mainline MAPL
+          mepodevelop: false
           rebuild_procs: 8
+
       ##################################################
       # - ci/run_fv3:                                  #
       #     name: run-FV3-on-<< matrix.compiler >>     #
diff --git a/CHANGELOG.md b/CHANGELOG.md
index aff94d16a22a..d70747f3df8f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Deprecated
 
+## [2.21.1] - 2022-05-24
+
+### Fixed
+
+- Adding missing _RETURN and _VERIFY macros in GriddedIO.F90
+- Update CircleCI to work with latest GEOSadas
+
 ## [2.21.0] - 2022-05-05
 
 ### Fixed
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b7b8ae6e84a7..39bff4d1d238 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ cmake_policy (SET CMP0054 NEW)
 
 project (
   MAPL
-  VERSION 2.21.0
+  VERSION 2.21.1
   LANGUAGES Fortran CXX C)  # Note - CXX is required for ESMF
 
 # Set the default build type to release