Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates for TOSS4 at NAS #589

Merged
merged 5 commits into from
May 18, 2023
Merged

Updates for TOSS4 at NAS #589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b64893e
Updates for TOSS4 at NAS
mathomp4 May 18, 2023
8777a01
Move to GEOSgcm_App v2.1.2
mathomp4 May 18, 2023
548a002
Update CMakeLists.txt
sdrabenh May 18, 2023
b21da93
Update CHANGELOG.md
sdrabenh May 18, 2023
c4cd520
Update README.md
sdrabenh May 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,32 @@

## Unreleased

## [11.0.1] - 2023-05-18

### Zero-diff to Previous Release: YES
### Restart Changes: NO, with minor exception to solar mentioned below

### Major Changes:
* Merge in GEOS/mitgcm [#547](https://github.com/GEOS-ESM/GEOSgcm/pull/547) [#724](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/724) [#423](https://github.com/GEOS-ESM/GEOSgcm_App/pull/423) [#22](https://github.com/GEOS-ESM/UMD_Etc/pull/22) [GEOS_OceanGridComp v2.0.0](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v2.0.0)
* Add datalake [#557](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/557)
* Restructure `make_bcs` scripts [#740](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/740)
* Update `make_bcs` legacy input path [#718 and associated PRs](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/718)
* Reorganize `make_bcs` output directory [#729](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/729)
* Bug fixes to address errors that caused fail of start-stop regression test for most Catchment-CN4.5 land tiles [#657](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/657)
* Bug fix remapping of CatchCN restart variables (`RZMM`, `TGWM`, `SFMM`) [#741](https://github.com/GEOS-ESM/GEOSgcm_GridComp/pull/741)
* Updated `AGCM.rc.tmpl` for reordered sw cloud optics file in RRTMGP v1.6 [#446](https://github.com/GEOS-ESM/GEOSgcm_App/pull/446). The INTERNAL state of SOLAR now has `COSZSW`, `CLDxxSW`, and `TAUxxPAR` added to it.
* Remove Rome detection at NAS, fixes for AWS and unknown [#460](https://github.com/GEOS-ESM/GEOSgcm_App/pull/460)
* Fixture changes:
* [GEOSgcm_App v2.1.0 => v2.1.2](https://github.com/GEOS-ESM/GEOSgcm_App/compare/v2.1.0...v2.1.2)
* [GEOSgcm_GridComp v2.0.0 => v2.1.1](https://github.com/GEOS-ESM/GEOSgcm_GridComp/compare/v2.0.0...v2.1.1)
* [MAPL v2.38.1 => v2.39.1](https://github.com/GEOS-ESM/MAPL/compare/v2.38.1...v2.39.1)
* [GEOSradiation_GridComp v1.3.0 => v1.4.0](https://github.com/GEOS-ESM/GEOSradiation_GridComp/compare/v1.3.0...v1.4.0)
* [RRTMGP geos/v1.5+1.0.0 => geos/v1.6+1.1.0](https://github.com/GEOS-ESM/rte-rrtmgp/compare/geos%2Fv1.5%2B1.0.0...geos%2Fv1.6%2B1.1.0)
* [GEOS_Util v1.1.1 => v2.0.0](https://github.com/GEOS-ESM/GEOS_Util/compare/v1.1.1...v2.0.0)
* [ESMA_cmake v3.28.0 => v3.29.0](https://github.com/GEOS-ESM/ESMA_cmake/compare/v3.28.0...v3.29.0)
* [ESMA_env v4.9.1 => v4.9.2](https://github.com/GEOS-ESM/ESMA_env/compare/v4.9.1...v4.9.2)
* New [MITgcm](https://github.com/GEOS-ESM/MITgcm)

## [11.0.0] - 2023-05-11

### Zero-diff to Previous Release: NO
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ cmake_policy (SET CMP0054 NEW)

project (
GEOSgcm
VERSION 11.0.0
VERSION 11.0.1
LANGUAGES Fortran CXX C) # Note - CXX is required for ESMF

if ("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}")
Expand Down
8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
| [CICE](https://github.com/GEOS-ESM/CICE) | [geos/v0.0.1](https://github.com/GEOS-ESM/CICE/releases/tag/geos%2Fv0.0.1) |
| [CPLFCST_Etc](https://github.com/GEOS-ESM/CPLFCST_Etc) | [v1.0.1](https://github.com/GEOS-ESM/CPLFCST_Etc/releases/tag/v1.0.1) |
| [ecbuild](https://github.com/GEOS-ESM/ecbuild) | [geos/v1.3.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv1.3.0) |
| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v3.28.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v3.28.0) |
| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v4.9.1](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v4.9.1) |
| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v3.29.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v3.29.0) |
| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v4.9.2](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v4.9.2) |
| [FMS](https://github.com/GEOS-ESM/FMS) | [geos/2019.01.02+noaff.8](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.8) |
| [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.3.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.3.0) |
| [geos-chem](https://github.com/GEOS-ESM/geos-chem) | [geos/v13.0.0-rc1](https://github.com/GEOS-ESM/geos-chem/releases/tag/geos%2Fv13.0.0-rc1) |
| [GEOS_OceanGridComp](https://github.com/GEOS-ESM/GEOS_OceanGridComp) | [v2.0.0](https://github.com/GEOS-ESM/GEOS_OceanGridComp/releases/tag/v2.0.0) |
| [GEOS_Util](https://github.com/GEOS-ESM/GEOS_Util) | [v2.0.0](https://github.com/GEOS-ESM/GEOS_Util/releases/tag/v2.0.0) |
| [GEOSchem_GridComp](https://github.com/GEOS-ESM/GEOSchem_GridComp) | [v1.12.2](https://github.com/GEOS-ESM/GEOSchem_GridComp/releases/tag/v1.12.2) |
| [GEOSgcm_App](https://github.com/GEOS-ESM/GEOSgcm_App) | [v2.1.1](https://github.com/GEOS-ESM/GEOSgcm_App/releases/tag/v2.1.1) |
| [GEOSgcm_App](https://github.com/GEOS-ESM/GEOSgcm_App) | [v2.1.2](https://github.com/GEOS-ESM/GEOSgcm_App/releases/tag/v2.1.2) |
| [GEOSgcm_GridComp](https://github.com/GEOS-ESM/GEOSgcm_GridComp) | [v2.1.1](https://github.com/GEOS-ESM/GEOSgcm_GridComp/releases/tag/v2.1.1) |
| [GEOSradiation_GridComp](https://github.com/GEOS-ESM/GEOSradiation_GridComp) | [v1.4.0](https://github.com/GEOS-ESM/GEOSradiation_GridComp/releases/tag/v1.3.0) |
| [GEOSradiation_GridComp](https://github.com/GEOS-ESM/GEOSradiation_GridComp) | [v1.4.0](https://github.com/GEOS-ESM/GEOSradiation_GridComp/releases/tag/v1.4.0) |
| [GFDL_atmos_cubed_sphere](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere) | [geos/v2.4.0](https://github.com/GEOS-ESM/GFDL_atmos_cubed_sphere/releases/tag/geos%2Fv2.4.0) |
| [GMI](https://github.com/GEOS-ESM/GMI) | [v1.0.0](https://github.com/GEOS-ESM/GMI/releases/tag/v1.0.0) |
| [GMAO_Shared](https://github.com/GEOS-ESM/GMAO_Shared) | [v1.9.0](https://github.com/GEOS-ESM/GMAO_Shared/releases/tag/v1.9.0) |
Expand Down
6 changes: 3 additions & 3 deletions components.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ GEOSgcm:
env:
local: ./@env
remote: ../ESMA_env.git
tag: v4.9.1
tag: v4.9.2
develop: main

cmake:
local: ./@cmake
remote: ../ESMA_cmake.git
tag: v3.28.0
tag: v3.29.0
develop: develop

ecbuild:
Expand Down Expand Up @@ -171,7 +171,7 @@ RRTMGP:
GEOSgcm_App:
local: ./src/Applications/@GEOSgcm_App
remote: ../GEOSgcm_App.git
tag: v2.1.1
tag: v2.1.2
develop: develop

UMD_Etc:
Expand Down