<p><b>dwj07@fsu.edu</b> 2012-06-06 11:50:08 -0600 (Wed, 06 Jun 2012)</p><p><br>
        -- BRANCH COMMIT --<br>
<br>
        Adding array versions of nCells, nEdges, and nVertices to allow iterations through specified halo regions.<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-06-06 17:10:44 UTC (rev 1969)
+++ branches/omp_blocks/multiple_blocks/src/framework/mpas_block_creator.F        2012-06-06 17:50:08 UTC (rev 1970)
@@ -1066,6 +1066,14 @@
#include "dim_dummy_args.inc"
)
+ allocate(block_ptr % mesh % nCellsArray(nHalos+1))
+ allocate(block_ptr % mesh % nEdgesArray(nHalos+2))
+ allocate(block_ptr % mesh % nVerticesArray(nHalos+2))
+
+ block_ptr % mesh % nCellsArray(:) = nCellsCursor % array(:)
+ block_ptr % mesh % nEdgesArray(:) = nEdgesCursor % array(:)
+ block_ptr % mesh % nVerticesArray(:) = nVerticesCursor % array(:)
+
! Set block's local id
block_ptr % localBlockID = localBlockID
Modified: branches/omp_blocks/multiple_blocks/src/registry/gen_inc.c
===================================================================
--- branches/omp_blocks/multiple_blocks/src/registry/gen_inc.c        2012-06-06 17:10:44 UTC (rev 1969)
+++ branches/omp_blocks/multiple_blocks/src/registry/gen_inc.c        2012-06-06 17:50:08 UTC (rev 1970)
@@ -201,8 +201,13 @@
}
dim_ptr = dims;
while (dim_ptr) {
- if (dim_ptr->constant_value < 0 && !dim_ptr->namelist_defined && !is_derived_dim(dim_ptr->name_in_code)) fortprintf(fd, " integer :: %sSolve</font>
<font color="red">", dim_ptr->name_in_code);
- if (dim_ptr->constant_value < 0 && dim_ptr->namelist_defined && !is_derived_dim(dim_ptr->name_in_code)) fortprintf(fd, " integer :: %sSolve</font>
<font color="blue">", dim_ptr->name_in_file);
+ if (dim_ptr->constant_value < 0 && !dim_ptr->namelist_defined && !is_derived_dim(dim_ptr->name_in_code)) {
+                 fortprintf(fd, " integer :: %sSolve</font>
<font color="blue">", dim_ptr->name_in_code);
+                 fortprintf(fd, " integer, dimension(:), pointer :: %sArray</font>
<font color="blue">", dim_ptr->name_in_code);
+         }
+ if (dim_ptr->constant_value < 0 && dim_ptr->namelist_defined && !is_derived_dim(dim_ptr->name_in_code)) {
+                 fortprintf(fd, " integer :: %sSolve</font>
<font color="blue">", dim_ptr->name_in_file);
+         }
dim_ptr = dim_ptr->next;
}
</font>
</pre>