Skip to content

Commit

Permalink
Merge pull request #1301 from GEOS-ESM/hotfix/bmauer/fix_regrid_util_…
Browse files Browse the repository at this point in the history
…reporting

fix bug in profiler reporting caused by recent mapl change
  • Loading branch information
mathomp4 authored Jan 13, 2022
2 parents b9577d3 + e55a55f commit 9182b06
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 1 deletion.
5 changes: 5 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,8 @@ indent_size = 2
[{CMakeLists.txt,*.cmake,*.rst}]
indent_style = space
indent_size = 2

# Markdown
[*.md]
trim_trailing_whitespace = true
indent_style = space
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Finalize profiler in MAPL_finalize call
- Fix how a retry-build is done in CI
- Fix issue with logger message and single quotes
- Fix bug with profiler reporting in programs

### Changed

Expand All @@ -36,6 +37,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- extracted helper procedures in GenericInitialize
- Added new step to CircleCI to try and re-run build on failure.
- Updated CircleCI config to use new [GEOS-ESM/circleci-tools orb](https://circleci.com/developer/orbs/orb/geos-esm/circleci-tools)
- Added Markdown rules to `.editorconfig`

## [2.15.1] - 2022-01-06

Expand Down
3 changes: 2 additions & 1 deletion griddedio/Regrid_Util.F90
Original file line number Diff line number Diff line change
Expand Up @@ -450,8 +450,9 @@ subroutine main()
call ESMF_VMBarrier(VM,_RC)

call io_server%finalize()
call t_prof%finalize()
call t_prof%stop()
call t_prof%reduce()
call t_prof%finalize()
call generate_report()
call MAPL_Finalize(_RC)
call ESMF_Finalize ( _RC )
Expand Down

0 comments on commit 9182b06

Please sign in to comment.