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.

Sign up for GitHub

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

Fixes #1292. Fix for Logger Message #1293

Merged
merged 3 commits into from
Jan 12, 2022
Merged

Fixes #1292. Fix for Logger Message #1293

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
212ec72
Fixes #1292. Fix for Logger Message
mathomp4 Jan 11, 2022
97b38d0
Update generic/MAPL_Generic.F90
mathomp4 Jan 12, 2022
1d86cdc
Make extension deferred
mathomp4 Jan 12, 2022
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]

### Fixed

- Free types and operation created by profiler
- Finalize profiler in MAPL_finalize call
- Fix issue with logger message and single quotes

### Added

Expand Down
6 changes: 3 additions & 3 deletions generic/MAPL_Generic.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -759,7 +759,7 @@ end subroutine MAPL_GenericSetServices

! !INTERFACE:
recursive subroutine MAPL_GenericInitialize ( GC, import, EXPORT, CLOCK, RC )

!ARGUMENTS:
type(ESMF_GridComp), intent(INOUT) :: GC ! Gridded component
type(ESMF_State), intent(INOUT) :: IMPORT ! Import state
Expand Down Expand Up @@ -1656,7 +1656,7 @@ subroutine handle_services(rc)
if (state%requested_services%size()>0) then
call FillRequestBundle(state%requested_services, state%get_internal_state(), __RC__)
end if

! process any service connections
call MAPL_ProcessServiceConnections(state, __RC__)

Expand Down Expand Up @@ -4796,7 +4796,7 @@ recursive integer function AddChildFromDSO(gc, name, userRoutine, grid, sharedOb

if (.not. is_valid_dso_name(SharedObj)) then
lgr => logging%get_logger('MAPL.GENERIC')
call lgr%warning("AddChildFromDSO: changing shared library extension '%a~' to system specific extension '%a~'.", &
call lgr%warning("AddChildFromDSO: changing shared library extension from %a~ to system specific extension %a~", &
extension, SYSTEM_DSO_EXTENSION)
end if

Expand Down