Merge branch 'develop' into feature/mathomp4/weight-logger

GEOS-ESM · Dec 10, 2024 · b134aa2 · b134aa2
2 parents ff54749 + c3d2046
commit b134aa2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Deprecated
 
+## [2.51.1] - 2024-12-10
+
+### Fixed
+
+- Properly nullified the pointers to the per-grid-cell counters
+
 ## [2.51.0] - 2024-12-06
 
 ### Added

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

diff --git a/generic/GenericCplComp.F90 b/generic/GenericCplComp.F90
@@ -326,6 +326,12 @@ subroutine Initialize(CC, SRC, DST, CLOCK, RC)
     _VERIFY(STATUS)
     allocate(STATE%ARRAY_COUNT (NCPLS), STAT=STATUS)
     _VERIFY(STATUS)
+    DO J = 1, NCPLS
+       NULLIFY(STATE%ARRAY_COUNT(J)%ptr1c)
+       NULLIFY(STATE%ARRAY_COUNT(J)%ptr2c)
+       NULLIFY(STATE%ARRAY_COUNT(J)%ptr3c)
+       NULLIFY(STATE%ARRAY_COUNT(J)%ptr4c)
+    END DO
     allocate(STATE%ACCUM_RANK (NCPLS), STAT=STATUS)
     _VERIFY(STATUS)
     allocate(STATE%couplerType(NCPLS), STAT=STATUS)