From 606b7146510b794bd3a5c822543e76413130cd23 Mon Sep 17 00:00:00 2001 From: Atanas Trayanov Date: Mon, 11 Oct 2021 17:32:03 -0400 Subject: [PATCH 1/3] Fixes #1064. This bug has been in MAPL for a long time (classical "fence-post" problem). Once the new segment alarm rings, the new file should be open only after the current time step is written. --- CHANGELOG.md | 2 +- gridcomps/History/MAPL_HistoryGridComp.F90 | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e094e55d3f51..27407b592cb5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed ### Fixed - +- Fixes #1064. This is bug has been in MAPL for a long time. It shows only when the user specifies a non-default duration, and the last step of the duration interval is written to a new, separate file ## [2.8.6] - 2021-09-13 ### Added diff --git a/gridcomps/History/MAPL_HistoryGridComp.F90 b/gridcomps/History/MAPL_HistoryGridComp.F90 index 5fe808d2e47a..2b599f0316f3 100644 --- a/gridcomps/History/MAPL_HistoryGridComp.F90 +++ b/gridcomps/History/MAPL_HistoryGridComp.F90 @@ -3460,13 +3460,6 @@ subroutine Run ( gc, import, export, clock, rc ) _VERIFY(STATUS) endif - if( NewSeg .and. list(n)%unit /= 0 .and. list(n)%duration /= 0 ) then - if (list(n)%unit > 0 ) then - call FREE_FILE( list(n)%unit ) - end if - list(n)%unit = 0 - endif - end do if(any(Writing)) call WRITE_PARALLEL("") @@ -3647,6 +3640,13 @@ subroutine Run ( gc, import, export, clock, rc ) endif OUTTIME + if( NewSeg .and. list(n)%unit /= 0 .and. list(n)%duration /= 0 ) then + if (list(n)%unit > 0 ) then + call FREE_FILE( list(n)%unit ) + end if + list(n)%unit = 0 + endif + enddo POSTLOOP if (any(writing)) then From 06049af321b0071f792ecce076644d2efac93a8b Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 12 Oct 2021 08:40:53 -0400 Subject: [PATCH 2/3] Update CHANGELOG and CMake for 2.8.7 Release --- CHANGELOG.md | 6 ++++++ CMakeLists.txt | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 27407b592cb5..e4215a253b61 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed ### Fixed + +## [2.8.7] - 2021-10-12 + +### Fixed + - Fixes #1064. This is bug has been in MAPL for a long time. It shows only when the user specifies a non-default duration, and the last step of the duration interval is written to a new, separate file + ## [2.8.6] - 2021-09-13 ### Added diff --git a/CMakeLists.txt b/CMakeLists.txt index df22a8f0f8e9..96979e5d7044 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_policy (SET CMP0054 NEW) project ( MAPL - VERSION 2.8.6 + VERSION 2.8.7 LANGUAGES Fortran CXX C) # Note - CXX is required for ESMF # Set the default build type to release From 750f22229dbe05c8a7ce1ed963418d8626cb6faf Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 12 Oct 2021 08:48:13 -0400 Subject: [PATCH 3/3] Clean up changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 823538552bb6..516171f2c4a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added [scc](https://github.com/boyter/scc) badges to README - Added Service-Services functionality. Components could advertise services they can provide, they can request services to be done to a list of variables, and rrent components could connect services. + ### Changed - Moved newcfio modules from base into new griddedio directory