<p><b>mhecht@lanl.gov</b> 2010-02-10 16:58:45 -0700 (Wed, 10 Feb 2010)</p><p>Minor rearrangement of variable index handling in global diagnstics<br>
routine. Verified that this produces no change in &quot;stats&quot;, and restart<br>
netcdf file is unchanged (so this is believed to leave answers<br>
entirely unchanged).<br>
</p><hr noshade><pre><font color="gray">Modified: branches/ocean/src/module_global_diagnostics.F
===================================================================
--- branches/ocean/src/module_global_diagnostics.F        2010-02-09 22:05:34 UTC (rev 116)
+++ branches/ocean/src/module_global_diagnostics.F        2010-02-10 23:58:45 UTC (rev 117)
@@ -78,101 +78,102 @@
       pbot =&gt; state % pbot % array
       MontPot =&gt; state % MontPot % array
 
-      variableIndex = 1
+      variableIndex = 0
       ! h
+      variableIndex = variableIndex + 1
       call computeFieldAreaWeightedLocalStats(dminfo, nVertLevels, nCellsSolve, areaCell(1:nCellsSolve), h(:,1:nCellsSolve), &amp;
         sums(variableIndex), mins(variableIndex), maxes(variableIndex), verticalSumMins(variableIndex), verticalSumMaxes(variableIndex))
-      variableIndex = variableIndex + 1
 
       ! u
+      variableIndex = variableIndex + 1
       call computeFieldVolumeWeightedLocalStats(dminfo, nVertLevels, nEdgesSolve, areaEdge(1:nEdgesSolve), h_edge(:,1:nEdgesSolve), &amp;
         u(:,1:nEdgesSolve), sums(variableIndex), mins(variableIndex), maxes(variableIndex), verticalSumMins(variableIndex), &amp;
         verticalSumMaxes(variableIndex))
-      variableIndex = variableIndex + 1
 
       ! v
+      variableIndex = variableIndex + 1
       call computeFieldVolumeWeightedLocalStats(dminfo, nVertLevels, nEdgesSolve, areaEdge(1:nEdgesSolve), h_edge(:,1:nEdgesSolve), &amp;
         v(:,1:nEdgesSolve), sums(variableIndex), mins(variableIndex), maxes(variableIndex), verticalSumMins(variableIndex), &amp;
         verticalSumMaxes(variableIndex))
-      variableIndex = variableIndex + 1
 
       ! h_edge
+      variableIndex = variableIndex + 1
       call computeFieldAreaWeightedLocalStats(dminfo, nVertLevels, nEdgesSolve, areaEdge(1:nEdgesSolve), h_edge(:,1:nEdgesSolve), &amp;
         sums(variableIndex), mins(variableIndex), maxes(variableIndex), verticalSumMins(variableIndex), verticalSumMaxes(variableIndex))
-      variableIndex = variableIndex + 1
 
       ! circulation
+      variableIndex = variableIndex + 1
       call computeFieldLocalStats(dminfo, nVertLevels, nVerticesSolve, circulation(:,1:nVerticesSolve), &amp;
         sums(variableIndex), mins(variableIndex), maxes(variableIndex), verticalSumMins(variableIndex), verticalSumMaxes(variableIndex))
-      variableIndex = variableIndex + 1
 
       ! vorticity
+      variableIndex = variableIndex + 1
       call computeFieldAreaWeightedLocalStats(dminfo, nVertLevels, nVerticesSolve, areaTriangle(1:nVerticesSolve), &amp;
         vorticity(:,1:nVerticesSolve), sums(variableIndex), mins(variableIndex), maxes(variableIndex), &amp;
         verticalSumMins(variableIndex), verticalSumMaxes(variableIndex))
-      variableIndex = variableIndex + 1
 
       ! ke
+      variableIndex = variableIndex + 1
       call computeFieldVolumeWeightedLocalStats(dminfo, nVertLevels, nCellsSolve, areaCell(1:nCellsSolve), h(:,1:nCellsSolve), &amp;
         ke(:,1:nCellsSolve), sums(variableIndex), mins(variableIndex), maxes(variableIndex), verticalSumMins(variableIndex), &amp;
         verticalSumMaxes(variableIndex))
-      variableIndex = variableIndex + 1
 
       ! pv_edge
