--- MITgcm_contrib/enderton/Diagnostics/DiagLoad.m 2005/06/28 21:33:51 1.8 +++ MITgcm_contrib/enderton/Diagnostics/DiagLoad.m 2005/07/05 18:57:48 1.9 @@ -105,7 +105,7 @@ data = DiagAverage(data,fln,avg,months,ddf,Dim); [data,xax,yax,pltslc] = ... DiagSlice(data,fln,trl,dat,dad,grd,itr,tst,flu,... - ddf,gdf,avg,slc,pst,LoadGridData,GridSuffix,ZcordFile); + 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 @@ -138,7 +138,7 @@ data = DiagAverage(data,fln,avg,months,ddf,Dim); [data,xax,yax,pltslc] = ... DiagSlice(data,fln,trl,dat,dad,grd,itr,tst,flu,... - ddf,gdf,avg,slc,pst,LoadGridData,GridSuffix,ZcordFile); + ddf,gdf,avg,slc,pst,LoadGridData,GridSuffix,ZcordFile,Vector,FieldName); % Load ice parameters. Note that as the ice variable names appear to be in % constant flux, this part quickly becomes out of date. @@ -153,7 +153,7 @@ data = DiagAverage(data,fln,avg,months,ddf,Dim); [data,xax,yax,pltslc] = ... DiagSlice(data,fln,trl,dat,dad,grd,itr,tst,flu,... - ddf,gdf,avg,slc,pst,LoadGridData,GridSuffix,ZcordFile); + ddf,gdf,avg,slc,pst,LoadGridData,GridSuffix,ZcordFile,Vector,FieldName); % Load generic fields where no modifications are needed. elseif ismember(fln,{'S','T','Temp','aim_RH','phiHyd','Conv'}) @@ -161,7 +161,7 @@ data = DiagAverage(data,fln,avg,months,ddf,Dim); [data,xax,yax,pltslc] = ... DiagSlice(data,fln,trl,dat,dad,grd,itr,tst,... - flu,ddf,gdf,avg,slc,pst,LoadGridData,GridSuffix,ZcordFile); + flu,ddf,gdf,avg,slc,pst,LoadGridData,GridSuffix,ZcordFile,Vector,FieldName); % Read vertical velocities, eta. Convert from [P] to [hPa] in atmosphere. elseif ismember(fln,{'W','wVel','Eta','ETA'}) @@ -170,7 +170,7 @@ data = DiagAverage(data,fln,avg,months,ddf,Dim); [data,xax,yax,pltslc] = ... DiagSlice(data,fln,trl,dat,dad,grd,itr,tst,... - flu,ddf,gdf,avg,slc,pst,LoadGridData,GridSuffix,ZcordFile); + flu,ddf,gdf,avg,slc,pst,LoadGridData,GridSuffix,ZcordFile,Vector,FieldName); % Load horizontal velocities, convert to lat-lon grid. elseif ismember(fln,{'U','V','uVel','vVel','fizhi_U','fizhi_V'}) @@ -197,7 +197,7 @@ end [data,xax,yax,pltslc] = ... DiagSlice(data,fln,trl,dat,dad,grd,itr,tst,... - flu,ddf,gdf,avg,slc,pst,LoadGridData,GridSuffix,ZcordFile); + flu,ddf,gdf,avg,slc,pst,LoadGridData,GridSuffix,ZcordFile,Vector,FieldName); % Meridional overturning. elseif ismember(fln,{'Bol','Psi','Res'}) @@ -280,7 +280,7 @@ end [data,xax,yax,pltslc] = ... DiagSlice(data,fln,trl,dat,dad,grd,itr,tst,flu,ddf,gdf,... - avg,slc,pst,LoadGridData,GridSuffix,ZcordFile); + avg,slc,pst,LoadGridData,GridSuffix,ZcordFile,Vector,FieldName); % Read in variabilities. Here we must make some simple calculations. For @@ -296,7 +296,7 @@ data = DiagAverage(data,fln,avg,months,ddf,Dim); [data,xax,yax,pltslc] = ... DiagSlice(data,fln,trl,dat,dad,grd,itr,tst,... - flu,ddf,gdf,avg,slc,pst,LoadGridData,GridSuffix,ZcordFile); + flu,ddf,gdf,avg,slc,pst,LoadGridData,GridSuffix,ZcordFile,Vector,FieldName); elseif isequal(fln,'Tstd') T = DiagLoad_Local('T' ,dat,dad,grd,itr,ddf,filesuffix,mnchandle); TT = DiagLoad_Local('TT',dat,dad,grd,itr,ddf,filesuffix,mnchandle); @@ -304,7 +304,7 @@ data = DiagAverage(data,fln,avg,months,ddf,Dim); [data,xax,yax,pltslc] = ... DiagSlice(data,fln,trl,dat,dad,grd,itr,tst,... - flu,ddf,gdf,avg,slc,pst,LoadGridData,GridSuffix,ZcordFile); + flu,ddf,gdf,avg,slc,pst,LoadGridData,GridSuffix,ZcordFile,Vector,FieldName); elseif isequal(fln,'KEpri') U = DiagLoad_Local('uVel',dat,dad,grd,itr,ddf,filesuffix,mnchandle); V = DiagLoad_Local('vVel',dat,dad,grd,itr,ddf,filesuffix,mnchandle); @@ -323,7 +323,7 @@ data = sqrt(abs((U.*U + V.*V) - (UU + VV))); [data,xax,yax,pltslc] = ... DiagSlice(data,fln,trl,dat,dad,grd,itr,tst,... - flu,ddf,gdf,avg,slc,pst,LoadGridData,GridSuffix,ZcordFile); + flu,ddf,gdf,avg,slc,pst,LoadGridData,GridSuffix,ZcordFile,Vector,FieldName); % If the field is not recognized, try best to try and open it. else @@ -394,7 +394,7 @@ if ~isequal(Vector,3) [data,xax,yax,pltslc] = ... DiagSlice(data,fln,trl,dat,dad,grd,itr,tst,... - flu,ddf,gdf,avg,slc,pst,LoadGridData,GridSuffix,ZcordFile); + flu,ddf,gdf,avg,slc,pst,LoadGridData,GridSuffix,ZcordFile,Vector,FieldName); if DiagDebug, disp([' Debug -- ''data'' size after slice: ',mat2str(size(data))]); end if DiagDebug, disp([' Debug -- ''xax'' size: ',mat2str(size(xax))]); end if DiagDebug, disp([' Debug -- ''yax'' size: ',mat2str(size(yax))]); end