Changeset 1010

Timestamp:

Mar 4, 2005, 6:06:38 PM (20 years ago)

Author:

duncan

Message:

adding geo_ref to pts and msh file readers and writers

Location:

inundation/ga/storm_surge/pmesh/load_mesh

Files:

• . (modified) (1 prop)
• loadASCII.py (modified) (9 diffs)
• test_loadASCII.py (modified) (8 diffs)

inundation/ga/storm_surge/pmesh/load_mesh/loadASCII.py

@@ -51 +51 @@
 
 from string import  find, rfind
-
 from Numeric import array, Float, Int16, Character,reshape, concatenate
-
 from os.path import splitext
 
+from coordinate_transforms.geo_reference import Geo_reference
 
 import exceptions
@@ -488 +487 @@
     Following lines:  <segment #> <vertex #>  <vertex #> [boundary tag]
     """
+    #FIXME (DSG-DSG) Do this to the triangulation keys as well 
     if not mesh_dict.has_key('points'):
         mesh_dict['points'] = []
@@ -774 +774 @@
                                     'num_of_region_tag_chars'))
             outfile.variables['region_tags'][:] = mesh['region_tags']
-        
+
+    # geo_reference info
+    if mesh.has_key('geo_reference') and not mesh['geo_reference'] == None:
+        mesh['geo_reference'].write_NetCDF(outfile)
+                                                 
     outfile.close()
 
@@ -882 +886 @@
         mesh['region_max_areas'] = array([])
     #mesh[''] = fid.variables[''][:]
-       
+      
+    try:
+        geo_reference = Geo_reference(NetCDFObject=fid)
+        mesh['geo_reference'] = geo_reference
+    except AttributeError, e:
+        #geo_ref not compulsory 
+        mesh['geo_reference'] = None
+    
     fid.close()
       
@@ -1000 +1011 @@
     dic['attributelist']['elevation'] = [[7.0,5.0]
     """
-    #FIXME: This format has issues.  There can't be an attribute called points 
-    
+    #FIXME: (DSG)This format has issues.
+    # There can't be an attribute called points 
+    # consider format change
 
     from Scientific.IO.NetCDF import NetCDFFile
@@ -1028 +1040 @@
         attributes[key] = array(fid.variables[key])
         
-    point_atts['attributelist'] = attributes 
+    point_atts['attributelist'] = attributes
+    
+    try:
+        geo_reference = Geo_reference(NetCDFObject=fid)
+        point_atts['geo_reference'] = geo_reference
+    except AttributeError, e:
+        #geo_ref not compulsory 
+        point_atts['geo_reference'] = None
+    
+    
     fid.close()
     
