Diff of /MITgcm_contrib/enderton/Diagnostics/DiagLoadGradsData.m

Parent Directory | Revision Log | Revision Graph | Patch

--- MITgcm_contrib/enderton/Diagnostics/DiagLoadGradsData.m	2005/04/29 17:34:39	1.3
+++ MITgcm_contrib/enderton/Diagnostics/DiagLoadGradsData.m	2005/06/28 21:33:51	1.4
@@ -8,7 +8,7 @@
 ShiftData = 0;
 format = 'NONSEQUENTIAL';
 
-tablfile = [dad,'/',Grads,'.tabl'];
+tablfile = [dad,'/',Grads];
 file = textread(tablfile,'%s','delimiter','\n','whitespace','');
 
 for iline = 1:length(file)
@@ -66,6 +66,10 @@
         end
         if length(ini) == 13
             monchar=ini(9:11);
+        elseif length(ini)==7
+            monchar=ini(1:3);
+        else
+         error('Cannot parse TDEF correctly');
         end
         if     isequal(monchar,'JAN'), inimonth = 1;
         elseif isequal(monchar,'FEB'), inimonth = 2;
@@ -99,7 +103,7 @@
     end
     
     if isequal(tokens{1},'FORMAT')
-        if isequal(tokens{2},'SEQUENTIAL')
+        if isequal(tokens{2},'SEQUENTIAL') | isequal(tokens{2},'sequential')
             format = 'SEQUENTIAL';
         else
             disp(['Unrecognized grads FORMAT:  ',tokens{2}]);
@@ -139,7 +143,7 @@
 fid=fopen(datafile,'r','b');
 data = fread(fid,'real*4');
 fclose(fid);
-if isequal(format,'SEQUENTIAL')
+if isequal(format,'SEQUENTIAL') | isequal(format,'sequential')
     index=true([nx*ny*nz*nv*nt+2*nv*nt,1]);
     index([1:nx*ny*nz+2:end])=false;
     index([2:nx*ny*nz+2:end])=false;
@@ -153,4 +157,6 @@
     indexEastHemi = xax<180;
     data = cat(1,data(indexWestHemi,:,:),data(indexEastHemi,:,:));
     xax = cat(2,xax(indexWestHemi)-360,xax(indexEastHemi));
-end
\ No newline at end of file
+end
+datatmp(:,:,inimonth:num+inimonth-1) = data;
+data=datatmp;