Skip to content

Commit

Permalink
Merge pull request #2517 from GEOS-ESM/feature/mathomp4/enable-ninja-ci
Browse files Browse the repository at this point in the history
Enable Ninja Builds of GEOS in CI
  • Loading branch information
mathomp4 authored Jan 5, 2024
2 parents 6c05fd2 + e9a4c53 commit 205f3e7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ workflows:
matrix:
parameters:
compiler: [ifort]
cmake_generator: ['Unix Makefiles']
cmake_generator: ['Unix Makefiles','Ninja']
baselibs_version: *baselibs_version
repo: MAPL
mepodevelop: false
Expand All @@ -61,7 +61,7 @@ workflows:
matrix:
parameters:
compiler: [gfortran]
cmake_generator: ['Unix Makefiles']
cmake_generator: ['Unix Makefiles','Ninja']
baselibs_version: *baselibs_version
repo: MAPL
mepodevelop: false
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Made changes to allocate fields to use farray instead of farrayPtr. This allows explicit specification of indexflag required by the new MAPL field split functionality. This functionality allows a clean way to create a new field from an exiting field where the new field is a 'slice' of the existing field with the slicing index being that of the trailing ungiridded dim of the existing field.
- Replaced RC=STATUS plus `_VERIFY(RC)` in `Base_Base_implementation.F90` with just `_RC` in line with our new convention.
- Updated CI to use Open MPI 5.0.0 for GNU
- Enable Ninja for CI builds of MAPL

### Fixed

Expand Down

0 comments on commit 205f3e7

Please sign in to comment.