<p><b>dwj07@fsu.edu</b> 2012-02-06 12:39:30 -0700 (Mon, 06 Feb 2012)</p><p><br>
        -- BRANCH COMMIT --<br>
<br>
        Changing inteface to standarc advection routines.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/ocean_projects/advection_routines/src/operators/mpas_tracer_advection_std.F
===================================================================
--- branches/ocean_projects/advection_routines/src/operators/mpas_tracer_advection_std.F        2012-02-06 18:57:28 UTC (rev 1467)
+++ branches/ocean_projects/advection_routines/src/operators/mpas_tracer_advection_std.F        2012-02-06 19:39:30 UTC (rev 1468)
@@ -18,7 +18,7 @@
 
    contains
 
-   subroutine mpas_tracer_advection_std_tend(tracers, uh, w, zDistance, zWeightUp, zWeightDown, grid, tend)!{{{
+   subroutine mpas_tracer_advection_std_tend(tracers, uh, w, zDistance, zWeightK, zWeightKm1, grid, tend)!{{{
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 
    !
    ! Input: s - current model state
@@ -30,14 +30,14 @@
       real (kind=RKIND), dimension(:,:,:), intent(inout) :: tend
       real (kind=RKIND), dimension(:,:,:), intent(in) :: tracers
       real (kind=RKIND), dimension(:,:), intent(in) :: uh, w
-      real (kind=RKIND), dimension(:), intent(in) :: zDistance, zWeightUp, zWeightDown
+      real (kind=RKIND), dimension(:), intent(in) :: zDistance, zWeightK, zWeightKm1
       type (mesh_type), intent(in) :: grid
 
       call mpas_timer_start(&quot;tracer-hadv&quot;, .false.)
       call mpas_tracer_advection_std_hadv_tend(tracers, uh, grid, tend)
       call mpas_timer_stop(&quot;tracer-hadv&quot;)
       call mpas_timer_start(&quot;tracer-vadv&quot;, .false.)
-      call mpas_tracer_advection_std_vadv_tend(tracers, w, zDistance, zWeightUp, zWeightDown, grid, tend)
+      call mpas_tracer_advection_std_vadv_tend(tracers, w, zDistance, zWeightK, zWeightKm1, grid, tend)
       call mpas_timer_stop(&quot;tracer-vadv&quot;)
 
    end subroutine mpas_tracer_advection_std_tend!}}}

Modified: branches/ocean_projects/advection_routines/src/operators/mpas_tracer_advection_std_vadv.F
===================================================================
--- branches/ocean_projects/advection_routines/src/operators/mpas_tracer_advection_std_vadv.F        2012-02-06 18:57:28 UTC (rev 1467)
+++ branches/ocean_projects/advection_routines/src/operators/mpas_tracer_advection_std_vadv.F        2012-02-06 19:39:30 UTC (rev 1468)
@@ -20,21 +20,21 @@
 
    contains
 
-   subroutine mpas_tracer_advection_std_vadv_tend(tracers, w, zDistance, zWeightUp, zWeightDown, grid, tend)!{{{
+   subroutine mpas_tracer_advection_std_vadv_tend(tracers, w, zDistance, zWeightK, zWeightKm1, grid, tend)!{{{
 
       real (kind=RKIND), dimension(:,:,:), intent(inout) :: tend
       real (kind=RKIND), dimension(:,:,:), intent(in) :: tracers
       real (kind=RKIND), dimension(:,:), intent(in) :: w
-      real (kind=RKIND), dimension(:), intent(in) :: zDistance, zWeightUp, zWeightDown
+      real (kind=RKIND), dimension(:), intent(in) :: zDistance, zWeightK, zWeightKm1
       type (mesh_type), intent(in) :: grid
       real (kind=RKIND) :: dt
 
       if(order2) then
-        call mpas_tracer_advection_std_vadv2_tend(tracers, w, zDistance, zWeightUp, zWeightDown, grid, tend) 
+        call mpas_tracer_advection_std_vadv2_tend(tracers, w, zDistance, zWeightK, zWeightKm1, grid, tend) 
       else if(order3) then
-        call mpas_tracer_advection_std_vadv3_tend(tracers, w, zDistance, zWeightUp, zWeightDown, grid, tend) 
+        call mpas_tracer_advection_std_vadv3_tend(tracers, w, zDistance, zWeightK, zWeightKm1, grid, tend) 
       else if(order4) then
-        call mpas_tracer_advection_std_vadv4_tend(tracers, w, zDistance, zWeightUp, zWeightDown, grid, tend) 
+        call mpas_tracer_advection_std_vadv4_tend(tracers, w, zDistance, zWeightK, zWeightKm1, grid, tend) 
       endif
 
    end subroutine mpas_tracer_advection_std_vadv_tend!}}}

Modified: branches/ocean_projects/advection_routines/src/operators/mpas_tracer_advection_std_vadv2.F
===================================================================
--- branches/ocean_projects/advection_routines/src/operators/mpas_tracer_advection_std_vadv2.F        2012-02-06 18:57:28 UTC (rev 1467)
+++ branches/ocean_projects/advection_routines/src/operators/mpas_tracer_advection_std_vadv2.F        2012-02-06 19:39:30 UTC (rev 1468)
@@ -15,7 +15,7 @@
 
    contains
 
-   subroutine mpas_tracer_advection_std_vadv2_tend(tracers, w, zDistance, zWeightUp, zWeightDown, grid, tend)!{{{
+   subroutine mpas_tracer_advection_std_vadv2_tend(tracers, w, zDistance, zWeightK, zWeightKm1, grid, tend)!{{{
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 
    !
    ! Input: s - current model state
@@ -27,7 +27,7 @@
       real (kind=RKIND), dimension(:,:,:), intent(inout) :: tend
       real (kind=RKIND), dimension(:,:,:), intent(in) :: tracers
       real (kind=RKIND), dimension(:,:), intent(in) :: w
-      real (kind=RKIND), dimension(:), intent(in) :: zDistance, zWeightUp, zWeightDown
+      real (kind=RKIND), dimension(:), intent(in) :: zDistance, zWeightK, zWeightKm1
       type (mesh_type), intent(in) :: grid
 
       integer :: i, iCell, iEdge, k, iTracer, cell1, cell2
@@ -59,7 +59,7 @@
       do iCell=1,grid % nCellsSolve
         do k = 2, maxLevelCell(iCell)
            do iTracer=1,num_tracers
-             vert_flux(iTracer,k) = w(k,iCell)*(zWeightUp(k)*tracers(iTracer,k,iCell)+zWeightDown(k)*tracers(iTracer,k-1,iCell))
+             vert_flux(iTracer,k) = w(k,iCell)*(zWeightK(k)*tracers(iTracer,k,iCell)+zWeightKm1(k)*tracers(iTracer,k-1,iCell))
            end do
         end do
 

Modified: branches/ocean_projects/advection_routines/src/operators/mpas_tracer_advection_std_vadv3.F
===================================================================
--- branches/ocean_projects/advection_routines/src/operators/mpas_tracer_advection_std_vadv3.F        2012-02-06 18:57:28 UTC (rev 1467)
+++ branches/ocean_projects/advection_routines/src/operators/mpas_tracer_advection_std_vadv3.F        2012-02-06 19:39:30 UTC (rev 1468)
@@ -17,7 +17,7 @@
 
    contains
 
-   subroutine mpas_tracer_advection_std_vadv3_tend(tracers, w, zDistance, zWeightUp, zWeightDown, grid, tend)!{{{
+   subroutine mpas_tracer_advection_std_vadv3_tend(tracers, w, zDistance, zWeightK, zWeightKm1, grid, tend)!{{{
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 
    !
    ! Input: s - current model state
@@ -29,7 +29,7 @@
       real (kind=RKIND), dimension(:,:,:), intent(inout) :: tend
       real (kind=RKIND), dimension(:,:,:), intent(in) :: tracers
       real (kind=RKIND), dimension(:,:), intent(in) :: w
-      real (kind=RKIND), dimension(:), intent(in) :: zDistance, zWeightUp, zWeightDown
+      real (kind=RKIND), dimension(:), intent(in) :: zDistance, zWeightK, zWeightKm1
       type (mesh_type), intent(in) :: grid
       real (kind=RKIND) :: dt
 
@@ -57,7 +57,7 @@
 
         k = 2
         do iTracer=1,num_tracers
-          vert_flux(iTracer,k) = w(k,iCell)*(zWeightUp(k)*tracers(iTracer,k,iCell)+zWeightDown(k)*tracers(iTracer,k-1,iCell))
+          vert_flux(iTracer,k) = w(k,iCell)*(zWeightK(k)*tracers(iTracer,k,iCell)+zWeightKm1(k)*tracers(iTracer,k-1,iCell))
         enddo
         
         do k=3,maxLevelCell(iCell)-1
@@ -71,7 +71,7 @@
         k = maxLevelCell(iCell)
 
         do iTracer=1,num_tracers
-          vert_flux(iTracer,k) = w(k,iCell)*(zWeightUp(k)*tracers(iTracer,k,iCell)+zWeightDown(k)*tracers(iTracer,k-1,iCell))
+          vert_flux(iTracer,k) = w(k,iCell)*(zWeightK(k)*tracers(iTracer,k,iCell)+zWeightKm1(k)*tracers(iTracer,k-1,iCell))
         enddo
 
         vert_Flux(:, maxLevelCell(iCell)+1) = 0.0

Modified: branches/ocean_projects/advection_routines/src/operators/mpas_tracer_advection_std_vadv4.F
===================================================================
--- branches/ocean_projects/advection_routines/src/operators/mpas_tracer_advection_std_vadv4.F        2012-02-06 18:57:28 UTC (rev 1467)
+++ branches/ocean_projects/advection_routines/src/operators/mpas_tracer_advection_std_vadv4.F        2012-02-06 19:39:30 UTC (rev 1468)
@@ -15,7 +15,7 @@
 
    contains
 
-   subroutine mpas_tracer_advection_std_vadv4_tend(tracers, w, zDistance, zWeightUp, zWeightDown, grid, tend)!{{{
+   subroutine mpas_tracer_advection_std_vadv4_tend(tracers, w, zDistance, zWeightK, zWeightKm1, grid, tend)!{{{
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 
    !
    ! Input: s - current model state
@@ -27,7 +27,7 @@
       real (kind=RKIND), dimension(:,:,:), intent(inout) :: tend
       real (kind=RKIND), dimension(:,:,:), intent(in) :: tracers
       real (kind=RKIND), dimension(:,:), intent(in) :: w
-      real (kind=RKIND), dimension(:), intent(in) :: zDistance, zWeightUp, zWeightDown
+      real (kind=RKIND), dimension(:), intent(in) :: zDistance, zWeightK, zWeightKm1
       type (mesh_type), intent(in) :: grid
       real (kind=RKIND) :: dt
 
@@ -55,7 +55,7 @@
 
         k = 2
         do iTracer=1,num_tracers
-          vert_flux(iTracer,k) = w(k,iCell)*(zWeightUp(k)*tracers(iTracer,k,iCell)+zWeightDown(k)*tracers(iTracer,k-1,iCell))
+          vert_flux(iTracer,k) = w(k,iCell)*(zWeightK(k)*tracers(iTracer,k,iCell)+zWeightKm1(k)*tracers(iTracer,k-1,iCell))
         enddo
         do k=3,nVertLevels-1
           do iTracer=1,num_tracers
@@ -66,7 +66,7 @@
 
         k = maxLevelCell(iCell)
         do iTracer=1,num_tracers
-          vert_flux(iTracer,k) = w(k,iCell)*(zWeightUp(k)*tracers(iTracer,k,iCell)+zWeightDown(k)*tracers(iTracer,k-1,iCell))
+          vert_flux(iTracer,k) = w(k,iCell)*(zWeightK(k)*tracers(iTracer,k,iCell)+zWeightKm1(k)*tracers(iTracer,k-1,iCell))
         enddo
 
         vert_flux(:,maxLevelCell(iCell)+1) = 0.0

</font>
</pre>