From 087b3baf058290fcb3b958ff71f2a00e04abd9b5 Mon Sep 17 00:00:00 2001 From: Benjamin Auer Date: Mon, 28 Oct 2024 16:47:52 -0400 Subject: [PATCH 1/2] fixs #3131 --- CHANGELOG.md | 2 ++ gridcomps/History/MAPL_HistoryGridComp.F90 | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2297ea76d36a..53dbee103944 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +- Fixed bug with cycle plament in coupler loop in History + ### Fixed ### Removed diff --git a/gridcomps/History/MAPL_HistoryGridComp.F90 b/gridcomps/History/MAPL_HistoryGridComp.F90 index adc88d215dbb..17deb2db1299 100644 --- a/gridcomps/History/MAPL_HistoryGridComp.F90 +++ b/gridcomps/History/MAPL_HistoryGridComp.F90 @@ -3394,9 +3394,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 From 958144c550d793d8f6a1b515ffe4d9bf2133b8d9 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 29 Oct 2024 14:17:13 -0400 Subject: [PATCH 2/2] Update CMakelists and changelog for 2.50.2 --- CHANGELOG.md | 8 ++++++-- CMakeLists.txt | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 53dbee103944..3669b343278b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,14 +11,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed -- Fixed bug with cycle plament in coupler loop in History - ### Fixed ### Removed ### 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 index 2c9918425f9c..c8c6ebf7a5bc 100644 --- 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