Merge pull request #472 from GEOS-ESM/hotfix/wjiang/#469_double_timer

fix double timers
GEOS-ESM · Jun 26, 2020 · f5ab59a · f5ab59a
2 parents a79da9b + f547210
commit f5ab59a
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 13 deletions.
diff --git a/base/MAPL_CapGridComp.F90 b/base/MAPL_CapGridComp.F90
@@ -551,21 +551,15 @@ subroutine initialize_gc(gc, import_state, export_state, clock, rc)
        !----------------------------------------
 
        call t_p%start('Initialize')
-       call t_p%start(trim(root_name))
        call ESMF_GridCompInitialize(cap%gcs(cap%root_id), importState = cap%child_imports(cap%root_id), &
             exportState = cap%child_exports(cap%root_id), clock = cap%clock, userRC = status)
        _VERIFY(status)
-       call t_p%stop(trim(root_name))
 
-       call t_p%start('HIST')
        call cap%initialize_history(rc=status)
        _VERIFY(status)
-       call t_p%stop('HIST')
 
-       call t_p%start('EXTDATA')
        call cap%initialize_extdata(rc=status)
        _VERIFY(status)
-       call t_p%stop('EXTDATA')
 
        ! Finally check is this is a regular replay
        ! If so stuff gc and input state for ExtData in GCM internal state

diff --git a/base/MAPL_Generic.F90 b/base/MAPL_Generic.F90
@@ -1475,8 +1475,6 @@ recursive subroutine MAPL_GenericInitialize ( GC, IMPORT, EXPORT, CLOCK, RC )
                call ESMF_GridCompGet( STATE%GCS(I), NAME=CHILD_NAME, RC=STATUS )
                _VERIFY(STATUS)
 
-               t_p => get_global_time_profiler()
-               call t_p%start(trim(CHILD_NAME),__RC__)
                call MAPL_GenericStateClockOn (STATE,trim(CHILD_NAME))
                call ESMF_GridCompInitialize (STATE%GCS(I), &
                     importState=STATE%GIM(I), &
@@ -1485,7 +1483,6 @@ recursive subroutine MAPL_GenericInitialize ( GC, IMPORT, EXPORT, CLOCK, RC )
                     userRC=userRC, RC=STATUS )
                _ASSERT(userRC==ESMF_SUCCESS .and. STATUS==ESMF_SUCCESS,'needs informative message')
                call MAPL_GenericStateClockOff(STATE,trim(CHILD_NAME))
-               call t_p%stop(trim(CHILD_NAME),__RC__)
             end if
          end do
          deallocate(CHLDMAPL)
@@ -2292,7 +2289,6 @@ recursive subroutine MAPL_GenericRecord ( GC, IMPORT, EXPORT, CLOCK, RC )
   _VERIFY(STATUS)
 
   t_p => get_global_time_profiler()
-  call t_p%start(trim(state%compname),__RC__)
   call state%t_profiler%start(__RC__)
   call state%t_profiler%start('Record',__RC__)
 
@@ -2392,7 +2388,6 @@ recursive subroutine MAPL_GenericRecord ( GC, IMPORT, EXPORT, CLOCK, RC )
 
   call state%t_profiler%stop('Record',__RC__)
   call state%t_profiler%stop(__RC__)
-  call t_p%stop(trim(state%compname),__RC__)
 
   _RETURN(ESMF_SUCCESS)
 end subroutine MAPL_GenericRecord
@@ -2517,7 +2512,6 @@ recursive subroutine MAPL_GenericRefresh ( GC, IMPORT, EXPORT, CLOCK, RC )
   _VERIFY(STATUS)
 
   t_p => get_global_time_profiler()
-  call t_p%start(trim(state%compname),__RC__)
   call state%t_profiler%start(__RC__)
   call state%t_profiler%start('Refresh',__RC__)
 
@@ -2605,7 +2599,6 @@ recursive subroutine MAPL_GenericRefresh ( GC, IMPORT, EXPORT, CLOCK, RC )
   call state%t_profiler%stop('Refresh_self',__RC__)
   call state%t_profiler%stop('Refresh',__RC__)
   call state%t_profiler%stop(__RC__)
-  call t_p%stop(trim(state%compname),__RC__)
 
   _RETURN(ESMF_SUCCESS)
 end subroutine MAPL_GenericRefresh