--- MITgcm_contrib/plumes/plumes_wrapper.F	2004/05/05 18:19:35	1.1
+++ MITgcm_contrib/plumes/plumes_wrapper.F	2004/05/13 22:20:26	1.2
@@ -4,7 +4,7 @@
 c        with plumes driver. 
 c        1) Set up "bi, bj loop"  and some timers and clocks. 
 c        2) Call do_plumes - driver for plumes which computes tendencies
-c        3) Interpolate tendencies to dynamics grid in vertical
+c        3) Interpolate tendencies to dynamics grid
 c        4) Convert u,v tendencies to C-Grid
 c
 c Calls: do_plumes (get u,v,t,s tend, step tke, etc and tc, etc. forward)
@@ -18,7 +18,6 @@
 #include "plumes_SIZE.h"
 #include "DYNVARS.h"
 #include "plumes_coms.h"
-#include "gridalt_mapping.h"
 #include "EEPARAMS.h"
 
        integer myTime, myIter, myThid 
@@ -33,11 +32,9 @@
 
 c Compute plumes increments
        CALL TIMER_START ('DO_PLUMES         [PLUME_WRAPPER]',mythid)
-       do bj = myByLo(myThid), myByHi(myThid)
        do bi = myBxLo(myThid), myBxHi(myThid)
-        call do_plumes(uplume,vplume,thplume,splume,Nxplumes,Nyplumes,
-     .           Nr,Nsx,Nsy,bi,bj,duplume,dvplume,dthplume,dsplume)
-       enddo
+        call do_plumes(uplume,thplume,Nxplume,Nrplume,Nsx,bi,
+     .                                              duplume,dthplume)
        enddo
        CALL TIMER_STOP ('DO_PLUMES         [PLUME_WRAPPER]',mythid)
 
@@ -45,14 +42,10 @@
        do bj = myByLo(myThid), myByHi(myThid)
        do bi = myBxLo(myThid), myBxHi(myThid)
 
-        call plume2dyn(duplume,Nxplumes,Nyplumes,Nr,Nsx,Nsy,
-     .    idim1,idim2,jdim1,jdim2,Nr,Nsx,Nsy,1,sNx,1,sNy,bi,bj,guplume)
-        call plume2dyn(dvplume,Nxplumes,Nyplumes,Nr,Nsx,Nsy,
-     .    idim1,idim2,jdim1,jdim2,Nr,Nsx,Nsy,1,sNx,1,sNy,bi,bj,gvplume)
-        call plume2dyn(dthplume,Nxplumes,Nyplumes,Nr,Nsx,Nsy,
-     .    idim1,idim2,jdim1,jdim2,Nr,Nsx,Nsy,1,sNx,1,sNy,bi,bj,gthplume)
-        call plume2dyn(dsplume,Nxplumes,Nyplumes,Nr,Nsx,Nsy,
-     .    idim1,idim2,jdim1,jdim2,Nr,Nsx,Nsy,1,sNx,1,sNy,bi,bj,gsplume)
+        call plume2dyn(duplume,Nxplume,Nrplume,Nsx,Nsy,idim1,idim2,
+     .    jdim1,jdim2,Nr,Nsx,Nsy,1,sNx,1,sNy,bi,bj,guplume,gvplume)
+        call plume2dyn(dthplume,Nxplume,Nrplume,Nsx,Nsy,idim1,idim2,
+     .    jdim1,jdim2,Nr,Nsx,Nsy,1,sNx,1,sNy,bi,bj,gthplume)
 
        enddo
        enddo
@@ -70,8 +63,6 @@
 c Call the a-grid exchange routine to fill in the halo regions (dth,ds)
        call exch_RL_cube(gthplume,OLx, OLx, OLy, OLy, Nr,OLx, OLy,
      .            FORWARD_SIMULATION, EXCH_UPDATE_CORNERS, myThid )
-       call exch_RL_cube(gsplume,OLx, OLx, OLy, OLy, Nr,OLx, OLy,
-     .            FORWARD_SIMULATION, EXCH_UPDATE_CORNERS, myThid )
        CALL TIMER_STOP ('EXCHANGES         [PLUME_WRAPPER]',mythid)
 
       return