--- MITgcm/optim/optim_readdata.F	2002/11/15 04:03:25	1.2
+++ MITgcm/optim/optim_readdata.F	2002/12/06 01:42:25	1.3
@@ -151,29 +151,23 @@
       print *,'ph-opt 1 ', nvartype, nvarlength, filensx, filensy
 cph)
 
-      read( funit ) (((nWetcTile(i,j,k), i=1,nsx), j=1,nsy),
-     &     k=1,nr)
-      read( funit ) (((nWetsTile(i,j,k), i=1,nsx), j=1,nsy),
-     &     k=1,nr)
-      read( funit ) (((nWetwTile(i,j,k), i=1,nsx), j=1,nsy),
-     &     k=1,nr)
+      read( funit ) (nWetcGlobal(k), k=1,nr)
+      read( funit ) (nWetsGlobal(k), k=1,nr)
+      read( funit ) (nWetwGlobal(k), k=1,nr)
+      read( funit ) (nWetvGlobal(k), k=1,nr)
 
 cgg(    Add OBCS Mask information into the header section for optimization.
 #ifdef ALLOW_OBCSN_CONTROL
-          read(funit) ((((nWetobcsn(i,j,k,iobcs), k=1,nr),
-     &          iobcs= 1,nobcs), i=1,nsx) , j=1,nsy)
+      read( funit ) ((nWetobcsnGlo(k,iobcs), k=1,nr),iobcs= 1,nobcs)
 #endif
 #ifdef ALLOW_OBCSS_CONTROL
-          read(funit) ((((nWetobcss(i,j,k,iobcs), k=1,nr),
-     &          iobcs= 1,nobcs), i=1,nsx) , j=1,nsy)
+      read( funit ) ((nWetobcssGlo(k,iobcs), k=1,nr),iobcs= 1,nobcs)
 #endif
 #ifdef ALLOW_OBCSW_CONTROL
-          read(funit) ((((nWetobcsw(i,j,k,iobcs), k=1,nr),
-     &          iobcs= 1,nobcs), i=1,nsx) , j=1,nsy)
+      read( funit ) ((nWetobcswGlo(k,iobcs), k=1,nr),iobcs= 1,nobcs)
 #endif
 #ifdef ALLOW_OBCSE_CONTROL
-          read(funit) ((((nWetobcse(i,j,k,iobcs), k=1,nr),
-     &          iobcs= 1,nobcs), i=1,nsx) , j=1,nsy)
+      read( funit ) ((nWetobcseGlo(k,iobcs), k=1,nr),iobcs= 1,nobcs)
 #endif
 cgg)
       read( funit ) (ncvarindex(i), i=1,maxcvars)
@@ -196,12 +190,14 @@
          print *, 'pathei: filensx ', filensx
          print *, 'pathei: filensy ', filensy
          
-         print *, 'pathei: nWetcTile ', 
-     &        (((nWetcTile(i,j,k), i=1,nsx), j=1,nsy), k=1,nr)
-         print *, 'pathei: nWetsTile ', 
-     &        (((nWetsTile(i,j,k), i=1,nsx), j=1,nsy), k=1,nr)
-         print *, 'pathei: nWetwTile ', 
-     &        (((nWetwTile(i,j,k), i=1,nsx), j=1,nsy), k=1,nr)
+         print *, 'pathei: nWetcGlobal ', 
+     &        (nWetcGlobal(k),  k=1,nr)
+         print *, 'pathei: nWetsGlobal ', 
+     &        (nWetsGlobal(k),  k=1,nr)
+         print *, 'pathei: nWetwGlobal ', 
+     &        (nWetwGlobal(k),  k=1,nr)
+         print *, 'pathei: nWetvGlobal ',
+     &        (nWetvGlobal(k),  k=1,nr)
          print *, 'pathei: ncvarindex ', 
      &        (ncvarindex(i), i=1,maxcvars)
          print *, 'pathei: ncvarrecs ', 
@@ -267,11 +263,13 @@
                         do k = 1,ncvarnrmax(icvar)
                            cbuffindex = 0
                            if (ncvargrd(icvar) .eq. 'c') then
-                              cbuffindex = nwetctile(bi,bj,k)
+                              cbuffindex = nWetcGlobal(k)
                            else if (ncvargrd(icvar) .eq. 's') then
-                              cbuffindex = nwetstile(bi,bj,k)
+                              cbuffindex = nWetsGlobal(k)
                            else if (ncvargrd(icvar) .eq. 'w') then
-                              cbuffindex = nwetwtile(bi,bj,k)
+                              cbuffindex = nWetwGlobal(k)
+                           else if (ncvargrd(icvar) .eq. 'v') then
+                              cbuffindex = nWetvGlobal(k)
 cgg(   O.B. points have the grid mask "m".
                            else if (ncvargrd(icvar) .eq. 'm') then
 cgg    From "icvrec", calculate what iobcs must be.
@@ -280,22 +278,22 @@
                              iobcs= icvrec - igg*nobcs
 #ifdef ALLOW_OBCSN_CONTROL
                              if (icvar .eq. 11) then                    
-                               cbuffindex = nwetobcsn(bi,bj,k,iobcs)
+                               cbuffindex = nWetobcsnGlo(k,iobcs)
                              endif
 #endif
 #ifdef ALLOW_OBCSS_CONTROL
                              if (icvar .eq. 12) then
-                               cbuffindex = nwetobcss(bi,bj,k,iobcs)
+                               cbuffindex = nWetobcssGlo(k,iobcs)
                              endif
 #endif 
 #ifdef ALLOW_OBCSW_CONTROL
                              if (icvar .eq. 13) then
-                               cbuffindex = nwetobcsw(bi,bj,k,iobcs)
+                               cbuffindex = nWetobcswGlo(k,iobcs)
                              endif
 #endif
 #ifdef ALLOW_OBCSE_CONTROL
                              if (icvar .eq. 14) then
-                               cbuffindex = nwetobcse(bi,bj,k,iobcs)
+                               cbuffindex = nWetobcseGlo(k,iobcs)
                              endif
 #endif
 cgg)