--- MITgcm_contrib/enderton/Diagnostics/DiagLoad.m 2005/02/07 05:31:45 1.6 +++ MITgcm_contrib/enderton/Diagnostics/DiagLoad.m 2005/03/01 20:09:11 1.7 @@ -173,13 +173,13 @@ flu,ddf,gdf,avg,slc,pst,LoadGridData,GridSuffix,ZcordFile); % Load horizontal velocities, convert to lat-lon grid. -elseif ismember(fln,{'U','V','uVel','vVel'}) +elseif ismember(fln,{'U','V','uVel','vVel','fizhi_U','fizhi_V'}) if isequal(dat,'Tav') U = DiagLoad_Local('uVel',dat,dad,grd,itr,ddf,filesuffix,mnchandle); V = DiagLoad_Local('vVel',dat,dad,grd,itr,ddf,filesuffix,mnchandle); else isequal(dat,'Ins') - U = DiagLoad_Local('U',dat,dad,grd,itr,ddf,filesuffix,mnchandle); - V = DiagLoad_Local('V',dat,dad,grd,itr,ddf,filesuffix,mnchandle); + U = DiagLoad_Local([fln(1:end-1),'U'],dat,dad,grd,itr,ddf,filesuffix,mnchandle); + V = DiagLoad_Local([fln(1:end-1),'V'],dat,dad,grd,itr,ddf,filesuffix,mnchandle); end if isequal(ddf,'MNC') U = U(1:end-1,:,:,:); @@ -190,9 +190,9 @@ [XC,XG,YC,YG,Ylat,ZC,ZG,RAC,drC,drF,HFacC,HFacW,HFacS,dxG,dyG,dxC,dyC] = ... DiagLoadGridData(LoadGridData,grd,gdf,flu,GridSuffix,ZcordFile); [U,V]=uvcube2latlon(XC,YC,U,V,XL,YL); - if ismember(fln,{'U','uVel'}) + if ismember(fln,{'U','uVel','fizhi_U'}) data = U; - elseif ismember(fln,{'V','vVel'}) + elseif ismember(fln,{'V','vVel','fizhi_V'}) data = V; end [data,xax,yax,pltslc] = ...