Skip to content

Commit

Permalink
Merge branch 'master' into feature/mathomp4/update-to-cmake301
Browse files Browse the repository at this point in the history
  • Loading branch information
sdrabenh authored Apr 21, 2020
2 parents ccfcb84 + 85fe25a commit 4443afa
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# Changelog

## [10.12.3] - 2020-04-21

### Zero-diff to previous release: YES

### Restart Changes: NO

Major changes are:
* Add monthly mean feature.

Fixed:
* Added a default initialization clause for pFlogger so that INFO messages go to console.
* Workaround for MPT 2.17 build bug with `MPI_Comm_set_errhandler`.

## [10.12.2] - 2020-04-16

### 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.2
VERSION 10.12.3
LANGUAGES Fortran CXX C) # Note - CXX is required for ESMF

if ("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}")
Expand Down

0 comments on commit 4443afa

Please sign in to comment.