Merge pull request #3414 from GEOS-ESM/bugfix/atrayano/#3412_internal…

…_timer_fix Fixed nesting of internal timers (see also commit
GEOS-ESM · Feb 12, 2025 · 27f68b2 · 27f68b2
2 parents 61f9fc4 + 74516a4
commit 27f68b2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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