Changeset 2607

Timestamp:

11/05/09 08:46:47 (15 years ago)

Author:

Mathieu Morlighem

Message:

Accelerated expread and removed old files not needed anymore

Location:

issm/trunk/src/m/utils/Exp

Files:

• expdoc.m (modified) (1 diff)
• readwrite/expread.m (modified) (2 diffs)
• readwrite/expwriteasvertices.m (deleted)
• readwrite/put_file.m (deleted)
• readwrite/readline.m (deleted)

issm/trunk/src/m/utils/Exp/expdoc.m

@@ -33 +33 @@
 disp('     expselect: display all the profiles of oldfile, the user clicks on the contour he/she wants to remove. Results saved in newfile');
 disp('            usage: expselect(newfile,oldfile)');
-disp('     expwriteasvertices: writes an Argus file from a structure given in input???');
-disp('            usage: expwriteasvertices(structure,filename)');
 disp('     expwrite: writes an Argus file from a structure given in input???');
 disp('            usage: expwrite(structure,filename)');

issm/trunk/src/m/utils/Exp/readwrite/expread.m

@@ -1 @@
-function struct=expread(name,whole);
-%EXPREAD - read a file exp and build a structure
+function Struct=expread(filename,whole);
+%EXPREAD - read a file exp and build a Structure
 %
-%   This routine reads a file .exp and build a structure containing the 
-%   fields x and y corresponding to the coordinates, one for the name of
+%   This routine reads a file .exp and build a Structure containing the 
+%   fields x and y corresponding to the coordinates, one for the filename of
 %   the exp file, for the density, for the nodes, and a field closed to 
 %   indicate if the domain is closed. 
@@ -10 +10 @@
 %
 %   Usage:
-%      struct=expread(name,whole)
+%      Struct=expread(filename,whole)
 %  
 %   Example:
-%      struct=expread('domainoutline.exp',1)
+%      Struct=expread('domainoutline.exp',1)
 %
 %   See also EXPDOC, EXPWRITEASVERTICES
 
 %some checks
-if ~exist(name),
-        error(['expread error message: file ' name ' not found!']);
+if ~exist(filename),
+        error(['expread error message: file ' filename ' not found!']);
+end
+if nargin~=2,
+        help expread
+        error('expread error message: second argument not provided'),
 end
 
-try,
-fid=fopen(name,'r');
-i=0;
+%initialize number of profile
+count=0;
+
+%open file
+fid=fopen(filename,'r');
+
+%loop over the number of profiles
 while (~feof(fid)),
-   i=i+1;
-   %firt line contains the name
-   A=readline(fid,2);
-   if length(A)>8, 
-       struct(i).name=A(9:length(A));
+
+        %update number of profiles
+   count=count+1;
+
+   %Get file name
+        A=fscanf(fid,'%s %s',2);
+        if ~strncmp(A,'##Name:',7), break; end
+        if length(A)>7, 
+                Struct(count).name=A(8:end);
+        else
+                Struct(count).name='';
+        end
+
+        %Get Icon
+        A=fscanf(fid,'%s %s',2);
+        if ~strncmp(A,'##Icon:',6), break; end
+
+        %Get Info
+        A=fscanf(fid,'%s %s %s %s',4);
+        if ~strncmp(A,'#Points',7), break; end
+
+        %Get number of nods and density
+   A=fscanf(fid,'%f %f',[1 2]);
+   if whole==1,
+       Struct(count).nods=A(1);
+   else
+       Struct(count).nods=A(1)-1;
    end
+   Struct(count).density=A(2);
 
-   A=readline(fid,2);
-   A=readline(fid,4);
+        %Get Info
+        A=fscanf(fid,'%s %s %s %s',5);
+        if ~strncmp(A,'#XposYpos',9), break; end
 
-   [A,bytecount]=fscanf(fid,'%f %f',[1 2]);
-   if whole==1,
-       struct(i).nods=A(1);
-   else
-       struct(i).nods=A(1)-1;
-   end
-   struct(i).density=A(2);
-   A=readline(fid,5);
+        %Get Coordinates
+        A=fscanf(fid,'%f %f',[2 Struct(count).nods]);
+        Struct(count).x=A(1,:)';
+        Struct(count).y=A(2,:)';
 
-   struct(i).x=zeros(struct(i).nods,1);
-   struct(i).y=zeros(struct(i).nods,1);
-   struct(i).closed=0;
-
-   for n=1:struct(i).nods,
-       [A,bytecount]=fscanf(fid,'%f %f',[1 2]);
-       struct(i).x(n)=A(1);
-       struct(i).y(n)=A(2);
-   end
-   if whole==0,
-       fscanf(fid,'%f %f',[1 2]);
-   end
+        %skip last coordinate if whole=0,
+   if whole==0, fscanf(fid,'%f %f',[1 2]); end
 
 end
-catch,
-end
+
+%close file
 fclose(fid);