Skip to content

Commit

Permalink
Merge pull request #2914 from GEOS-ESM/hotfix/bmauer/fixes-#2913
Browse files Browse the repository at this point in the history
fixes #2913
  • Loading branch information
bena-nasa authored Jul 17, 2024
2 parents 2b97398 + 703b943 commit 98273b3
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Deprecated

## [2.47.1] - 2024-07-17

### Fixed

- Fixed bug in FieldSet routines when passing R8 ESMF fields

## [2.47.0] - 2024-06-24

### Added
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ endif ()

project (
MAPL
VERSION 2.47.0
VERSION 2.47.1
LANGUAGES Fortran CXX C) # Note - CXX is required for ESMF

# Set the possible values of build type for cmake-gui
Expand Down
4 changes: 2 additions & 2 deletions field_utils/FieldUtilities.F90
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ subroutine FieldSet_r8(field,constant_val,rc)
if (type_kind == ESMF_TYPEKIND_R4) then
call assign_fptr(field,f_ptr_r4,_RC)
f_ptr_r4 = constant_val
else if (type_kind == ESMF_TYPEKIND_R4) then
else if (type_kind == ESMF_TYPEKIND_R8) then
call assign_fptr(field,f_ptr_r8,_RC)
f_ptr_r8 = constant_val
else
Expand All @@ -87,7 +87,7 @@ subroutine FieldSet_r4(field,constant_val,rc)
if (type_kind == ESMF_TYPEKIND_R4) then
call assign_fptr(field,f_ptr_r4,_RC)
f_ptr_r4 = constant_val
else if (type_kind == ESMF_TYPEKIND_R4) then
else if (type_kind == ESMF_TYPEKIND_R8) then
call assign_fptr(field,f_ptr_r8,_RC)
f_ptr_r8 = constant_val
else
Expand Down

0 comments on commit 98273b3

Please sign in to comment.