Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handmerge main into develop (2021-Oct-12) #1072

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -36,6 +37,12 @@ rrent components could connect services.
- Fixed #338. Added a workaround for a gfortran bug that handles end-of-file incorrectly (returns IOSTAT=5001).
- Fixed ESMF logging errors from MAPL_IO (#1032)

## [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
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions gridcomps/History/MAPL_HistoryGridComp.F90
Original file line number Diff line number Diff line change
Expand Up @@ -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("")
Expand Down Expand Up @@ -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
Expand Down