<p><b>dwj07@fsu.edu</b> 2012-05-30 15:41:48 -0600 (Wed, 30 May 2012)</p><p><br>
        -- BRANCH COMMIT --<br>
<br>
        Fixing a small bug.<br>
        Now works with 1 block per processor, and multiple processors.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/omp_blocks/multiple_blocks/src/framework/mpas_block_creator.F
===================================================================
--- branches/omp_blocks/multiple_blocks/src/framework/mpas_block_creator.F        2012-05-30 21:23:35 UTC (rev 1949)
+++ branches/omp_blocks/multiple_blocks/src/framework/mpas_block_creator.F        2012-05-30 21:41:48 UTC (rev 1950)
@@ -361,9 +361,9 @@
nullify(vertexLimitCursor % ioinfo)
nullify(nVerticesSolveCursor % ioinfo)
- haloCursor % dimSizes(1) = indexToVertexCursor % dimSizes(1) - haloStart
+ haloCursor % dimSizes(1) = indexToVertexCursor % dimSizes(1) - (haloStart-1)
allocate(haloCursor % array(haloCursor % dimSizes(1)))
- haloCursor % array(:) = indexToVertexCursor % array(haloStart+1:indexToVertexCursor % dimSizes(1))
+ haloCursor % array(:) = indexToVertexCursor % array(haloStart:indexToVertexCursor % dimSizes(1))
haloCursor % sendList => indexToVertexCursor % sendList
haloCursor % recvList => indexToVertexCursor % recvList
Modified: branches/omp_blocks/multiple_blocks/src/framework/mpas_io_input.F
===================================================================
--- branches/omp_blocks/multiple_blocks/src/framework/mpas_io_input.F        2012-05-30 21:23:35 UTC (rev 1949)
+++ branches/omp_blocks/multiple_blocks/src/framework/mpas_io_input.F        2012-05-30 21:41:48 UTC (rev 1950)
@@ -849,16 +849,17 @@
call MPAS_io_close(inputHandle, ierr)
- write(6,*) 'nEdges', domain % blockList % mesh % nEdges
- write(6,*) 'nEdgesSolve', domain % blockList % mesh % nEdgesSolve
- write(6,*) 'indexToCellID 1'
- do i = 1, domain % blockList % mesh % nCells
- write(6,*) i, domain % blocklist % mesh % indexToCellID % array(i)
- end do
- write(6,*) 'edgesOnCell 1'
- do i = 1, domain % blockList % mesh % nCells
- write(6,*) i, domain % blocklist % mesh % edgesOnCell % array(:, i)
- end do
+ !DWJ DEBUGGING
+! write(6,*) 'nEdges', domain % blockList % mesh % nEdges
+! write(6,*) 'nEdgesSolve', domain % blockList % mesh % nEdgesSolve
+! write(6,*) 'indexToCellID 1'
+! do i = 1, domain % blockList % mesh % nCells
+! write(6,*) i, domain % blocklist % mesh % indexToCellID % array(i)
+! end do
+! write(6,*) 'edgesOnCell 1'
+! do i = 1, domain % blockList % mesh % nCells
+! write(6,*) i, domain % blocklist % mesh % edgesOnCell % array(:, i)
+! end do
!
! Exchange halos for all of the fields that were read from the input file
@@ -866,14 +867,15 @@
write(6,*) 'halo exchanges'
call mpas_exch_input_field_halos(domain, input_obj)
- write(6,*) 'indexToCellID 2'
- do i = 1, domain % blockList % mesh % nCells
- write(6,*) i, domain % blocklist % mesh % indexToCellID % array(i)
- end do
- write(6,*) 'edgesOnCell 2'
- do i = 1, domain % blockList % mesh % nCells
- write(6,*) i, domain % blocklist % mesh % edgesOnCell % array(:, i)
- end do
+ !DWJ DEBUGGING
+! write(6,*) 'indexToCellID 2'
+! do i = 1, domain % blockList % mesh % nCells
+! write(6,*) i, domain % blocklist % mesh % indexToCellID % array(i)
+! end do
+! write(6,*) 'edgesOnCell 2'
+! do i = 1, domain % blockList % mesh % nCells
+! write(6,*) i, domain % blocklist % mesh % edgesOnCell % array(:, i)
+! end do
write(6,*) 're-index fields'
block_ptr => domain % blocklist
@@ -997,10 +999,11 @@
block_ptr => block_ptr % next
end do
- write(6,*) 'edgesOnCell 3'
- do i = 1, domain % blockList % mesh % nCells
- write(6,*) i, domain % blocklist % mesh % edgesOnCell % array(:, i)
- end do
+ !DWJ DEBUGGING
+! write(6,*) 'edgesOnCell 3'
+! do i = 1, domain % blockList % mesh % nCells
+! write(6,*) i, domain % blocklist % mesh % edgesOnCell % array(:, i)
+! end do
call mpas_deallocate_field(indexToCellIDField)
call mpas_deallocate_field(indexToEdgeIDField)
</font>
</pre>