From 6201ced9727705818c937fa436c5ee7a4583b5d9 Mon Sep 17 00:00:00 2001 From: Benjamin Auer Date: Wed, 17 Jul 2024 11:50:49 -0400 Subject: [PATCH 1/2] fixes #2913 --- CHANGELOG.md | 2 ++ field_utils/FieldUtilities.F90 | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 21512b2194c4..21333b8d2371 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed +- Fixed bug in FieldSet routines when passing R8 ESMF fields + ### Removed ### Deprecated diff --git a/field_utils/FieldUtilities.F90 b/field_utils/FieldUtilities.F90 index 130d09222f8e..e4f8e2930049 100644 --- a/field_utils/FieldUtilities.F90 +++ b/field_utils/FieldUtilities.F90 @@ -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 @@ -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 From 703b94314b839c009a712b4b223a1903b689c87d Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 17 Jul 2024 12:11:36 -0400 Subject: [PATCH 2/2] Update changelog and cmakelists for 2.47.1 release --- CHANGELOG.md | 8 ++++++-- CMakeLists.txt | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 21333b8d2371..dac6501fe597 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,12 +13,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed -- Fixed bug in FieldSet routines when passing R8 ESMF fields - ### Removed ### 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 diff --git a/CMakeLists.txt b/CMakeLists.txt index 5fdc64dc96b7..34a9c4d35e30 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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