<p><b>dwj07@fsu.edu</b> 2011-12-20 08:52:45 -0700 (Tue, 20 Dec 2011)</p><p><br>
        -- BRANCH COMMIT --<br>
<br>
        Cleaning up timers.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_hmix_del4.F
===================================================================
--- branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_hmix_del4.F        2011-12-20 01:05:47 UTC (rev 1263)
+++ branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_hmix_del4.F        2011-12-20 15:52:45 UTC (rev 1264)
@@ -18,7 +18,6 @@
use mpas_grid_types
use mpas_configure
- use mpas_timer
implicit none
private
@@ -135,8 +134,6 @@
if (del4On == 0) return
- call mpas_timer_start("compute_scalar_tend-horiz diff 4")
-
nEdges = grid % nEdges
nCells = grid % nCells
num_tracers = size(tracers, dim=1)
@@ -213,7 +210,6 @@
deallocate(delsq_tracer)
deallocate(boundaryMask)
- call mpas_timer_stop("compute_scalar_tend-horiz diff 4")
!--------------------------------------------------------------------
end subroutine ocn_tracer_hmix_del4_tend!}}}
Modified: branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_vadv_spline.F
===================================================================
--- branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_vadv_spline.F        2011-12-20 01:05:47 UTC (rev 1263)
+++ branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_vadv_spline.F        2011-12-20 15:52:45 UTC (rev 1264)
@@ -16,6 +16,7 @@
use mpas_grid_types
use mpas_configure
+ use mpas_timer
use ocn_tracer_vadv_spline2
use ocn_tracer_vadv_spline3
@@ -45,6 +46,7 @@
!
!--------------------------------------------------------------------
+ type (timer_node), pointer :: spline2_timer, spline3_timer
integer :: splineOn
@@ -124,8 +126,12 @@
if(splineOn == 0) return
+ call mpas_timer_start("spline 2", .false., spline2_timer)
call ocn_tracer_vadv_spline2_tend(grid, wTop, tracers, tend, err1)
+ call mpas_timer_stop("spline 2", spline2_timer)
+ call mpas_timer_start("spline 3", .false., spline3_timer)
call ocn_tracer_vadv_spline3_tend(grid, wTop, tracers, tend, err2)
+ call mpas_timer_stop("spline 3", spline3_timer)
err = ior(err1, err2)
Modified: branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_vadv_spline2.F
===================================================================
--- branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_vadv_spline2.F        2011-12-20 01:05:47 UTC (rev 1263)
+++ branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_vadv_spline2.F        2011-12-20 15:52:45 UTC (rev 1264)
@@ -16,7 +16,6 @@
use mpas_grid_types
use mpas_configure
- use mpas_timer
implicit none
private
@@ -125,8 +124,6 @@
if(spline2On == 0) return
! Compute tracerTop using linear interpolation.
- call mpas_timer_start("compute_scalar_tend-vert adv spline 2")
-
nCells = grid % nCells
nCellsSolve = grid % nCellsSolve
nVertLevels = grid % nVertLevels
@@ -163,8 +160,6 @@
end do
deallocate(tracerTop)
-
- call mpas_timer_stop("compute_scalar_tend-vert adv spline 2")
!--------------------------------------------------------------------
end subroutine ocn_tracer_vadv_spline2_tend!}}}
Modified: branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_vadv_spline3.F
===================================================================
--- branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_vadv_spline3.F        2011-12-20 01:05:47 UTC (rev 1263)
+++ branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_vadv_spline3.F        2011-12-20 15:52:45 UTC (rev 1264)
@@ -16,7 +16,6 @@
use mpas_grid_types
use mpas_configure
- use mpas_timer
use mpas_spline_interpolation
implicit none
@@ -129,8 +128,6 @@
if(spline3On == 0) return
! Compute tracerTop using linear interpolation.
- call mpas_timer_start("compute_scalar_tend-vert adv spline 3")
-
nCells = grid % nCells
nCellsSolve = grid % nCellsSolve
nVertLevels = grid % nVertLevels
@@ -191,8 +188,6 @@
deallocate(tracer2ndDer)
deallocate(tracersIn,tracersOut, posZMidZLevel, posZTopZLevel)
deallocate(tracerTop)
-
- call mpas_timer_stop("compute_scalar_tend-vert adv spline 3")
!--------------------------------------------------------------------
end subroutine ocn_tracer_vadv_spline3_tend!}}}
Modified: branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_vadv_stencil.F
===================================================================
--- branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_vadv_stencil.F        2011-12-20 01:05:47 UTC (rev 1263)
+++ branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_vadv_stencil.F        2011-12-20 15:52:45 UTC (rev 1264)
@@ -16,6 +16,7 @@
use mpas_grid_types
use mpas_configure
+ use mpas_timer
use ocn_tracer_vadv_stencil2
use ocn_tracer_vadv_stencil3
@@ -46,6 +47,8 @@
!
!--------------------------------------------------------------------
+ type (timer_node), pointer :: stencil2_timer, stencil3_timer, stencil4_timer
+
integer :: stencilOn
@@ -125,9 +128,15 @@
if(stencilOn == 0) return
+ call mpas_timer_start("stencil 2", .false., stencil2_timer)
call ocn_tracer_vadv_stencil2_tend(grid, wTop, tracers, tend, err1)
+ call mpas_timer_stop("stencil 2", stencil2_timer)
+ call mpas_timer_start("stencil 3", .false., stencil3_timer)
call ocn_tracer_vadv_stencil3_tend(grid, wTop, tracers, tend, err2)
+ call mpas_timer_stop("stencil 3", stencil3_timer)
+ call mpas_timer_start("stencil 4", .false., stencil4_timer)
call ocn_tracer_vadv_stencil4_tend(grid, wTop, tracers, tend, err3)
+ call mpas_timer_stop("stencil 4", stencil4_timer)
err = ior(err1, ior(err2, err3))
Modified: branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_vadv_stencil2.F
===================================================================
--- branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_vadv_stencil2.F        2011-12-20 01:05:47 UTC (rev 1263)
+++ branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_vadv_stencil2.F        2011-12-20 15:52:45 UTC (rev 1264)
@@ -16,7 +16,6 @@
use mpas_grid_types
use mpas_configure
- use mpas_timer
implicit none
private
@@ -124,9 +123,6 @@
if(stencil2On == 0) return
-
- call mpas_timer_start("compute_scalar_tend-vert adv stencil 2")
-
nCells = grid % nCells
nCellsSolve = grid % nCellsSolve
num_tracers = size(tracers, 1)
@@ -160,8 +156,6 @@
end do
deallocate(tracerTop)
- call mpas_timer_stop("compute_scalar_tend-vert adv stencil 2")
-
!--------------------------------------------------------------------
end subroutine ocn_tracer_vadv_stencil2_tend!}}}
Modified: branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_vadv_stencil3.F
===================================================================
--- branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_vadv_stencil3.F        2011-12-20 01:05:47 UTC (rev 1263)
+++ branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_vadv_stencil3.F        2011-12-20 15:52:45 UTC (rev 1264)
@@ -16,7 +16,6 @@
use mpas_grid_types
use mpas_configure
- use mpas_timer
implicit none
private
@@ -134,8 +133,6 @@
hRatioZLevelK => grid % hRatioZLevelK % array
hRatioZLevelKm1 => grid % hRatioZLevelKm1 % array
- call mpas_timer_start("compute_scalar_tend-vert adv stencil 3")
-
allocate(tracerTop(num_tracers,nVertLevels+1,nCells))
! Compute tracerTop using 3rd order stencil. This is the same
@@ -183,8 +180,6 @@
end do
deallocate(tracerTop)
- call mpas_timer_stop("compute_scalar_tend-vert adv stencil 3")
-
!--------------------------------------------------------------------
end subroutine ocn_tracer_vadv_stencil3_tend!}}}
Modified: branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_vadv_stencil4.F
===================================================================
--- branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_vadv_stencil4.F        2011-12-20 01:05:47 UTC (rev 1263)
+++ branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_vadv_stencil4.F        2011-12-20 15:52:45 UTC (rev 1264)
@@ -16,7 +16,6 @@
use mpas_grid_types
use mpas_configure
- use mpas_timer
implicit none
private
@@ -126,8 +125,6 @@
if(Stencil4On == 0) return
- call mpas_timer_start("compute_scalar_tend-vert adv stencil 4")
-
nCells = grid % nCells
nCellsSolve = grid % nCellsSolve
num_tracers = size(tracers, 1)
@@ -178,8 +175,6 @@
end do
deallocate(tracerTop)
- call mpas_timer_stop("compute_scalar_tend-vert adv stencil 4")
-
!--------------------------------------------------------------------
end subroutine ocn_tracer_vadv_stencil4_tend!}}}
Modified: branches/ocean_projects/performance/src/core_ocean/mpas_ocn_vmix.F
===================================================================
--- branches/ocean_projects/performance/src/core_ocean/mpas_ocn_vmix.F        2011-12-20 01:05:47 UTC (rev 1263)
+++ branches/ocean_projects/performance/src/core_ocean/mpas_ocn_vmix.F        2011-12-20 15:52:45 UTC (rev 1264)
@@ -55,7 +55,7 @@
!
!--------------------------------------------------------------------
- logical :: explicitOn, implicitOn
+ integer :: explicitOn, implicitOn
!***********************************************************************
@@ -197,10 +197,8 @@
err = 0
- if(implicitOn) return
+ if(implicitOn == 1) return
- call mpas_timer_start("compute_tend_u-explicit vert mix")
-
nEdgessolve = grid % nEdgesSolve
nVertLevels = grid % nVertLevels
maxLevelEdgeTop => grid % maxLevelEdgeTop % array
@@ -223,9 +221,6 @@
end do
deallocate(fluxVertTop)
-
- call mpas_timer_stop("compute_tend_u-explicit vert mix")
-
!--------------------------------------------------------------------
end subroutine ocn_vel_vmix_tend_explicit!}}}
@@ -303,7 +298,7 @@
err = 0
- if(explicitOn) return
+ if(explicitOn == 1) return
nEdges = grid % nEdges
nVertLevels = grid % nVertLevels
@@ -418,10 +413,8 @@
err = 0
- if(implicitOn) return
+ if(implicitOn == 1) return
- call mpas_timer_start("compute_scalar_tend-explicit vert diff")
-
nCellsSolve = grid % nCellsSolve
nVertLevels = grid % nVertLevels
num_tracers = size(tracers, dim=1)
@@ -456,9 +449,6 @@
!print '(a,50e12.2)', 'tend_tr ',tend_tr(3,1,1:maxLevelCell(iCell))
enddo ! iCell loop
deallocate(fluxVertTop)
-
- call mpas_timer_stop("compute_scalar_tend-explicit vert diff")
-
!--------------------------------------------------------------------
end subroutine ocn_tracer_vmix_tend_explicit!}}}
@@ -529,7 +519,7 @@
err = 0
- if(explicitOn) return
+ if(explicitOn == 1) return
nCells = grid % nCells
nVertLevels = grid % nVertLevels
@@ -599,12 +589,12 @@
err = 0
- explicitOn = .true.
- implicitOn = .false.
+ explicitOn = 1
+ implicitOn = 0
if(config_implicit_vertical_mix) then
- explicitOn = .false.
- implicitOn =.true.
+ explicitOn = 0
+ implicitOn = 1
end if
call ocn_vmix_coefs_const_init(err1)
Modified: branches/ocean_projects/performance/src/core_ocean/mpas_ocn_vmix_coefs_rich.F
===================================================================
--- branches/ocean_projects/performance/src/core_ocean/mpas_ocn_vmix_coefs_rich.F        2011-12-20 01:05:47 UTC (rev 1263)
+++ branches/ocean_projects/performance/src/core_ocean/mpas_ocn_vmix_coefs_rich.F        2011-12-20 15:52:45 UTC (rev 1264)
@@ -141,10 +141,10 @@
rhoDisplaced => s % rhoDisplaced % array
tracers => s % tracers % array
- call mpas_timer_start("equation of state - rich", .false., richEOSTimer)
+ call mpas_timer_start("eos rich", .false., richEOSTimer)
call ocn_equation_of_state_rho(s, grid, 0, 'relative', err)
call ocn_equation_of_state_rho(s, grid, 1, 'relative', err)
- call mpas_timer_stop("equation of state - rich", richEOSTimer)
+ call mpas_timer_stop("eos rich", richEOSTimer)
call ocn_vmix_get_rich_numbers(grid, indexT, indexS, u, h, h_edge, &
rho, rhoDisplaced, tracers, RiTopOfEdge, RiTopOfCell, err1)
</font>
</pre>