Merge branch 'main' into develop

GEOS-ESM · Feb 6, 2024 · 60b7bfa · 60b7bfa
2 parents d8fdef7 + 70d50bc
commit 60b7bfa
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -46,6 +46,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Deprecated
 
+## [2.43.2] - 2024-02-06
+
+### Fixed
+
+- Fixed memory leak affecting regional masking. Temporary ESMF field was created but never destroyed
+
 ## [2.43.1] - 2024-01-29
 
 ### Fixed

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,7 +8,7 @@ endif ()
 
 project (
   MAPL
-  VERSION 2.43.1
+  VERSION 2.43.2
   LANGUAGES Fortran CXX C)  # Note - CXX is required for ESMF
 
 # Set the possible values of build type for cmake-gui

diff --git a/gridcomps/ExtData2G/ExtDataMasking.F90 b/gridcomps/ExtData2G/ExtDataMasking.F90
@@ -186,6 +186,7 @@ subroutine evaluate_region_mask(this,state,var_name,rc)
           enddo
        end if
        deallocate( mask)
+       call ESMF_FieldDestroy(temp_field, noGarbage=.true., _RC)
 
       _RETURN(_SUCCESS)
    end subroutine evaluate_region_mask
@@ -256,6 +257,7 @@ subroutine evaluate_zone_mask(this,state,var_name,rc)
              where(limitS <= lats .and. lats <=limitN) var3d(:,:,i) = rvar3d(:,:,i)
           enddo
        end if
+       call ESMF_FieldDestroy(temp_field, noGarbage=.true., _RC)
 
       _RETURN(_SUCCESS)
    end subroutine evaluate_zone_mask
@@ -424,6 +426,7 @@ subroutine evaluate_box_mask(this,state,var_name,rc)
           end if
           deallocate(temp2d)
        end if
+       call ESMF_FieldDestroy(temp_field, noGarbage=.true., _RC)
 
        _RETURN(_SUCCESS)
   end subroutine evaluate_box_mask