<p><b>ringler@lanl.gov</b> 2010-12-10 10:33:14 -0700 (Fri, 10 Dec 2010)</p><p><br>
remove barriers from timer<br>
add timing at highest level to make sure we capture all time<br>
</p><hr noshade><pre><font color="gray">Modified: branches/ocean_projects/profiling/src/core_ocean/module_mpas_core.F
===================================================================
--- branches/ocean_projects/profiling/src/core_ocean/module_mpas_core.F        2010-12-10 03:15:31 UTC (rev 644)
+++ branches/ocean_projects/profiling/src/core_ocean/module_mpas_core.F        2010-12-10 17:33:14 UTC (rev 645)
@@ -119,13 +119,16 @@
             write(0,*) 'Doing timestep ', itimestep
             call timer_write()
          endif
-         call timer_start(&quot;time integration&quot;)
+         call timer_start(&quot;mpas_run_ts&quot;)
          call mpas_timestep(domain, itimestep, dt)
-         call timer_stop(&quot;time integration&quot;)
+         call timer_stop(&quot;mpas_run_ts&quot;)
    
          ! Move time level 2 fields back into time level 1 for next time step
+         call timer_start(&quot;maps_run_shift&quot;)
          call shift_time_levels_state(domain % blocklist % state)
+         call timer_start(&quot;mpas_run_shift&quot;)
    
+         call timer_start(&quot;mpas_run_io&quot;)
          if (mod(itimestep, config_output_interval) == 0) then
             call write_output_frame(output_obj, output_frame, domain)
          end if
@@ -134,6 +137,7 @@
             call output_state_for_domain(restart_obj, domain, restart_frame)
             restart_frame = restart_frame + 1
          end if
+         call timer_stop(&quot;mpas_run_io&quot;)
       end do
 
    end subroutine mpas_core_run

Modified: branches/ocean_projects/profiling/src/core_ocean/module_time_integration.F
===================================================================
--- branches/ocean_projects/profiling/src/core_ocean/module_time_integration.F        2010-12-10 03:15:31 UTC (rev 644)
+++ branches/ocean_projects/profiling/src/core_ocean/module_time_integration.F        2010-12-10 17:33:14 UTC (rev 645)
@@ -374,7 +374,7 @@
       nVertLevels = grid % nVertLevels
 
       u_src =&gt; grid % u_src % array
-      allocate(qq(nVertLevels)
+      allocate(qq(nVertLevels))
 
       call timer_stop(&quot;ts_rk4_stage_tend_hu_pointer&quot;)
 

Modified: branches/ocean_projects/profiling/src/driver/module_mpas_subdriver.F
===================================================================
--- branches/ocean_projects/profiling/src/driver/module_mpas_subdriver.F        2010-12-10 03:15:31 UTC (rev 644)
+++ branches/ocean_projects/profiling/src/driver/module_mpas_subdriver.F        2010-12-10 17:33:14 UTC (rev 645)
@@ -19,7 +19,7 @@
       real (kind=RKIND) :: dt
 
       call timer_start(&quot;total time&quot;)
-      call timer_start(&quot;initialize&quot;)
+      call timer_start(&quot;mpas_init&quot;)
 
 
       !
@@ -36,7 +36,7 @@
       !
       call mpas_core_init(domain)
 
-      call timer_stop(&quot;initialize&quot;)
+      call timer_stop(&quot;mpas_init&quot;)
 
 
       !
@@ -52,8 +52,12 @@
 
       implicit none
 
+      call timer_start(&quot;mpas_run&quot;)
+
       call mpas_core_run(domain, output_obj, output_frame)
 
+      call timer_stop(&quot;mpas_run&quot;)
+
    end subroutine mpas_run
 
 
@@ -61,6 +65,7 @@
    
       implicit none
 
+      call timer_start(&quot;mpas_finalize&quot;)
       !
       ! Finalize output streams
       !
@@ -72,6 +77,7 @@
       !
       call mpas_core_finalize(domain)
 
+      call timer_stop(&quot;mpas_finalize&quot;)
       call timer_stop(&quot;total time&quot;)
       call timer_write()
 

Modified: branches/ocean_projects/profiling/src/framework/module_timer.F
===================================================================
--- branches/ocean_projects/profiling/src/framework/module_timer.F        2010-12-10 03:15:31 UTC (rev 644)
+++ branches/ocean_projects/profiling/src/framework/module_timer.F        2010-12-10 17:33:14 UTC (rev 645)
@@ -280,10 +280,6 @@
       CALL system_clock (count_rate=hz)
       wall_now = REAL (clock)/REAL (hz)
 
-#ifdef _MPI
-      CALL MPI_BARRIER (MPI_COMM_WORLD,ierr)
-#endif
-
       IF (.NOT.ASSOCIATED (timer_events)) THEN
          PRINT *,' timer_write :: timer_write called with no events initiated '
          STOP
@@ -369,17 +365,9 @@
                ENDDO
             ENDIF
 
-#ifdef _MPI
-            CALL MPI_BARRIER (MPI_COMM_WORLD,ierr)
-#endif
-
          ENDDO
       ENDIF
 
-#ifdef _MPI
-      CALL MPI_BARRIER (MPI_COMM_WORLD,ierr)
-#endif
-
    10 FORMAT (1x,i5,' : ',a40,l1,2f15.5,f8.2)
    20 FORMAT (1x,i5,' : ',a40,l1,2f15.5     )
 

</font>
</pre>