From 74516a45c08294668315c001a541e7c74f645f2f Mon Sep 17 00:00:00 2001 From: Atanas Trayanov Date: Wed, 12 Feb 2025 11:54:07 -0500 Subject: [PATCH] Fixed nesting of internal timers (see also commit 707681be4771158e250277f618158d1b098ae0c3) --- CHANGELOG.md | 1 + generic/MAPL_Generic.F90 | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c008fb67a45..1c85f24f8475 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed ### Fixed +Fixed nesting of internal timers (issue #3412) ### Removed diff --git a/generic/MAPL_Generic.F90 b/generic/MAPL_Generic.F90 index 1df5c7986940..6568f2f3b4e4 100644 --- a/generic/MAPL_Generic.F90 +++ b/generic/MAPL_Generic.F90 @@ -1883,8 +1883,8 @@ recursive subroutine MAPL_GenericWrapper ( GC, IMPORT, EXPORT, CLOCK, RC) call state%t_profiler%stop(trim(sbrtn),_RC) call state%t_profiler%stop(_RC) end if - call t_p%stop(trim(state%compname),_RC) endif + call t_p%stop(trim(state%compname),_RC) _RETURN(ESMF_SUCCESS) @@ -2421,8 +2421,6 @@ recursive subroutine MAPL_GenericFinalize ( GC, IMPORT, EXPORT, CLOCK, RC ) call report_generic_profile() end if - call t_p%stop(trim(state%compname),_RC) - ! Clean-up !--------- !ALT