Changeset 572

Timestamp:

Mar 7, 2012, 7:56:37 PM (13 years ago)

Author:

aslmd

Message:

UTIL PYTHON: solved problem in previous commit for windamplitude. tested sparse.py and fixed minor problems: use == instead of is and implemented the use of ftype.

Location:

trunk/UTIL/PYTHON

Files:

• myplot.py (modified) (3 diffs)
• sparse.py (modified) (1 diff)

trunk/UTIL/PYTHON/myplot.py

@@ -93 +93 @@
 
 ## Author: AC
-def windamplitude (nc)
+def windamplitude (nc):
     varinfile = nc.variables.keys()
     if "U" in varinfile: zu=getfield(nc,'U')
@@ -1041 +1041 @@
 ## Read sparse data
   from numpy import empty
-  if datatype is 'txt':
+  if datatype == 'txt':
      if len(data[coord1].shape) == 1:
          return data[coord1][:]
@@ -1048 +1048 @@
      else:
          errormess('error in readdata')
-  elif datatype is 'sav':
+  elif datatype == 'sav':
      return data[coord1][coord2]
   else:

trunk/UTIL/PYTHON/sparse.py

@@ -111 +111 @@
    
 ##### Find file type
-     if filename[k].find('.sav') is not -1:
-        all_type[k] ='sav'
-        print '.sav file detected for', filename[k],'!!'
-     elif filename[k].find('.txt') is not -1:
-        all_type[k] ='txt'
-        #print '.txt file detected for', filename[k],'!!'
+     if opt.ftype is None:
+      if filename[k].find('.sav') is not -1:
+         all_type[k] ='sav'
+         print '.sav file detected for', filename[k],'!!'
+      elif filename[k].find('.txt') is not -1:
+         all_type[k] ='txt'
+         #print '.txt file detected for', filename[k],'!!'
+      else:
+         all_type[k] ='txt'
+         print 'no file type detected for', filename[k],'!!, default type is', all_type[k]
+     
+      if all_type[k] != all_type[0]:
+         print 'Two different types were used: ', all_type[k], all_type[0]
+         errormess('Not suported')
      else:
-        all_type[k] ='txt'
-        print 'no file type detected for', filename[k],'!!, default type is', all_type[k]
-     
-     if all_type[k] != all_type[0]:
-        print 'Two different types were used: ', all_type[k], all_type[0]
-        errormess('Not suported')
-
+        all_type[k] = opt.ftype        
 
 ##### Read file       
-     if all_type[k] is 'sav':
+     if all_type[k] == 'sav':
        print 'reading .sav file', filename[k], '...'
        data = {}
        data = readsav(filename[k], idict=data, python_dict=False) #, verbose=True)
        all_data[k] = data
-     elif all_type[k] is 'txt':
+     elif all_type[k] == 'txt':
        print 'reading .text file', filename[k], '...'
        all_data[k] = np.loadtxt(filename[k])