Skip to content

Commit

Permalink
Merge pull request #152 from GEOS-ESM/sdrabenh-patch-1
Browse files Browse the repository at this point in the history
Updates for new GCM release
  • Loading branch information
sdrabenh authored Jun 5, 2020
2 parents daf536f + e293d23 commit 4aa9892
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 8 deletions.
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,20 @@
# Changelog

## [10.12.5] - 2020-06-05

### Zero-diff to previous release: YES

### Restart Changes: NO

Changes include:
1. Uptick the versions of many sub-repos (MAPL,cmake,env,GEOSchem_GridComp,GEOSgcm_GridComp,GEOSgcm_App,GMAO_Shared).
2. Bugfix for array bounds in RRTMG LW.
3. Rolls back the constraint on gcmpost.script to only operate on pressure-level collections.
4. Added ignore_nan option for time_ave.F (off by default).
5. Enables correct post proccessing of MAPL monthly collections.
6. CICE updates for reading binary grid files.
7. MIN_FREEZE_SALINITY added to AGCM.rc in coupled mode.

## [10.12.4] - 2020-05-15

### 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.12.4
VERSION 10.12.5
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.3
tag = v1.1.4
protocol = git
sparse = ../../../config/GMAO_Shared.sparse

Expand Down
6 changes: 3 additions & 3 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.3
tag = v1.1.4
protocol = git
sparse = ../../../config/GMAO_Shared.sparse

Expand Down Expand Up @@ -54,15 +54,15 @@ protocol = git
required = True
repo_url = [email protected]:GEOS-ESM/GEOSgcm_GridComp.git
local_path = ./src/Components/@GEOSgcm_GridComp
tag = v1.8.5
tag = v1.8.6
protocol = git
externals = Externals.cfg

[GEOSgcm_App]
required = True
repo_url = [email protected]:GEOS-ESM/GEOSgcm_App.git
local_path = ./src/Applications/@GEOSgcm_App
tag = v1.3.3
tag = v1.3.4
protocol = git

[UMD_Etc]
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.3
tag: v1.1.4
sparse: ./config/GMAO_Shared.sparse
develop: master

Expand All @@ -49,7 +49,7 @@ FMS:
GEOSgcm_GridComp:
local: ./src/Components/@GEOSgcm_GridComp
remote: ../GEOSgcm_GridComp.git
tag: v1.8.5
tag: v1.8.6
develop: develop

FVdycoreCubed_GridComp:
Expand Down Expand Up @@ -79,7 +79,7 @@ mom:
GEOSgcm_App:
local: ./src/Applications/@GEOSgcm_App
remote: ../GEOSgcm_App.git
tag: v1.3.3
tag: v1.3.4
develop: develop

UMD_Etc:
Expand Down

0 comments on commit 4aa9892

Please sign in to comment.