+      variableIndex = variableIndex + 1
       call computeFieldVolumeWeightedLocalStats(dminfo, nVertLevels, nEdgesSolve, areaEdge(1:nEdgesSolve), h_edge(:,1:nEdgesSolve), &amp;
         pv_edge(:,1:nEdgesSolve), sums(variableIndex), mins(variableIndex), maxes(variableIndex), verticalSumMins(variableIndex), &amp;
         verticalSumMaxes(variableIndex))
-      variableIndex = variableIndex + 1
 
       ! pv_vertex
+      variableIndex = variableIndex + 1
       call computeFieldAreaWeightedLocalStats(dminfo, nVertLevels, nVerticesSolve, areaTriangle(1:nVerticesSolve), &amp;
         pv_vertex(:,1:nVerticesSolve), sums(variableIndex), mins(variableIndex), maxes(variableIndex), &amp;
         verticalSumMins(variableIndex), verticalSumMaxes(variableIndex))
-      variableIndex = variableIndex + 1
 
       ! pv_cell
+      variableIndex = variableIndex + 1
       call computeFieldVolumeWeightedLocalStats(dminfo, nVertLevels, nCellsSolve, areaCell(1:nCellsSolve), h(:,1:nCellsSolve), &amp;
         pv_cell(:,1:nCellsSolve), sums(variableIndex), mins(variableIndex), maxes(variableIndex), verticalSumMins(variableIndex), &amp;
         verticalSumMaxes(variableIndex))
-      variableIndex = variableIndex + 1
 
       ! gradPVn
+      variableIndex = variableIndex + 1
       call computeFieldVolumeWeightedLocalStats(dminfo, nVertLevels, nEdgesSolve, areaEdge(1:nEdgesSolve), h_edge(:,1:nEdgesSolve), &amp;
         gradPVn(:,1:nEdgesSolve), sums(variableIndex), mins(variableIndex), maxes(variableIndex), verticalSumMins(variableIndex), &amp;
         verticalSumMaxes(variableIndex))
-      variableIndex = variableIndex + 1
 
       ! gradPVt
+      variableIndex = variableIndex + 1
       call computeFieldVolumeWeightedLocalStats(dminfo, nVertLevels, nEdgesSolve, areaEdge(1:nEdgesSolve), h_edge(:,1:nEdgesSolve), &amp;
         gradPVt(:,1:nEdgesSolve), sums(variableIndex), mins(variableIndex), maxes(variableIndex), verticalSumMins(variableIndex), &amp;
         verticalSumMaxes(variableIndex))
-      variableIndex = variableIndex + 1
 
       ! zmid
+      variableIndex = variableIndex + 1
       call computeFieldAreaWeightedLocalStats(dminfo, nVertLevels, nCellsSolve, areaCell(1:nCellsSolve), &amp;
         zmid(:,1:nCellsSolve), sums(variableIndex), mins(variableIndex), maxes(variableIndex), verticalSumMins(variableIndex), &amp;
         verticalSumMaxes(variableIndex))
-      variableIndex = variableIndex + 1
 
       ! zbot
+      variableIndex = variableIndex + 1
       call computeFieldAreaWeightedLocalStats(dminfo, nVertLevels, nCellsSolve, areaCell(1:nCellsSolve), &amp;
         zbot(:,1:nCellsSolve), sums(variableIndex), mins(variableIndex), maxes(variableIndex), verticalSumMins(variableIndex), &amp;
         verticalSumMaxes(variableIndex))
-      variableIndex = variableIndex + 1
 
       ! pmid
+      variableIndex = variableIndex + 1
       call computeFieldVolumeWeightedLocalStats(dminfo, nVertLevels, nCellsSolve, areaCell(1:nCellsSolve), h(:,1:nCellsSolve), &amp;
         pmid(:,1:nCellsSolve), sums(variableIndex), mins(variableIndex), maxes(variableIndex), verticalSumMins(variableIndex), &amp;
         verticalSumMaxes(variableIndex))
-      variableIndex = variableIndex + 1
 
       ! pbot
+      variableIndex = variableIndex + 1
       call computeFieldVolumeWeightedLocalStats(dminfo, nVertLevels, nCellsSolve, areaCell(1:nCellsSolve), h(:,1:nCellsSolve), &amp;
         pbot(:,1:nCellsSolve), sums(variableIndex), mins(variableIndex), maxes(variableIndex), verticalSumMins(variableIndex), &amp;
         verticalSumMaxes(variableIndex))