@@ -1039 +1060 @@
     WARNING: This function mangles the point_atts data structure
     """
-    #FIXME: This format has issues.  There can't be an attribute called points 
+    #FIXME: (DSG)This format has issues.
+    # There can't be an attribute called points 
+    # consider format change
     
     from Scientific.IO.NetCDF import NetCDFFile
@@ -1066 +1089 @@
         outfile.createVariable(key, Float, ('number_of_points',))
         outfile.variables[key][:] = point_atts['attributelist'][key] #.astype(Float32)
+
+    if point_atts.has_key('geo_reference') and not point_atts['geo_reference'] == None:
+        point_atts['geo_reference'].write_NetCDF(outfile)
+        
     outfile.close() 
                   
@@ -1175 +1202 @@
      
 if __name__ == "__main__":
-    m = import_mesh("tee.txt")
-    print m
+    pass

inundation/ga/storm_surge/pmesh/load_mesh/test_loadASCII.py

@@ -7 +7 @@
 # when the title attribute information is not consistent with the data in the
 # file - DSG
-
-import sys
-sys.path.append('..')
+# also test_export_mesh_file tests write_ASCII_triangulation  - DSG
 
 import tempfile
@@ -19 +17 @@
 from os.path import splitext
 
-from Numeric import array #Float, arrayrange, concatenate
+from Numeric import array, allclose 
     
 from loadASCII import *
-from Numeric import array, allclose
+from coordinate_transforms.geo_reference import Geo_reference
 
 class loadASCIITestCase(unittest.TestCase):
@@ -49 +47 @@
         self.dict['segment_tags'] = ['50', '40', '30', '20', '40']
         self.dict['vertex_attribute_titles'] = ['bed elevation', 'height']
+        self.dict['geo_reference'] = Geo_reference(1.9,1.9,'zone65')
         
         self.sparse_dict ={}
@@ -153 +152 @@
         write_ASCII_outline(fd,dict)
         fd.close()
-        loaded_dict = import_mesh(fileName)
+        loaded_dict = import_mesh(fileName) #FIXME function names are wacky
         os.remove(fileName)
         
@@ -189 +188 @@
                         array(dict['holes']),
                          'test_import_mesh failed. Test 6')
+        
     def test_export_mesh_file(self):
         import os
@@ -359 +359 @@
                         array(dict['vertex_attribute_titles']),
                         fail_string + ' failed!! Test 8')
- 
-    def baaaad(self):
-        
-        assert allclose(array(loaded_dict['point_attributes']),
-                        array(dict['point_attributes']))
-        self.failUnless(array(loaded_dict['outline_segments'])  ==
-                        array(dict['outline_segments']),
-                          fail_string + ' failed. Test 3')
-        self.failUnless(array(loaded_dict['outline_segment_tags'])  ==
-                        array(dict['outline_segment_tags']),
-                          fail_string + ' failed! Test 4')
-        self.failUnless(array(loaded_dict['regions'])  ==
-                        array(dict['regions']),
-                          fail_string + ' failed. Test 5')
-        self.failUnless(array(loaded_dict['region_tags'])  ==
-                        array(dict['region_tags']),
-                          fail_string + ' failed. Test 5')
-        self.failUnless(array(loaded_dict['region_max_areas'])  ==
-                        array(dict['region_max_areas']),
-                          fail_string + ' failed. Test 5')
-        self.failUnless(array(loaded_dict['holes'])  ==
-                        array(dict['holes']),
-                          fail_string + ' failed. Test 6')
-        self.failUnless(array(dict['vertices'])  ==
-                        array(loaded_dict['vertices']),
-                          fail_string + ' failed. Test 7')
-        self.failUnless(array(dict['triangles'])  ==
-                        array(loaded_dict['triangles']),
-                          fail_string + ' failed. Test 8')
-        self.failUnless(array(dict['segments'])  ==
-                        array(loaded_dict['segments']),
-                          fail_string + ' failed. Test 9')
-        self.failUnless(array(dict['triangle_tags'])  ==
-                        array(loaded_dict['triangle_tags']),
-                          fail_string + ' failed. Test 10')
-        self.failUnless(dict['vertex_attributes']  ==
-                        loaded_dict['vertex_attributes'],
-                          fail_string + ' failed. Test 11')
-        self.failUnless(array(dict['triangle_neighbors'])  ==
-                        array(loaded_dict['triangle_neighbors']),
-                          fail_string + ' failed. Test 12')
-        self.failUnless(array(dict['segment_tags'])  ==
-                        array(loaded_dict['segment_tags']),
-                          fail_string + ' failed. Test 13')
-        self.failUnless(array(dict['vertex_attribute_titles'])  ==
-                        array(loaded_dict['vertex_attribute_titles']),
-                          fail_string + ' failed. Test 14')
-        
+        try:    
+            self.failUnless(loaded_dict['geo_reference']  ==
+                        dict['geo_reference'] ,
+                        fail_string + ' failed!! Test geo_reference')
+        except KeyError:          
+            self.failUnless(not dict.has_key('geo_reference' and
+                         loaded_dict['geo_reference'] == None)   ,
+                        fail_string + ' failed!! Test geo_reference')
+            
     def test_loadpts(self):
         
@@ -468 +429 @@
         att_dict['brightness'] = array([10.0, 0.0, 10.4])
         dict['attributelist'] = att_dict
+        dict['geo_reference'] = Geo_reference(1.9,1.9,'zone65')
         
         fileName = tempfile.mktemp(".pts")
@@ -477 +439 @@
         assert allclose(dict2['pointlist'],[[1.0, 0.0],[0.0, 1.0],[1.0, 0.0]])
         assert allclose(dict2['attributelist']['elevation'], [10.0, 0.0, 10.4])
-        assert allclose(dict2['attributelist']['brightness'], [10.0, 0.0, 10.4])
+        answer = [10.0, 0.0, 10.4]
+        assert allclose(dict2['attributelist']['brightness'], answer)
+
+        #print "dict['geo_reference'] ",dict['geo_reference'] 
+        #print "dict2['geo_reference']",dict2['geo_reference']
+        
+        self.failUnless(dict['geo_reference'] == dict2['geo_reference'],
+                         'test_writepts failed. Test geo_reference')