<p><b>qchen3@fsu.edu</b> 2012-04-12 12:05:50 -0600 (Thu, 12 Apr 2012)</p><p>BRANCH COMMIT<br>
<br>
Committing local edits in accgm and prepare for merging updates from the trunk.<br>
<br>
Changes: the calculation of the Montgomery potential now assumes a uniform constant mean density.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/ocean_projects/accgm/Makefile
===================================================================
--- branches/ocean_projects/accgm/Makefile        2012-04-12 17:52:42 UTC (rev 1776)
+++ branches/ocean_projects/accgm/Makefile        2012-04-12 18:05:50 UTC (rev 1777)
@@ -112,24 +112,6 @@
        "USE_PAPI = $(USE_PAPI)" \
        "CPPFLAGS = $(MODEL_FORMULATION) -DUNDERSCORE -m64 $(FILE_OFFSET) $(ZOLTAN_DEFINE)" )
-ifort-serial:
-        ( make all \
-        "FC_PARALLEL = mpif90" \
-        "CC_PARALLEL = gcc" \
-        "FC_SERIAL = ifort" \
-        "CC_SERIAL = gcc" \
-        "FFLAGS_OPT = -real-size 64 -O3 -convert big_endian -FR" \
-        "CFLAGS_OPT = -O3 -m64" \
-        "LDFLAGS_OPT = -O3" \
-        "FFLAGS_DEBUG = -real-size 64 -g -convert big_endian -FR -CU -CB -check all" \
-        "CFLAGS_DEBUG = -g -m64" \
-        "LDFLAGS_DEBUG = -g" \
-        "CORE = $(CORE)" \
-        "DEBUG = $(DEBUG)" \
-        "SERIAL = $(SERIAL)" \
-        "USE_PAPI = $(USE_PAPI)" \
-        "CPPFLAGS = $(MODEL_FORMULATION) -DUNDERSCORE -m64 $(FILE_OFFSET) $(ZOLTAN_DEFINE)" )
-
gfortran:
        ( $(MAKE) all \
        "FC_PARALLEL = mpif90" \
@@ -240,9 +222,9 @@
ifeq "$(DEBUG)" "true"
ifndef FFLAGS_DEBUG
-        FFLAGS=$(FFLAGS_OPT)
-        CFLAGS=$(CFLAGS_OPT)
-        LDFLAGS=$(LDFLAGS_OPT)
+        FFLAGS=$(FFLAGS_OPT) -DMPAS_DEBUG
+        CFLAGS=$(CFLAGS_OPT) -DMPAS_DEBUG
+        LDFLAGS=$(LDFLAGS_OPT) -DMPAS_DEBUG
        DEBUG_MESSAGE="Debug flags are not defined for this compile group. Defaulting to Optimized flags"
else # FFLAGS_DEBUG IF
        FFLAGS=$(FFLAGS_DEBUG) -DMPAS_DEBUG
Modified: branches/ocean_projects/accgm/src/core_ocean/mpas_ocn_tendency.F
===================================================================
--- branches/ocean_projects/accgm/src/core_ocean/mpas_ocn_tendency.F        2012-04-12 17:52:42 UTC (rev 1776)
+++ branches/ocean_projects/accgm/src/core_ocean/mpas_ocn_tendency.F        2012-04-12 18:05:50 UTC (rev 1777)
@@ -398,7 +398,7 @@
maxLevelCell, maxLevelEdgeTop, maxLevelEdgeBot, &
maxLevelVertexBot
integer, dimension(:,:), pointer :: cellsOnEdge, cellsOnVertex, &
- verticesOnEdge, edgesOnEdge, edgesOnVertex,boundaryCell
+ verticesOnEdge, edgesOnEdge, edgesOnVertex,boundaryCell, vertexMask
real (kind=RKIND) :: d2fdx2_cell1, d2fdx2_cell2, coef_3rd_order, r_tmp, invAreaCell1, invAreaCell2, invAreaTri1, invAreaTri2, invLength, h_vertex
@@ -461,6 +461,7 @@
maxLevelEdgeTop => grid % maxLevelEdgeTop % array
maxLevelEdgeBot => grid % maxLevelEdgeBot % array
maxLevelVertexBot => grid % maxLevelVertexBot % array
+ vertexMask => grid % vertexMask % array
nCells = grid % nCells
nEdges = grid % nEdges
@@ -616,6 +617,9 @@
end do
+ ! Annihilate vorticity on the boundary to enforce free-slip boundary conditions
+ vorticity(:,:) = vorticity(:,:) * vertexMask(:,:)
+
!
! Compute kinetic energy in each vertex
!
</font>
</pre>