<p><b>dwj07@fsu.edu</b> 2012-03-01 20:53:52 -0700 (Thu, 01 Mar 2012)</p><p><br>
-- BRANCH COMMIT --<br>
<br>
Fixing cell list arrays.<br>
Removing requirement for config_positive_definite for monotonic advection.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/ocean_projects/monotonic_advection/src/operators/mpas_tracer_advection.F
===================================================================
--- branches/ocean_projects/monotonic_advection/src/operators/mpas_tracer_advection.F 2012-03-02 03:45:33 UTC (rev 1571)
+++ branches/ocean_projects/monotonic_advection/src/operators/mpas_tracer_advection.F 2012-03-02 03:53:52 UTC (rev 1572)
@@ -29,8 +29,8 @@
integer, dimension(:,:), pointer :: cellsOnCell, cellsOnEdge, advCellsForEdge
integer, dimension(:), pointer :: nEdgesOnCell, nAdvCellsForEdge
+ integer, dimension(:), pointer :: cell_list, ordered_cell_list
integer :: cell1, cell2, iEdge, n, i, j, j_in, iCell
- integer :: cell_list(20), ordered_cell_list(20)
logical :: addcell
deriv_two => grid % deriv_two % array
@@ -42,6 +42,9 @@
nEdgesOnCell => grid % nEdgesOnCell % array
nAdvCellsForEdge => grid % nAdvCellsForEdge % array
+ allocate(cell_list(grid % maxEdges2 + 2))
+ allocate(ordered_cell_list(grid % maxEdges2 + 2))
+
do iEdge = 1, grid % nEdges
nAdvCellsForEdge(iEdge) = 0
cell1 = cellsOnEdge(1,iEdge)
@@ -207,7 +210,7 @@
monotonicOn = .false.
- if(config_monotonic .and. config_positive_definite) then
+ if(config_monotonic) then
monotonicOn = .true.
endif
</font>
</pre>