Changeset 1073

Timestamp:

Mar 14, 2005, 11:14:25 AM (20 years ago)

Author:

duncan

Message:

change how geo-ref stuff is handled in .tsh files

Location:

inundation/ga/storm_surge/pmesh

Files:

• load_mesh/loadASCII.py (modified) (7 diffs)
• meshHarness.py (modified) (1 diff)

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

@@ -199 +199 @@
         segmenttags.append(stringtag)
 
-    try:
-        geo_reference = Geo_reference(ASCIIFile=fd)
-    except:
-        #geo_ref not compulsory 
-        geo_reference = None
             
     meshDict = {}
@@ -214 +209 @@
     meshDict['segment_tags'] = segmenttags
     meshDict['vertex_attribute_titles'] = vertTitle
-    meshDict['geo_reference'] = geo_reference
+    
     return meshDict
     
@@ -241 +236 @@
     ######### loading the point info
     line = fd.readline()
-    #print line
+    #print 'read_outline - line',line
     fragments = line.split()
     #for fragment in fragments:
@@ -357 +352 @@
         except IndexError, e:
             regionmaxareas.append(None)
+
+    try:
+        geo_reference = Geo_reference(ASCIIFile=fd)
+    except:
+        #geo_ref not compulsory 
+        geo_reference = None
         
     meshDict = {}
@@ -367 +368 @@
     meshDict['region_tags'] = regionattributes
     meshDict['region_max_areas'] = regionmaxareas
+    meshDict['geo_reference'] = geo_reference
+    
     #print "meshDict",meshDict 
     return meshDict
@@ -485 +488 @@
                  + 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):
@@ -611 +611 @@
         fd.write(str(i) + " " + area + "\n")
 
+    # geo_reference info
+    if dict.has_key('geo_reference') and not dict['geo_reference'] is None:
+        dict['geo_reference'].write_ASCII(fd)
 
 def write_msh_file(filename, mesh):

inundation/ga/storm_surge/pmesh/meshHarness.py

@@ -720 +720 @@
      
         r1 = Region(0.3, 0.3,tag = "1.3")
-        geo = Geo_reference(8.9,8.9,65)
+        geo = Geo_reference(65,8.9,8.9)
         m = Mesh(userVertices=[a,d,f,e],
                  userSegments=[s1,s2,s3,s4],