Skip to content

Commit

Permalink
Merge pull request #2471 from GEOS-ESM/feature/aoloso/hybrid_112923
Browse files Browse the repository at this point in the history
Field allocation for SSI capability
  • Loading branch information
mathomp4 authored Dec 21, 2023
2 parents 01600d3 + 4720e06 commit d5b695e
Show file tree
Hide file tree
Showing 4 changed files with 462 additions and 905 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed

- Updated ESMF required version to 8.6.0
- Allocate gridded fields to use the pinflag option needed for the Single System Image (SSI) capability.
- 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.

### Fixed

### Removed
Expand Down
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ if (NOT Baselibs_FOUND)
endif()

if (NOT TARGET esmf)
find_package(ESMF 8.5.0 MODULE REQUIRED)
find_package(ESMF 8.6.0 MODULE REQUIRED)

# ESMF as used in MAPL requires MPI
# NOTE: This looks odd because some versions of FindESMF.cmake out in the
Expand All @@ -167,8 +167,8 @@ else ()
# This is an ESMF version test when using Baselibs which doesn't use the
# same find_package internally in ESMA_cmake as used above (with a version
# number) so this lets us at least trap use of old Baselibs here.
if (ESMF_VERSION VERSION_LESS 8.5.0)
message(FATAL_ERROR "ESMF must be at least 8.5.0")
if (ESMF_VERSION VERSION_LESS 8.6.0)
message(FATAL_ERROR "ESMF must be at least 8.6.0")
endif ()
endif ()

Expand Down
Loading

0 comments on commit d5b695e

Please sign in to comment.