-      variableIndex = variableIndex + 1
 
       ! MontPot
+      variableIndex = variableIndex + 1
       call computeFieldVolumeWeightedLocalStats(dminfo, nVertLevels, nCellsSolve, areaCell(1:nCellsSolve), h(:,1:nCellsSolve), &amp;
         MontPot(:,1:nCellsSolve), sums(variableIndex), mins(variableIndex), maxes(variableIndex), verticalSumMins(variableIndex), &amp;
         verticalSumMaxes(variableIndex))
@@ -234,72 +235,73 @@
       volumeCellGlobal = sums(1)
       volumeEdgeGlobal = sums(4)
       ! compute the averages (slightly different depending on how the sum was computed)
-      variableIndex = 1
+      variableIndex = 0
       ! h
+      variableIndex = variableIndex + 1
       averages(variableIndex) = sums(variableIndex)/(areaCellGlobal*nVertLevels)
-      variableIndex = variableIndex + 1
 
       ! u
+      variableIndex = variableIndex + 1
       averages(variableIndex) = sums(variableIndex)/volumeEdgeGlobal
-      variableIndex = variableIndex + 1
 
       ! v
+      variableIndex = variableIndex + 1
       averages(variableIndex) = sums(variableIndex)/volumeEdgeGlobal
-      variableIndex = variableIndex + 1
 
       ! h_edge
+      variableIndex = variableIndex + 1
       averages(variableIndex) = sums(variableIndex)/(areaEdgeGlobal*nVertLevels)
-      variableIndex = variableIndex + 1
 
       ! circulation
+      variableIndex = variableIndex + 1
       averages(variableIndex) = sums(variableIndex)/(nVerticesGlobal*nVertLevels)
-      variableIndex = variableIndex + 1
 
       ! vorticity
+      variableIndex = variableIndex + 1
       averages(variableIndex) = sums(variableIndex)/(areaTriangleGlobal*nVertLevels)
-      variableIndex = variableIndex + 1
 
       ! ke
+      variableIndex = variableIndex + 1
       averages(variableIndex) = sums(variableIndex)/volumeCellGlobal
-      variableIndex = variableIndex + 1
 
       ! pv_edge
+      variableIndex = variableIndex + 1
       averages(variableIndex) = sums(variableIndex)/volumeEdgeGlobal
-      variableIndex = variableIndex + 1
 
       ! pv_vertex
+      variableIndex = variableIndex + 1
       averages(variableIndex) = sums(variableIndex)/(areaTriangleGlobal*nVertLevels)
-      variableIndex = variableIndex + 1
 
       ! pv_cell
+      variableIndex = variableIndex + 1
       averages(variableIndex) = sums(variableIndex)/volumeCellGlobal
-      variableIndex = variableIndex + 1
 
       ! gradPVn
+      variableIndex = variableIndex + 1
       averages(variableIndex) = sums(variableIndex)/volumeEdgeGlobal
-      variableIndex = variableIndex + 1
 
       ! gradPVt
+      variableIndex = variableIndex + 1
       averages(variableIndex) = sums(variableIndex)/volumeEdgeGlobal
-      variableIndex = variableIndex + 1
 
       ! zmid
+      variableIndex = variableIndex + 1
       averages(variableIndex) = sums(variableIndex)/(areaCellGlobal*nVertLevels)
-      variableIndex = variableIndex + 1
 
       ! zbot
+      variableIndex = variableIndex + 1
       averages(variableIndex) = sums(variableIndex)/(areaCellGlobal*nVertLevels)
-      variableIndex = variableIndex + 1
 
       ! pmid
+      variableIndex = variableIndex + 1
       averages(variableIndex) = sums(variableIndex)/volumeCellGlobal
-      variableIndex = variableIndex + 1
 
       ! pbot
+      variableIndex = variableIndex + 1
       averages(variableIndex) = sums(variableIndex)/volumeCellGlobal
-      variableIndex = variableIndex + 1
 
       ! MontPot
+      variableIndex = variableIndex + 1
       averages(variableIndex) = sums(variableIndex)/volumeCellGlobal
 
       ! write out the data to files

</font>
</pre>