Merge pull request #2915 from GEOS-ESM/main

Auto GitFlow - main → develop
GEOS-ESM · Jul 17, 2024 · 89f6c45 · 89f6c45
2 parents 3ec6b97 + 98273b3
commit 89f6c45
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,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

diff --git 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

diff --git 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