Changeset 13341

Timestamp:

09/12/12 11:20:47 (13 years ago)

Author:

jschierm

Message:

NEW: Python version of expwrite (plus some cleanup).

Location:

issm/trunk-jpl/src/m/exp

Files:

• expread.py (modified) (6 diffs)
• expwrite.m (modified) (1 diff)
• expwrite.py (added)

issm/trunk-jpl/src/m/exp/expread.py

@@ -16 +16 @@
 
            Usage:
-              Struct=expread(filename)
+              contours=expread(filename)
 
            Example:
-              Struct=expread('domainoutline.exp')
-              Struct=expread('domainoutline.exp')
+              contours=expread('domainoutline.exp')
+              contours=expread('domainoutline.exp')
 
            See also EXPDOC, EXPWRITEASVERTICES
@@ -30 +30 @@
 
         #initialize number of profile
-        Structs=[]
+        contours=[]
 
         #open file
@@ -39 +39 @@
 
                 #update number of profiles
-                Struct=OrderedDict()
+                contour=OrderedDict()
 
                 #Get file name
@@ -51 +51 @@
                         break
                 if len(A[1])>5: 
-                        Struct['name']=A[1][5:-1]
+                        contour['name']=A[1][5:-1]
                 else:
-                        Struct['name']=''
+                        contour['name']=''
 
                 #Get Icon
@@ -67 +67 @@
                 #Get number of nodes and density
                 A=fid.readline().split()
-                Struct['nods']   =float(A[0])
-                Struct['density']=float(A[1])
+                contour['nods']   =float(A[0])
+                contour['density']=float(A[1])
 
                 #Get Info
@@ -77 +77 @@
 
                 #Get Coordinates
-                Struct['x']=numpy.empty(Struct['nods'])
-                Struct['y']=numpy.empty(Struct['nods'])
-                for i in xrange(int(Struct['nods'])):
+                contour['x']=numpy.empty(contour['nods'])
+                contour['y']=numpy.empty(contour['nods'])
+                for i in xrange(int(contour['nods'])):
                         A=fid.readline().split()
-                        Struct['x'][i]=float(A[0])
-                        Struct['y'][i]=float(A[1])
-
-#               if(Struct['nods']~=length(Struct['x']))error(['Profile ' num2str ' reports incorrect length']); end;
+                        contour['x'][i]=float(A[0])
+                        contour['y'][i]=float(A[1])
 
                 #Check if closed
-                if (Struct['nods'] > 1) and \
-                   (Struct['x'][-1] == Struct['x'][0]) and \
-                   (Struct['y'][-1] == Struct['y'][0]):
-                        Struct['closed']=True
+                if (contour['nods'] > 1) and \
+                   (contour['x'][-1] == contour['x'][0]) and \
+                   (contour['y'][-1] == contour['y'][0]):
+                        contour['closed']=True
                 else:
-                        Struct['closed']=False
+                        contour['closed']=False
 
-                Structs.append(Struct)
+                contours.append(contour)
 
         #close file
         fid.close()
 
-        return Structs
+        return contours
 

issm/trunk-jpl/src/m/exp/expwrite.m

@@ -21 +21 @@
         end
    
-   if isfield(a,'name'),
-           if ~isempty(a(n).name),
-                   fprintf(fid,'%s%s\n','## Name:',a(n).name);
-           else
-                   fprintf(fid,'%s\n','## Name:');
-           end
-   else
-           fprintf(fid,'%s\n','## Name:');
-   end
+        if isfield(a,'name'),
+                if ~isempty(a(n).name),
+                        fprintf(fid,'%s%s\n','## Name:',a(n).name);
+                else
+                        fprintf(fid,'%s\n','## Name:');
+                end
+        else
+                fprintf(fid,'%s\n','## Name:');
+        end
    
-   fprintf(fid,'%s\n','## Icon:0');
-   fprintf(fid,'%s\n','# Points Count Value');
-   fprintf(fid,'%i %f\n',[length(a(n).x) a(n).density]);
-   fprintf(fid,'%s\n','# X pos Y pos');
+        fprintf(fid,'%s\n','## Icon:0');
+        fprintf(fid,'%s\n','# Points Count Value');
+        fprintf(fid,'%i %f\n',[length(a(n).x) a(n).density]);
+        fprintf(fid,'%s\n','# X pos Y pos');
         fprintf(fid,'%10.10f %10.10f\n',[a(n).x a(n).y]');
-        fprintf(fid,'\n','');
-   
+        fprintf(fid,'\n');
+
 end
 fclose(fid);