--- MITgcm_contrib/enderton/Diagnostics/DiagLoad.m	2005/07/05 18:57:48	1.9
+++ MITgcm_contrib/enderton/Diagnostics/DiagLoad.m	2005/08/18 15:16:51	1.11
@@ -108,7 +108,7 @@
               ddf,gdf,avg,slc,pst,LoadGridData,GridSuffix,ZcordFile,Vector,FieldName);
 
 % Load coupled fields.  Like AIM, the data is all stuffed into one file
-% called either 'cplFld.*' (MDS) or 'cpl_tave.*' (MNC).  Variables within
+% called either 'cplFldtave.*' (MDS) or 'cpl_tave.*' (MNC).  Variables within
 % the MDS files given in 'DiagGenParam', accessed directly with MNC.  TX
 % and TY (stress on ocean) must be converted to lat-lon grid.
 elseif ismember(fln,cplparameters)
@@ -311,13 +311,11 @@
     UU = DiagLoad_Local('UU'  ,dat,dad,grd,itr,ddf,filesuffix,mnchandle);
     VV = DiagLoad_Local('VV'  ,dat,dad,grd,itr,ddf,filesuffix,mnchandle);
     if isequal(ddf,'MNC')
-        U  = .5*(  U(2:end,:,:,:) +  U(1:end-1,:,:,:) );
-        V  = .5*(  V(:,2:end,:,:) +  V(:,1:end-1,:,:) );
-        %UU = .5*( UU(2:end,:,:,:) + UU(1:end-1,:,:,:) );  % UU and VV might be incorrect. 
-        %VV = .5*( VV(:,2:end,:,:) + VV(:,1:end-1,:,:) );
+        U = U(1:end-1,:,:,:); UU = UU(1:end-1,:,:,:);
+        V = V(:,1:end-1,:,:); VV = VV(:,1:end-1,:,:);
     end
-    U = DiagAverage(U,fln,avg,months,ddf,Dim);
-    V = DiagAverage(V,fln,avg,months,ddf,Dim);
+    U  = DiagAverage(U ,fln,avg,months,ddf,Dim);
+    V  = DiagAverage(V ,fln,avg,months,ddf,Dim);
     UU = DiagAverage(UU,fln,avg,months,ddf,Dim);
     VV = DiagAverage(VV,fln,avg,months,ddf,Dim);
     data = sqrt(abs((U.*U + V.*V) - (UU + VV)));
@@ -372,9 +370,15 @@
      if DiagDebug, disp(['  Debug -- ''data'' size after vector manipulation:  ',mat2str(size(data))]); end
     else
 % Sequence here for Vector = 0
-     if ~isequal(Index,0)
+     if ~isequal(Index,0) & isequal(size(Index),[1 1]) & isequal(sign(Index),1)
         if     isequal(Dim,2), data = squeeze(data(:,:,Index,:));
         elseif isequal(Dim,3), data = squeeze(data(:,:,:,Index,:)); end
+     elseif isequal(size(Index),[1 1]) & ~isequal(sign(Index),1)
+        if     isequal(Dim,2), data = sign(Index(1)).*squeeze(data(:,:,abs(Index(1)),:));
+        elseif isequal(Dim,3), data = sign(Index(1)).*squeeze(data(:,:,:,abs(Index(1)),:)); end
+     elseif isequal(size(Index),[1 2])
+        if     isequal(Dim,2), data = sign(Index(1)).*squeeze(data(:,:,abs(Index(1)),:)) + sign(Index(2)).*squeeze(data(:,:,abs(Index(2)),:));
+        elseif isequal(Dim,3), data = sign(Index(1)).*squeeze(data(:,:,:,abs(Index(1)),:)) + sign(Index(2)).*squeeze(data(:,:,:,abs(Index(2)),:)); end
      end
      if DiagDebug, disp(['  Debug -- ''data'' size after indexing:  ',mat2str(size(data))]); end
      data = DiagAverage(data,fln,avg,months,ddf,Dim);
@@ -409,16 +413,11 @@
 % Thus is merely a local function that calls the load data functions
 % according to the DataFormat for the data specified by dfm.
 function data = DiagLoad_Local(fln,dat,dad,grd,itr,dfm,filesuffix,mnchandle)
-    
 	if isequal(dfm,'MDS')
         data = rdmds([dad,'/',fln,filesuffix],itr);
 	elseif isequal(dfm,'MNC')
-        iter = rdmnc_mod([dad,mnchandle],'T');
-        iter = iter.T;
-        [dummy,indecies] = ismember(itr,iter);
-        data = rdmnc_mod([dad,mnchandle],[fln,filesuffix],'T',indecies);
-        iter = data.T;
-        if ~isequal(itr,iter'), error('Missing iterations in data!'); end
+        data = rdmnc_mod2([dad,mnchandle],[fln,filesuffix],'iter','T',itr);
+        if ~isequal(itr,data.iter'), error('Missing iterations in data!'); end
         eval(['data = data.',fln,filesuffix,';']);
 	else
         error(['Unrecognized data type:  ',dfm]);