Skip to content

Commit

Permalink
Merge pull request #1293 from GEOS-ESM/bugfix/mathomp4/#1292-logger-m…
Browse files Browse the repository at this point in the history
…essage

Fixes #1292. Fix for Logger Message
  • Loading branch information
mathomp4 authored Jan 12, 2022
2 parents f98fae5 + 1d86cdc commit d926292
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
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
10 changes: 5 additions & 5 deletions generic/MAPL_Generic.F90
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 @@ -4772,7 +4772,7 @@ recursive integer function AddChildFromDSO(gc, name, userRoutine, grid, sharedOb

class(Logger), pointer :: lgr
character(len=:), allocatable :: shared_object_library_to_load
character(len=6) :: extension
character(len=:), allocatable :: extension

call MAPL_InternalStateRetrieve(gc, meta, __RC__)

Expand All @@ -4796,8 +4796,8 @@ 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~'.", &
extension, SYSTEM_DSO_EXTENSION)
call lgr%warning("AddChildFromDSO: changing shared library extension from %a~ to system specific extension %a~", &
"'"//extension//"'", "'"//SYSTEM_DSO_EXTENSION//"'")
end if

shared_object_library_to_load = adjust_dso_name(sharedObj)
Expand Down

0 comments on commit d926292

Please sign in to comment.