Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge main into release/MAPL-v3 to get hot fix #2916

Closed
wants to merge 4 commits into from
Closed

Merge main into release/MAPL-v3 to get hot fix #2916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2b97398
Merge pull request #2887 from GEOS-ESM/develop
mathomp4 Jun 24, 2024
6201ced
fixes #2913
bena-nasa Jul 17, 2024
703b943
Update changelog and cmakelists for 2.47.1 release
mathomp4 Jul 17, 2024
98273b3
Merge pull request #2914 from GEOS-ESM/hotfix/bmauer/fixes-#2913
bena-nasa Jul 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading