<p><b>dwj07@fsu.edu</b> 2012-08-21 11:39:57 -0600 (Tue, 21 Aug 2012)</p><p><br>
-- BRANCH COMMIT --<br>
<br>
Adding names to critical sections.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/omp_blocks/openmp_test/src/core_sw_elements/mpas_sw_time_integration.F
===================================================================
--- branches/omp_blocks/openmp_test/src/core_sw_elements/mpas_sw_time_integration.F 2012-08-21 17:14:59 UTC (rev 2111)
+++ branches/omp_blocks/openmp_test/src/core_sw_elements/mpas_sw_time_integration.F 2012-08-21 17:39:57 UTC (rev 2112)
@@ -372,13 +372,13 @@
cell2 = cellsOnEdge(2,iEdge)
do k=1,nVertLevels
flux = u(k,iEdge) * dvEdge(iEdge) * h_edge(k,iEdge)
- !$omp critical
+ !$omp critical (crit_cell1_tend_h)
tend_h(k,cell1) = tend_h(k,cell1) - flux
- !$omp end critical
+ !$omp end critical (crit_cell1_tend_h)
- !$omp critical
+ !$omp critical (crit_cell2_tend_h)
tend_h(k,cell2) = tend_h(k,cell2) + flux
- !$omp end critical
+ !$omp end critical (crit_cell2_tend_h)
end do
end do
!$omp end do
@@ -526,15 +526,15 @@
vertex1 = verticesOnEdge(1,iEdge)
vertex2 = verticesOnEdge(2,iEdge)
do k=1,nVertLevels
- !$omp critical
+ !$omp critical (crit_vert1_delsq_circ)
delsq_circulation(k,vertex1) = delsq_circulation(k,vertex1) &
- dcEdge(iEdge) * delsq_u(k,iEdge)
- !$omp end critical
+ !$omp end critical (crit_vert1_delsq_circ)
- !$omp critical
+ !$omp critical (crit_vert2_delsq_cric)
delsq_circulation(k,vertex2) = delsq_circulation(k,vertex2) &
+ dcEdge(iEdge) * delsq_u(k,iEdge)
- !$omp end critical
+ !$omp end critical (crit_vert2_delsq_cric)
end do
end do
!$omp end do
@@ -558,15 +558,15 @@
cell1 = cellsOnEdge(1,iEdge)
cell2 = cellsOnEdge(2,iEdge)
do k=1,nVertLevels
- !$omp critical
+ !$omp critical (crit_cell1_delsq_div)
delsq_divergence(k,cell1) = delsq_divergence(k,cell1) &
+ delsq_u(k,iEdge)*dvEdge(iEdge)
- !$omp end critical
+ !$omp end critical (crit_cell1_delsq_div)
- !$omp critical
+ !$omp critical (crit_cell2_delsq_div)
delsq_divergence(k,cell2) = delsq_divergence(k,cell2) &
- delsq_u(k,iEdge)*dvEdge(iEdge)
- !$omp end critical
+ !$omp end critical (crit_cell2_delsq_div)
end do
end do
!$omp end do
@@ -706,13 +706,13 @@
do iTracer=1,grid % nTracers
tracer_edge = 0.5 * (tracers(iTracer,k,cell1) + tracers(iTracer,k,cell2))
flux = u(k,iEdge) * dvEdge(iEdge) * h_edge(k,iEdge) * tracer_edge
- !$omp critical
+ !$omp critical (crit_cell1_2nd_tracer_tend_hadv)
tracer_tend(iTracer,k,cell1) = tracer_tend(iTracer,k,cell1) - flux/areaCell(cell1)
- !$omp end critical
+ !$omp end critical (crit_cell1_2nd_tracer_tend_hadv)
- !$omp critical
+ !$omp critical (crit_cell2_2nd_tracer_tend_hadv)
tracer_tend(iTracer,k,cell2) = tracer_tend(iTracer,k,cell2) + flux/areaCell(cell2)
- !$omp end critical
+ !$omp end critical (crit_cell2_2nd_tracer_tend_hadv)
end do
end do
end if
@@ -771,13 +771,13 @@
end if
!-- update tendency
- !$omp critical
+ !$omp critical (crit_cell1_3rd_tracer_tend_hadv)
tracer_tend(iTracer,k,cell1) = tracer_tend(iTracer,k,cell1) - flux/areaCell(cell1)
- !$omp end critical
+ !$omp end critical (crit_cell1_3rd_tracer_tend_hadv)
- !$omp critical
+ !$omp critical (crit_cell2_3rd_tracer_tend_hadv)
tracer_tend(iTracer,k,cell2) = tracer_tend(iTracer,k,cell2) + flux/areaCell(cell2)
- !$omp end critical
+ !$omp end critical (crit_cell2_3rd_tracer_tend_hadv)
enddo
end do
end if
@@ -826,13 +826,13 @@
-(dcEdge(iEdge) **2) * (d2fdx2_cell1 + d2fdx2_cell2) / 12. )
!-- update tendency
- !$omp critical
+ !$omp critical (crit_cell1_4th_tracer_tend_hadv)
tracer_tend(iTracer,k,cell1) = tracer_tend(iTracer,k,cell1) - flux/areaCell(cell1)
- !$omp end critical
+ !$omp end critical (crit_cell1_4th_tracer_tend_hadv)
- !$omp critical
+ !$omp critical (crit_cell2_4th_tracer_tend_hadv)
tracer_tend(iTracer,k,cell2) = tracer_tend(iTracer,k,cell2) + flux/areaCell(cell2)
- !$omp end critical
+ !$omp end critical (crit_cell2_4th_tracer_tend_hadv)
enddo
end do
end if
@@ -873,13 +873,13 @@
! div(h \kappa_2 </font>
<font color="gray">abla \phi) at cell center
flux = dvEdge(iEdge) * h_edge(k,iEdge) * tracer_turb_flux * boundaryMask(k, iEdge)
- !$omp critical
+ !$omp critical (crit_cell1_tracer_tend_del2)
tracer_tend(iTracer,k,cell1) = tracer_tend(iTracer,k,cell1) + flux * invAreaCell1
- !$omp end critical
+ !$omp end critical (crit_cell1_tracer_tend_del2)
- !$omp critical
+ !$omp critical (crit_cell2_tracer_tend_del2)
tracer_tend(iTracer,k,cell2) = tracer_tend(iTracer,k,cell2) - flux * invAreaCell2
- !$omp end critical
+ !$omp end critical (crit_cell2_tracer_tend_del2)
end do
end do
@@ -955,13 +955,13 @@
do iTracer=1,grid % nTracers
tracer_turb_flux = config_h_tracer_eddy_diff4 * (delsq_tracer(iTracer,k,cell2) - delsq_tracer(iTracer,k,cell1)) / dcEdge(iEdge)
flux = dvEdge(iEdge) * tracer_turb_flux
- !$omp critical
+ !$omp critical (crit_cell1_tracer_tend_del4)
tracer_tend(iTracer,k,cell1) = tracer_tend(iTracer,k,cell1) - flux * invAreaCell1 * boundaryMask(k,iEdge)
- !$omp end critical
+ !$omp end critical (crit_cell1_tracer_tend_del4)
- !$omp critical
+ !$omp critical (crit_cell2_tracer_tend_del4)
tracer_tend(iTracer,k,cell2) = tracer_tend(iTracer,k,cell2) + flux * invAreaCell2 * boundaryMask(k,iEdge)
- !$omp end critical
+ !$omp end critical (crit_cell2_tracer_tend_del4)
end do
enddo
@@ -1070,13 +1070,13 @@
if(boundaryEdge(k,iEdge).eq.1) then
cell1 = cellsOnEdge(1,iEdge)
cell2 = cellsOnEdge(2,iEdge)
- !$omp critical
+ !$omp critical (crit_cell1_boundary_cell)
boundaryCell(k,cell1) = 1
- !$omp end critical
+ !$omp end critical (crit_cell1_boundary_cell)
- !$omp critical
+ !$omp critical (crit_cell2_boundary_cell)
boundaryCell(k,cell2) = 1
- !$omp end critical
+ !$omp end critical (crit_cell2_boundary_cell)
endif
enddo
enddo
@@ -1221,13 +1221,13 @@
!$omp do private(iEdge, k)
do iEdge=1,nEdges
do k=1,nVertLevels
- !$omp critical
+ !$omp critical (crit_vert1_circ)
circulation(k,verticesOnEdge(1,iEdge)) = circulation(k,verticesOnEdge(1,iEdge)) - dcEdge(iEdge) * u(k,iEdge)
- !$omp end critical
+ !$omp end critical (crit_vert1_circ)
- !$omp critical
+ !$omp critical (crit_vert2_circ)
circulation(k,verticesOnEdge(2,iEdge)) = circulation(k,verticesOnEdge(2,iEdge)) + dcEdge(iEdge) * u(k,iEdge)
- !$omp end critical
+ !$omp end critical (crit_vert2_circ)
end do
end do
!$omp end do
@@ -1254,16 +1254,16 @@
cell2 = cellsOnEdge(2,iEdge)
if (cell1 <= nCells) then
do k=1,nVertLevels
- !$omp critical
+ !$omp critical (crit_cell1_div)
divergence(k,cell1) = divergence(k,cell1) + u(k,iEdge)*dvEdge(iEdge)
- !$omp end critical
+ !$omp end critical (crit_cell1_div)
enddo
endif
if(cell2 <= nCells) then
do k=1,nVertLevels
- !$omp critical
+ !$omp critical (crit_cell2_div)
divergence(k,cell2) = divergence(k,cell2) - u(k,iEdge)*dvEdge(iEdge)
- !$omp end critical
+ !$omp end critical (crit_cell2_div)
enddo
end if
end do
</font>
</pre>