From 7ffb69730ccd0d20da521d4b91c0c742302a767e Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 28 Jul 2021 16:41:45 -0400 Subject: [PATCH 1/5] Remove old gitrepo files --- MAPL_cfio/.gitrepo | 11 ----------- base/.gitrepo | 11 ----------- pfio/.gitrepo | 11 ----------- pfunit/.gitrepo | 11 ----------- 4 files changed, 44 deletions(-) delete mode 100644 MAPL_cfio/.gitrepo delete mode 100644 base/.gitrepo delete mode 100644 pfio/.gitrepo delete mode 100644 pfunit/.gitrepo diff --git a/MAPL_cfio/.gitrepo b/MAPL_cfio/.gitrepo deleted file mode 100644 index fb84147d59ae..000000000000 --- a/MAPL_cfio/.gitrepo +++ /dev/null @@ -1,11 +0,0 @@ -; DO NOT EDIT (unless you know what you are doing) -; -; This subdirectory is a git "subrepo", and this file is maintained by the -; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme -; -[subrepo] - remote = git@developer.nasa.gov:tclune/MAPL_cfio - branch = develop - commit = fb8972e115d5ef122b0ad05376df87f09c4f6305 - parent = 269e818ce46fac9047b82ca350b8d583e250b8b3 - cmdver = 0.3.1 diff --git a/base/.gitrepo b/base/.gitrepo deleted file mode 100644 index 4a54f089813d..000000000000 --- a/base/.gitrepo +++ /dev/null @@ -1,11 +0,0 @@ -; DO NOT EDIT (unless you know what you are doing) -; -; This subdirectory is a git "subrepo", and this file is maintained by the -; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme -; -[subrepo] - remote = git@developer.nasa.gov:tclune/MAPL_Base - branch = develop - commit = 5697a470a8d92854cc2af3690ab927efdd69f82c - parent = a47646670ca44eff9f527ae8e01096c7573981ce - cmdver = 0.3.1 diff --git a/pfio/.gitrepo b/pfio/.gitrepo deleted file mode 100644 index 4d9ab41eb044..000000000000 --- a/pfio/.gitrepo +++ /dev/null @@ -1,11 +0,0 @@ -; DO NOT EDIT (unless you know what you are doing) -; -; This subdirectory is a git "subrepo", and this file is maintained by the -; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme -; -[subrepo] - remote = git@developer.nasa.gov:tclune/GMAO_pFIO.git - branch = develop - commit = 5b47cf6b43c4b1457dc4f6669df1dfcd30ed2ec5 - parent = d319403ae5469e75c856b2ebcf8a5862fa0d197e - cmdver = 0.3.1 diff --git a/pfunit/.gitrepo b/pfunit/.gitrepo deleted file mode 100644 index 0b68c0691f1d..000000000000 --- a/pfunit/.gitrepo +++ /dev/null @@ -1,11 +0,0 @@ -; DO NOT EDIT (unless you know what you are doing) -; -; This subdirectory is a git "subrepo", and this file is maintained by the -; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme -; -[subrepo] - remote = git@developer.nasa.gov:tclune/MAPL_pFUnit.git - branch = master - commit = f544d6e6eb98e2f425847b3b2b732f71fe958ddd - parent = 1a68898f787f47602a3e11d3cff7d990dbfda306 - cmdver = 0.3.1 From ade2253bcc9ec898ee147acd4e61a952cc1268c4 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 28 Jul 2021 16:42:23 -0400 Subject: [PATCH 2/5] Update CHANGELOG --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e9d5b5d36671..f92baebdfa36 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### Removed + +- Removed unneeded `.gitrepo` files + ### Added ### Changed ### Fixed From 5fe4106ec8bfc8ac4beec57dde94311ab8bcc397 Mon Sep 17 00:00:00 2001 From: Benjamin Auer Date: Thu, 29 Jul 2021 11:41:52 -0400 Subject: [PATCH 3/5] only check that the component grid matches restart file is the component grid is cubed-sphere. Other factories just not supported given current format of geos restarts --- CHANGELOG.md | 2 ++ base/MAPL_Generic.F90 | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f92baebdfa36..8fa99042b6ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed ### 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 diff --git a/base/MAPL_Generic.F90 b/base/MAPL_Generic.F90 index 6761f45e2731..97f190dc4475 100644 --- a/base/MAPL_Generic.F90 +++ b/base/MAPL_Generic.F90 @@ -5905,7 +5905,7 @@ 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 + 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") From 5c8fb7f5c88214baa6c5f4ce6f6805a756590874 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 29 Jul 2021 13:13:09 -0400 Subject: [PATCH 4/5] Update CHANGELOG and CMake for 2.8.2 Release --- CHANGELOG.md | 10 ++++++++-- CMakeLists.txt | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8fa99042b6ed..e3d28f25195c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,12 +7,18 @@ 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 -### Added -### Changed ### Fixed - Only check the restart grid compared to component if component grid is Cubed-Sphere. Other factories not yet supported. diff --git a/CMakeLists.txt b/CMakeLists.txt index e3d1d19bc946..be93ce7d6a70 100644 --- a/CMakeLists.txt +++ b/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 From edfd5adfdf7a8910a7c5b6950fe9389e1f665a69 Mon Sep 17 00:00:00 2001 From: Benjamin Auer Date: Thu, 29 Jul 2021 14:28:15 -0400 Subject: [PATCH 5/5] add a comment for future readers --- base/MAPL_Generic.F90 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/base/MAPL_Generic.F90 b/base/MAPL_Generic.F90 index 97f190dc4475..1c2a1bacd35d 100644 --- a/base/MAPL_Generic.F90 +++ b/base/MAPL_Generic.F90 @@ -5905,6 +5905,8 @@ 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 + !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)))