<p><b>dwj07@fsu.edu</b> 2012-09-20 09:52:06 -0600 (Thu, 20 Sep 2012)</p><p><br>
-- BRANCH COMMIT --<br>
<br>
Fixing compile issues.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/omp_blocks/openmp_test/src/core_ocean_elements/mpas_ocn_tendency.F
===================================================================
--- branches/omp_blocks/openmp_test/src/core_ocean_elements/mpas_ocn_tendency.F 2012-09-19 21:49:31 UTC (rev 2166)
+++ branches/omp_blocks/openmp_test/src/core_ocean_elements/mpas_ocn_tendency.F 2012-09-20 15:52:06 UTC (rev 2167)
@@ -404,7 +404,7 @@
maxLevelCell, maxLevelEdgeTop, maxLevelEdgeBot, &
maxLevelVertexBot
integer, dimension(:,:), pointer :: cellsOnEdge, cellsOnVertex, &
- verticesOnEdge, edgesOnEdge, edgesOnVertex,boundaryCell, kiteIndexOnCell
+ verticesOnEdge, edgesOnEdge, edgesOnVertex,boundaryCell, kiteIndexOnCell, verticesOnCell
real (kind=RKIND) :: d2fdx2_cell1, d2fdx2_cell2, coef_3rd_order, r_tmp, invAreaCell1, invAreaCell2, invAreaTri1, invAreaTri2, invLength, h_vertex
@@ -469,6 +469,7 @@
maxLevelEdgeBot => grid % maxLevelEdgeBot % array
maxLevelVertexBot => grid % maxLevelVertexBot % array
kiteIndexOnCell => grid % kiteIndexOnCell % array
+ verticesOnCell => grid % verticesOnCell % array
nCells = grid % nCells
nEdges = grid % nEdges
@@ -642,7 +643,7 @@
do iCell = 1, nCells*ke_vertex_flag
invAreaCell1 = 1.0 / areaCell(iCell)
- do i = 1, nEdgesOnCell
+ do i = 1, nEdgesOnCell(iCell)
j = kiteIndexOnCell(i, iCell)
iVertex = verticesOnCell(i, iCell)
do k = 1, nVertLevels
@@ -734,6 +735,7 @@
do k = 1, maxLevelCell(iCell)
Vor_cell(k, iCell) = Vor_cell(k, iCell) + kiteAreasOnVertex(j, iVertex) * Vor_vertex(k, iVertex) * invAreaCell1
end do
+ end do
end do
Modified: branches/omp_blocks/openmp_test/src/core_ocean_elements/mpas_ocn_thick_hadv.F
===================================================================
--- branches/omp_blocks/openmp_test/src/core_ocean_elements/mpas_ocn_thick_hadv.F 2012-09-19 21:49:31 UTC (rev 2166)
+++ branches/omp_blocks/openmp_test/src/core_ocean_elements/mpas_ocn_thick_hadv.F 2012-09-20 15:52:06 UTC (rev 2167)
@@ -107,7 +107,7 @@
integer, dimension(:), pointer :: maxLevelEdgeBot, MaxLevelCell, nEdgesOnCell
integer, dimension(:,:), pointer :: cellsOnEdge, edgesOnCell, edgeSignOnCell
- real (kind=RKIND) :: flux, invAreaCell1, invAreaCell2
+ real (kind=RKIND) :: flux, invAreaCell, invAreaCell1, invAreaCell2
real (kind=RKIND), dimension(:), pointer :: dvEdge, areaCell
!-----------------------------------------------------------------
Modified: branches/omp_blocks/openmp_test/src/core_ocean_elements/mpas_ocn_time_integration_split.F
===================================================================
--- branches/omp_blocks/openmp_test/src/core_ocean_elements/mpas_ocn_time_integration_split.F 2012-09-19 21:49:31 UTC (rev 2166)
+++ branches/omp_blocks/openmp_test/src/core_ocean_elements/mpas_ocn_time_integration_split.F 2012-09-20 15:52:06 UTC (rev 2167)
@@ -410,7 +410,7 @@
! mrp 120201 efficiency: could we combine the following edge and cell loops?
!DWJ 09/19/12 Bit Reproducible Version
- do iCell = 1. block % mesh % nCells
+ do iCell = 1, block % mesh % nCells
do i = 1, block % mesh % nEdgesOnCell % array(iCell)
iEdge = block % mesh % edgesOnCell % array(i, iCell)
@@ -549,7 +549,7 @@
+ config_btr_gam3_uWt2 * block % state % time_levs(newBtrSubcycleTime) % state % uBtrSubcycle % array(iEdge)) &
* hSum
- block % tend % ssh % array(iCell) = block % tend % ssh % array(iCell) + block % mesh % edgeSignOnCell(i, iCell) * flux &
+ block % tend % ssh % array(iCell) = block % tend % ssh % array(iCell) + block % mesh % edgeSignOnCell % array(i, iCell) * flux &
* block % mesh % dvEdge % array(iEdge)
end do
Modified: branches/omp_blocks/openmp_test/src/core_ocean_elements/mpas_ocn_tracer_advection_mono.F
===================================================================
--- branches/omp_blocks/openmp_test/src/core_ocean_elements/mpas_ocn_tracer_advection_mono.F 2012-09-19 21:49:31 UTC (rev 2166)
+++ branches/omp_blocks/openmp_test/src/core_ocean_elements/mpas_ocn_tracer_advection_mono.F 2012-09-20 15:52:06 UTC (rev 2167)
@@ -64,7 +64,7 @@
integer :: i, iCell, iEdge, k, iTracer, cell1, cell2
integer :: nVertLevels, num_tracers, nCells, nEdges, nCellsSolve
integer, dimension(:), pointer :: nAdvCellsForEdge, maxLevelCell, maxLevelEdgeTop, nEdgesOnCell
- integer, dimension(:,:), pointer :: cellsOnEdge, cellsOnCell, advCellsForEdge, highOrderAdvectionMask, lowOrderAdvectionMask, edgeSignOnCell
+ integer, dimension(:,:), pointer :: cellsOnEdge, cellsOnCell, advCellsForEdge, highOrderAdvectionMask, lowOrderAdvectionMask, edgeSignOnCell, edgesOnCell
real (kind=RKIND) :: flux_upwind, tracer_min_new, tracer_max_new, tracer_upwind_new, scale_factor
real (kind=RKIND) :: flux, tracer_weight, invDvEdge, invAreaCell1, invAreaCell2
@@ -96,6 +96,7 @@
highOrderAdvectionMask => grid % highOrderAdvectionMask % array
lowOrderAdvectionMask => grid % lowOrderAdvectionMask % array
edgeSignOnCell => grid % edgeSignOnCell % array
+ edgesOnCell => grid % edgesOnCell % array
nCells = grid % nCells
nCellsSolve = grid % nCellsSolve
Modified: branches/omp_blocks/openmp_test/src/core_ocean_elements/mpas_ocn_vmix_coefs_rich.F
===================================================================
--- branches/omp_blocks/openmp_test/src/core_ocean_elements/mpas_ocn_vmix_coefs_rich.F 2012-09-19 21:49:31 UTC (rev 2166)
+++ branches/omp_blocks/openmp_test/src/core_ocean_elements/mpas_ocn_vmix_coefs_rich.F 2012-09-20 15:52:06 UTC (rev 2167)
@@ -427,7 +427,7 @@
!
!-----------------------------------------------------------------
- integer :: nVertLevels, nCells, nEdges, iCell, iEdge, k
+ integer :: nVertLevels, nCells, nEdges, iCell, iEdge, k, i
integer :: cell1, cell2
integer, dimension(:), pointer :: maxLevelCell, maxLevelEdgeTop, maxLevelEdgeBot, nEdgesOnCell
</font>
</pre>