Merge branch 'develop' into release/MAPL-v3

GEOS-ESM · Oct 30, 2024 · 6f7fa28 · 6f7fa28
2 parents 484cf14 + 4a99e60
commit 6f7fa28
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -95,6 +95,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Deprecated
 
+## [2.50.2] - 2024-10-30
+
+### Fixed
+
+- Fixed bug with cycle placement in coupler loop in History
+
 ## [2.50.1] - 2024-10-18
 
 ### Fixed

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,7 +8,7 @@ endif ()
 
 project (
   MAPL
-  VERSION 2.50.1
+  VERSION 2.50.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/History/MAPL_HistoryGridComp.F90 b/gridcomps/History/MAPL_HistoryGridComp.F90
@@ -3400,9 +3400,9 @@ subroutine Run ( gc, import, export, clock, rc )
 !-------------------------------
 
     do n = 1, nlist
+       if(Ignore(n)) cycle
        call MAPL_TimerOn(GENSTATE,trim(list(n)%collection))
        call MAPL_TimerOn(GENSTATE,"Couplers")
-       if(Ignore(n)) cycle
        if (.not.list(n)%disabled .and. IntState%average(n)) then
           ! R8 to R4 copy (if needed!)
           do m=1,list(n)%field_set%nfields