<p><b>dwj07@fsu.edu</b> 2012-08-23 11:14:26 -0600 (Thu, 23 Aug 2012)</p><p>        <br>
        -- BRANCH COMMIT --<br>
        Fixing an issue with allocatable arrays.<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-23 15:11:23 UTC (rev 2115)
+++ branches/omp_blocks/openmp_test/src/core_sw_elements/mpas_sw_time_integration.F        2012-08-23 17:14:26 UTC (rev 2116)
@@ -512,16 +512,10 @@
! strictly only valid for h_mom_eddy_visc4 == constant
!
if (config_h_mom_eddy_visc4 > 0.0) then
- !$omp sections
- !$omp section
allocate(delsq_divergence(nVertLevels, nCells+1))
- !$omp section
allocate(delsq_u(nVertLevels, nEdges+1))
- !$omp section
allocate(delsq_circulation(nVertLevels, nVertices+1))
- !$omp section
allocate(delsq_vorticity(nVertLevels, nVertices+1))
- !$omp end sections
!$omp workshare
delsq_u(:,:) = 0.0
@@ -664,17 +658,10 @@
end do
!$omp end do
- !$omp sections
- !$omp section
deallocate(delsq_divergence)
- !$omp section
deallocate(delsq_u)
- !$omp section
deallocate(delsq_circulation)
- !$omp section
deallocate(delsq_vorticity)
- !$omp end sections
-
end if
! Compute u (velocity) tendency from wind stress (u_src)
@@ -1046,9 +1033,7 @@
!
! compute a boundary mask to enforce insulating boundary conditions in the horizontal
!
- !$omp single
allocate(boundaryMask(grid % nVertLevels, grid % nEdges+1))
- !$omp end single
!$omp workshare
boundaryMask = 1.0
@@ -1110,10 +1095,7 @@
!$omp end do
end if
- !$omp single
deallocate(boundaryMask)
- !$omp end single
-
end if
!
@@ -1125,12 +1107,8 @@
!
! compute a boundary mask to enforce insulating boundary conditions in the horizontal
!
- !$omp sections
- !$omp section
allocate(boundaryMask(grid % nVertLevels, grid % nEdges+1))
- !$omp section
allocate(delsq_tracer(grid % nTracers, grid % nVertLevels, grid % nCells+1))
- !$omp end sections
!$omp workshare
boundaryMask = 1.0
@@ -1242,13 +1220,8 @@
!$omp end do
end if
- !$omp sections
- !$omp section
deallocate(delsq_tracer)
- !$omp section
deallocate(boundaryMask)
- !$omp end sections
-
end if
end subroutine sw_compute_scalar_tend
</font>
</pre>