Skip to content

Commit

Permalink
Merge pull request #204 from GEOS-ESM/sdrabenh-patch-1
Browse files Browse the repository at this point in the history
Update to v10.15.0
  • Loading branch information
sdrabenh authored Sep 25, 2020
2 parents 10547c4 + 3f28a9e commit efc8fda
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 7 deletions.
25 changes: 25 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,30 @@
# Changelog

## [10.15.0] - 2020-09-25

### Zero-diff to previous release: NO

### Restart Changes: YES for values; NO for entries/structure

Major non-0-diff changes include:
1. Update to ESMA_env v3.0.0 (NOTE: ***SLES 11 Support at NCCS is Removed***)
* ESMA Baselibs 6.0.16
* Use a new Python Stack: GEOSpyD/Min4.8.3_py2.7
* Update compilers and MPI stacks
* NCCS
* Intel Fortran 19.1.2
* Intel MPI 19.1.2
* NAS
* Intel Fortran 2020.2.254 (aka 19.1.2)
* MPT 2.17 (same as before)
* GMAO Desktop
* Intel Fortran 19.1.2
* Open MPI 4.0.4
2. The GEOSadas-5_27_0 version of GEOS_Shared/GEOS_Utilities.F90 has slightly different code, `nint()` instead of `int()`. This brings git up to date.
3. Bugfix for computations in uwshcu.F90 that involved `MAPL_UNDEF`
4. Bug fix for GCC 10 with `DRHOS0`
5. Upgrade to GEOSchem_GridComp v1.4.1

## [10.14.2] - 2020-09-25

### Zero-diff to previous release: YES
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ cmake_policy (SET CMP0054 NEW)

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

if ("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}")
Expand Down
2 changes: 1 addition & 1 deletion Develop.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ sparse = ../../../config/NCEP_Shared.sparse
required = True
repo_url = [email protected]:GEOS-ESM/GMAO_Shared.git
local_path = ./src/Shared/@GMAO_Shared
tag = v1.1.10
tag = v1.2.0
protocol = git
sparse = ../../../config/GMAO_Shared.sparse

Expand Down
4 changes: 2 additions & 2 deletions Externals.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ sparse = ../../../config/NCEP_Shared.sparse
required = True
repo_url = [email protected]:GEOS-ESM/GMAO_Shared.git
local_path = ./src/Shared/@GMAO_Shared
tag = v1.1.10
tag = v1.2.0
protocol = git
sparse = ../../../config/GMAO_Shared.sparse

Expand All @@ -47,7 +47,7 @@ protocol = git
required = True
repo_url = [email protected]:GEOS-ESM/GEOSgcm_GridComp.git
local_path = ./src/Components/@GEOSgcm_GridComp
tag = v1.10.3
tag = v1.11.0
protocol = git
externals = Externals.cfg
sparse = ../../../config/GEOSgcm_GridComp.sparse
Expand Down
6 changes: 3 additions & 3 deletions components.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ NCEP_Shared:
GMAO_Shared:
local: ./src/Shared/@GMAO_Shared
remote: ../GMAO_Shared.git
tag: v1.1.10
tag: v1.2.0
sparse: ./config/GMAO_Shared.sparse
develop: main

Expand All @@ -44,7 +44,7 @@ FMS:
GEOSgcm_GridComp:
local: ./src/Components/@GEOSgcm_GridComp
remote: ../GEOSgcm_GridComp.git
tag: v1.10.3
tag: v1.11.0
sparse: ./config/GEOSgcm_GridComp.sparse
develop: develop

Expand All @@ -63,7 +63,7 @@ fvdycore:
GEOSchem_GridComp:
local: ./src/Components/@GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/@GEOSchem_GridComp
remote: ../GEOSchem_GridComp.git
tag: v1.3.5
tag: v1.4.1
develop: develop

mom:
Expand Down

0 comments on commit efc8fda

Please sign in to comment.