Merge pull request #3107 from GEOS-ESM/hotfix/bmauer/fixes-#3073

Fixes #3073
GEOS-ESM · Oct 18, 2024 · 3baff6e · 3baff6e
2 parents f67c4d6 + a975d51
commit 3baff6e
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Deprecated
 
+## [2.50.1] - 2024-10-18
+
+### Fixed
+
+- Fixed unitialized variable bug in ExtData exposed by gfortran
+
 ## [2.50.0] - 2024-10-10
 
 ### Added

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,7 +8,7 @@ endif ()
 
 project (
   MAPL
-  VERSION 2.50.0
+  VERSION 2.50.1
   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/ExtDataBracket.F90 b/gridcomps/ExtData2G/ExtDataBracket.F90
@@ -21,8 +21,8 @@ module MAPL_ExtDataBracket
       real             :: offset = 0.0
       logical          :: disable_interpolation = .false.
       logical          :: intermittent_disable = .false.
-      logical          :: new_file_right
-      logical          :: new_file_left
+      logical          :: new_file_right = .false.
+      logical          :: new_file_left = .false.
       logical          :: exact = .false.
       contains
          procedure :: interpolate_to_time

diff --git a/gridcomps/ExtData2G/ExtDataOldTypesCreator.F90 b/gridcomps/ExtData2G/ExtDataOldTypesCreator.F90
@@ -116,6 +116,7 @@ subroutine fillin_primary(this,item_name,base_name,primary_item,time,clock,unusa
          primary_item%cycling=.true.
       else if (trim(time_sample%extrap_outside) == "persist_closest") then
          primary_item%persist_closest=.true.
+         primary_item%cycling=.false.
       else if (trim(time_sample%extrap_outside) == "none") then
          primary_item%cycling=.false.
          primary_item%persist_closest=.false.

diff --git a/gridcomps/ExtData2G/ExtDataSample.F90 b/gridcomps/ExtData2G/ExtDataSample.F90
@@ -38,14 +38,14 @@ function new_ExtDataTimeSample(config,unusable,rc) result(TimeSample)
 
       call TimeSample%set_defaults()
 
+      TimeSample%extrap_outside = "none"
       if (ESMF_HConfigIsDefined(config,keyString="extrapolation")) then
          TimeSample%extrap_outside=ESMF_HConfigAsString(config,keyString="extrapolation",_RC)
       end if
 
+      TimeSample%time_interpolation = .true.
       if (ESMF_HConfigIsDefined(config,keyString="time_interpolation")) then
          TimeSample%time_interpolation = ESMF_HConfigAsLogical(config,keyString="time_interpolation",_RC)
-      else
-         TimeSample%time_interpolation = .true.
       end if
 
       if (ESMF_HConfigIsDefined(config,keyString="exact")) then