Changeset 1047

Timestamp:

Mar 9, 2005, 4:37:29 PM (20 years ago)

Author:

duncan

Message:

added reading and writing of geo_ref info to ASCII files

Location:

inundation/ga/storm_surge/pmesh/load_mesh

Files:

• loadASCII.py (modified) (6 diffs)
• test_loadASCII.py (modified) (1 diff)

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 Numeric import array, Float, Int16, Int32, Character,reshape, concatenate
 from os.path import splitext
 
@@ -197 +197 @@
         stringtag = line.strip()
         segmenttags.append(stringtag)
+
+    try:
+        geo_reference = Geo_reference(ASCIIFile=fd)
+    except AttributeError, e:
+        #geo_ref not compulsory 
+        geo_reference = None
+            
     meshDict = {}
     meshDict['vertices'] = points
@@ -206 +213 @@
     meshDict['segment_tags'] = segmenttags
     meshDict['vertex_attribute_titles'] = vertTitle
+    meshDict['geo_reference'] = geo_reference
     return meshDict
     
@@ -385 +393 @@
     return numbers
 
+#FIXME change this name
 def write_ASCII_triangulation(fd,
                                gen_dict):
@@ -475 +484 @@
                  + str(segment_tags[i]) + "\n")
 
+    # geo_reference info
+    if gen_dict.has_key('geo_reference') and not gen_dict['geo_reference'] is None:
+        gen_dict['geo_reference'].write_ASCII(fd)
 
 def export_mesh_file(ofile,mesh_dict):
@@ -607 +619 @@
     from Scientific.IO.NetCDF import NetCDFFile
 
-    IntType = Int16
+    IntType = Int32
     
     # 

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

@@ -229 +229 @@
                         array(loadedDict['vertex_attribute_titles']),
                          'test_export_mesh_file failed. Test 8')
+        self.failUnless(array(meshDict['geo_reference'])  ==
+                        array(loadedDict['geo_reference']),
+                         'test_export_mesh_file failed. Test 9')
             
         os.remove(fileName)