From 212ec722d4515dfc81048046c2d1b7eeb2a6a645 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Tue, 11 Jan 2022 16:20:26 -0500 Subject: [PATCH 1/3] Fixes #1292. Fix for Logger Message --- CHANGELOG.md | 2 ++ generic/MAPL_Generic.F90 | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 51d2309cd96c..62ba1764fb2f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/generic/MAPL_Generic.F90 b/generic/MAPL_Generic.F90 index 6e9592ec56af..ea1aa0d7c166 100644 --- a/generic/MAPL_Generic.F90 +++ b/generic/MAPL_Generic.F90 @@ -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 @@ -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__) @@ -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 From 97b38d0adb92b109a912f9bca81f603c67dd0a97 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 12 Jan 2022 09:50:41 -0500 Subject: [PATCH 2/3] Update generic/MAPL_Generic.F90 Co-authored-by: Tom Clune --- generic/MAPL_Generic.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generic/MAPL_Generic.F90 b/generic/MAPL_Generic.F90 index ea1aa0d7c166..dc7b2b9e80ac 100644 --- a/generic/MAPL_Generic.F90 +++ b/generic/MAPL_Generic.F90 @@ -4797,7 +4797,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 from %a~ to system specific extension %a~", & - extension, SYSTEM_DSO_EXTENSION) + "'"//extension//"'", "'"//SYSTEM_DSO_EXTENSION//"'") end if shared_object_library_to_load = adjust_dso_name(sharedObj) From 1d86cdc90542d0fbaac9da13878762adaed24577 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 12 Jan 2022 14:41:31 -0500 Subject: [PATCH 3/3] Make extension deferred --- generic/MAPL_Generic.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generic/MAPL_Generic.F90 b/generic/MAPL_Generic.F90 index dc7b2b9e80ac..93953bf25dc7 100644 --- a/generic/MAPL_Generic.F90 +++ b/generic/MAPL_Generic.F90 @@ -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__)