Merge pull request #938 from GEOS-ESM/develop

Merge Develop into Main for 2.8.2 release

CHANGELOG.md

@@ -7,11 +7,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+
 ### Removed
 ### Added
 ### Changed
 ### Fixed
 
+## [2.8.2] - 2021-07-29
+
+### Removed
+
+- Removed unneeded `.gitrepo` files
+
+### Fixed
+
+- Only check the restart grid compared to component if component grid is Cubed-Sphere. Other factories not yet supported.
+
 ## [2.8.1] - 2021-07-28
 
 ### Removed

CMakeLists.txt

@@ -4,7 +4,7 @@ cmake_policy (SET CMP0054 NEW)
 
 project (
   MAPL
-  VERSION 2.8.1
+  VERSION 2.8.2
   LANGUAGES Fortran CXX C)  # Note - CXX is required for ESMF
 
 # mepo can now clone subrepos in three styles

base/MAPL_Generic.F90

@@ -5905,7 +5905,9 @@ subroutine MAPL_ESMFStateReadFromFile(STATE,CLOCK,FILENAME,MPL,HDR,RC)
              call ESMF_AttributeGet(MPL%GRID%ESMFGRID,'GridType',value=grid_type,rc=status)
              _VERIFY(status)
           end if
-          if (trim(grid_type) /= 'Tripolar' .and. trim(grid_type) /= 'llc' .and. trim(grid_type) /= 'External') then
+          !note this only works for geos cubed-sphere restarts currently because of 
+          !possible insufficent metadata in the other restarts to support the other grid factories
+          if (trim(grid_type) == 'Cubed-Sphere') then
              app_factory => get_factory(MPL%GRID%ESMFGRID)
              allocate(file_factory,source=grid_manager%make_factory(trim(filename)))
              _ASSERT(file_factory%physical_params_are_equal(app_factory),"Factories not equal")