<p><b>dwj07@fsu.edu</b> 2012-02-23 13:03:05 -0700 (Thu, 23 Feb 2012)</p><p><br>
        -- BRANCH COMMIT --<br>
<br>
        Changing ifort-serial compile options to use -O3 instead of -g.<br>
<br>
        Adding a temporary fix for arraCell(nCells+1) = 0.0<br>
</p><hr noshade><pre><font color="gray">Modified: branches/ocean_projects/monotonic_advection/Makefile
===================================================================
--- branches/ocean_projects/monotonic_advection/Makefile        2012-02-23 19:21:21 UTC (rev 1530)
+++ branches/ocean_projects/monotonic_advection/Makefile        2012-02-23 20:03:05 UTC (rev 1531)
@@ -111,9 +111,9 @@
        "CC = gcc" \
        "SFC = ifort" \
        "SCC = gcc" \
-        "FFLAGS = -real-size 64 -g -convert big_endian -FR" \
+        "FFLAGS = -real-size 64 -O3 -convert big_endian -FR" \
        "CFLAGS = -O3 -m64" \
-        "LDFLAGS = -g" \
+        "LDFLAGS = -O3" \
        "CORE = $(CORE)" \
        "CPPFLAGS = $(MODEL_FORMULATION) -DUNDERSCORE -m64 $(FILE_OFFSET) $(ZOLTAN_DEFINE)" )
Modified: branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_tendency.F
===================================================================
--- branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_tendency.F        2012-02-23 19:21:21 UTC (rev 1530)
+++ branches/ocean_projects/monotonic_advection/src/core_ocean/mpas_ocn_tendency.F        2012-02-23 20:03:05 UTC (rev 1531)
@@ -624,8 +624,9 @@
invAreaTri1 = 1.0 / areaTriangle(vertex1)
invAreaTri2 = 1.0 / areaTriangle(vertex2)
- invAreaCell1 = 1.0 / areaCell(cell1)
- invAreaCell2 = 1.0 / areaCell(cell2)
+ !dwj: 02/23/12 arraCell(nCells+1) is still 0, this is a temporary fix
+ invAreaCell1 = 1.0 / max(areaCell(cell1), 1.0)
+ invAreaCell2 = 1.0 / max(areaCell(cell2), 1.0)
do k=1,maxLevelEdgeBot(iEdge)
! Compute circulation and relative vorticity at each vertex
@@ -678,7 +679,8 @@
do iVertex = 1, nVertices*ke_vertex_flag
do i=1,grid % vertexDegree
iCell = cellsOnVertex(i,iVertex)
- invAreaCell1 = 1.0 / areaCell(iCell)
+ !dwj: 02/23/12 arraCell(nCells+1) is still 0, this is a temporary fix
+ invAreaCell1 = 1.0 / max(areaCell(iCell), 1.0)
do k=1,nVertLevels
kevc(k,iCell) = kevc(k,iCell) + kiteAreasOnVertex(i, iVertex) * kev(k, iVertex) * invAreaCell1
enddo
@@ -731,7 +733,8 @@
iCell = cellsOnVertex(i,iVertex)
iEdge = edgesOnVertex(i,iVertex)
- invAreaCell1 = 1.0 / areaCell(iCell)
+ !dwj: 02/23/12 arraCell(nCells+1) is still 0, this is a temporary fix
+ invAreaCell1 = 1.0 / max(areaCell(iCell), 1.0)
! Compute pv at cell centers
! ( this computes pv_cell for all real cells and distance-1 ghost cells )
</font>
</pre>