<p><b>mpetersen@lanl.gov</b> 2010-06-03 11:06:40 -0600 (Thu, 03 Jun 2010)</p><p>Update changes to zlevel branch one last time!<br>
</p><hr noshade><pre><font color="gray">Modified: branches/ocean_projects/z_level_mrp/mpas/Makefile
===================================================================
--- branches/ocean_projects/z_level_mrp/mpas/Makefile        2010-06-03 16:43:03 UTC (rev 328)
+++ branches/ocean_projects/z_level_mrp/mpas/Makefile        2010-06-03 17:06:40 UTC (rev 329)
@@ -33,6 +33,18 @@
        "CORE = $(CORE)" \
        "CPPFLAGS = -DRKIND=8 $(MODEL_FORMULATION) $(EXPAND_LEVELS) -D_MPI $(FILE_OFFSET) $(ZOLTAN_DEFINE)" )
+ftn:
+        ( make all \
+        "FC = ftn" \
+        "CC = cc" \
+        "SFC = ftn" \
+        "SCC = cc" \
+        "FFLAGS = -i4 -r8 -gopt -O2 -Mvect=nosse -Kieee" \
+        "CFLAGS = -fast" \
+        "LDFLAGS = " \
+        "CORE = $(CORE)" \
+        "CPPFLAGS = -DRKIND=8 $(MODEL_FORMULATION) $(EXPAND_LEVELS) -D_MPI -DUNDERSCORE $(FILE_OFFSET) $(ZOLTAN_DEFINE)" )
+
pgi:
        ( make all \
        "FC = mpif90" \
@@ -45,6 +57,18 @@
        "CORE = $(CORE)" \
        "CPPFLAGS = -DRKIND=8 $(MODEL_FORMULATION) $(EXPAND_LEVELS) -D_MPI -DUNDERSCORE $(FILE_OFFSET) $(ZOLTAN_DEFINE)" )
+pgi-llnl:
+        ( make all \
+        "FC = mpipgf90" \
+        "CC = pgcc" \
+        "SFC = pgf90" \
+        "SCC = pgcc" \
+        "FFLAGS = -i4 -r8 -g -O2" \
+        "CFLAGS = -fast" \
+        "LDFLAGS = " \
+        "CORE = $(CORE)" \
+        "CPPFLAGS = -DRKIND=8 $(MODEL_FORMULATION) $(EXPAND_LEVELS) -D_MPI -DUNDERSCORE $(FILE_OFFSET) $(ZOLTAN_DEFINE)" )
+
pgi-serial:
        ( make all \
        "FC = pgf90" \
Modified: branches/ocean_projects/z_level_mrp/mpas/src/operators/Makefile
===================================================================
--- branches/ocean_projects/z_level_mrp/mpas/src/operators/Makefile        2010-06-03 16:43:03 UTC (rev 328)
+++ branches/ocean_projects/z_level_mrp/mpas/src/operators/Makefile        2010-06-03 17:06:40 UTC (rev 329)
@@ -7,7 +7,7 @@
operators: $(OBJS)
        ar -ru libops.a $(OBJS)
-module_vector_reconstruction.o:
+module_vector_reconstruction.o: module_RBF_interpolation.o
module_RBF_interpolation.o:
clean:
Modified: branches/ocean_projects/z_level_mrp/mpas/src/operators/module_RBF_interpolation.F
===================================================================
--- branches/ocean_projects/z_level_mrp/mpas/src/operators/module_RBF_interpolation.F        2010-06-03 16:43:03 UTC (rev 328)
+++ branches/ocean_projects/z_level_mrp/mpas/src/operators/module_RBF_interpolation.F        2010-06-03 17:06:40 UTC (rev 329)
@@ -101,12 +101,12 @@
! Input: the grid
!
! Output:
- ! radialUnitVectors - the unit vector in the radial direction at each cell center
! edgeNormalVectors - the unit vector at the center of each edge tangent to the sphere
- ! edgeLocations - the location of each edge center in cartesian coordinates
- ! cellTangentPlane - 2 orthoginal unit vectors in the tangent plane of each cell
+ ! cellTangentPlane - 2 orthogonal unit vectors in the tangent plane of each cell
! The first unit vector is chosen to point toward the center of the first
! edge on the cell.
+ ! localVerticalUnitVectors - the unit normal vector of the tangent plane at the center
+ ! of each cell
!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -1414,13 +1414,6 @@
! private subroutines
!!!!!!!!!!!!!!!!!!!!!
- subroutine exit_MPAS(string)
- character(len=*), intent(in) :: string
-
- write(0,*) string
- stop
- end subroutine exit_MPAS
-
function evaluateRBF(rSquared) result(rbfValue)
real(kind=RKIND), intent(in) :: rSquared
real(kind=RKIND) :: rbfValue
Modified: branches/ocean_projects/z_level_mrp/mpas/src/operators/module_vector_reconstruction.F
===================================================================
--- branches/ocean_projects/z_level_mrp/mpas/src/operators/module_vector_reconstruction.F        2010-06-03 16:43:03 UTC (rev 328)
+++ branches/ocean_projects/z_level_mrp/mpas/src/operators/module_vector_reconstruction.F        2010-06-03 17:06:40 UTC (rev 329)
@@ -189,7 +189,7 @@
clon = cos(lonCell(iCell))
slon = sin(lonCell(iCell))
uReconstructZonal(:,iCell) = -uReconstructX(:,iCell)*slon + uReconstructY(:,iCell)*clon
- uReconstructMeridional(:,iCell) = (uReconstructX(:,iCell)*clon &
+ uReconstructMeridional(:,iCell) = -(uReconstructX(:,iCell)*clon &
+ uReconstructY(:,iCell)*slon)*slat &
+ uReconstructZ(:,iCell)*clat
end do
</font>
</pre>