Changeset 2053

Timestamp:

Nov 24, 2005, 9:36:57 AM (19 years ago)

Author:

ole

Message:

Work on ermapper formats (4 or 8 bytes).

Files:

• inundation/pyvolution/data_manager.py (modified) (2 diffs)
• inundation/pyvolution/ermapper_grids.py (modified) (4 diffs)
• production/karratha_2005/export_results.py (modified) (3 diffs)

inundation/pyvolution/data_manager.py

@@ -1694 +1694 @@
         header['ydimension'] = str(cellsize)
         header['value'] = '"' + quantity + '"'
+        header['celltype'] = 'IEEE8ByteReal'
 
 
@@ -1723 +1724 @@
 
     
-        if verbose: print 'Writing %s' %ascfile
+        if verbose: print 'Writing %s' %demfile
         NODATA_value = -9999
  

inundation/pyvolution/ermapper_grids.py

@@ -3 +3 @@
 # from os import open, write, read
 import Numeric
+
+celltype_map = {'IEEE4ByteReal': Numeric.Float32, 'IEEE8ByteReal': Numeric.Float64}
+
 
 def write_ermapper_grid(ofile, data, header = {}):
@@ -60 +63 @@
     header['nrofcellsperline'] = str(data_size[1])
 
-    write_ermapper_data(data,data_file)
-    write_ermapper_header(header_file,header)
+
+    header = create_default_header(header)
+    write_ermapper_header(header_file, header)
+    write_ermapper_data(data, data_file, data_format = header['celltype'])
+
     
 def read_ermapper_grid(ifile):
-
     ers_index = ifile.find('.ers')
     if ers_index > 0:
@@ -84 +89 @@
 def write_ermapper_header(ofile, header = {}):
     
-    header = create_default_header(header)
+    #header = create_default_header(header)
     # Determine if the dataset is in lats/longs or eastings/northings and set header parameters
     # accordingly
@@ -159 +164 @@
 
 def write_ermapper_data(grid, ofile, data_format = Numeric.Float32):
+
+
+    if isinstance(data_format, basestring):
+        #celltype_map is defined at top of code
+        if celltype_map.has_key(data_format):
+            data_format = celltype_map[data_format]
+        else:
+            msg = 'Format %s is not yet defined by celltype_map' %data_format
+            raise msg
+        
+    
     # Convert the array to data_format (default format is Float32)
     grid_as_float = grid.astype(data_format)

production/karratha_2005/export_results.py

@@ -2 +2 @@
 
 from pyvolution.data_manager import sww2dem
+from pyvolution.ermapper_grids import read_ermapper_grid
 
 
@@ -9 +10 @@
 name = project.outputname
 
-sww2dem(name, basename_out = name + '_momentum',
-        #quantity = 'stage-elevation',  #Depth
-        quantity = '(xmomentum**2 + ymomentum**2)**0.5',  #Absolute momentum
+sww2dem(name, basename_out = name,
+        quantity = 'stage-elevation',  #Depth
+        #quantity = '(xmomentum**2 + ymomentum**2)**0.5',  #Absolute momentum
         cellsize = 50,
+        #cellsize = 500,
         #cellsize = 10,        
         #easting_min = 465646,
@@ -22 +24 @@
         format = 'ers')
 
+
+#Check
+
+#data = read_ermapper_grid(name)
+#print 'Values from %s are in [%f, %f]' %(name, min(data.flat), max(data.flat))