Changeset 1178 for inundation/ga/storm_surge/pyvolution/pmesh2domain.py

Timestamp:

Mar 31, 2005, 4:51:54 PM (20 years ago)

Author:

duncan

Message:

incorporating geo_ref object into domain class

File:

• inundation/ga/storm_surge/pyvolution/pmesh2domain.py (modified) (3 diffs)

inundation/ga/storm_surge/pyvolution/pmesh2domain.py

@@ -14 +14 @@
     from domain import Domain
 
-    vertex_coordinates, volumes, tag_dict, vertex_quantity_dict ,tagged_elements_dict = \
-                        pmesh_to_domain(fileName,
-                                                   setting_function=setting_function)
+    vertex_coordinates, volumes, tag_dict, vertex_quantity_dict \
+                        ,tagged_elements_dict, geo_reference = \
+           pmesh_to_domain(fileName,
+                           setting_function=setting_function)
         
-    assert issubclass(DomainClass, Domain), "DomainClass is not a subclass of Domain."
+    assert issubclass(DomainClass, Domain),"DomainClass is not a subclass of Domain."
 
 
     
     domain = DomainClass(vertex_coordinates, volumes, tag_dict,
-                         tagged_elements = tagged_elements_dict )
+                         tagged_elements = tagged_elements_dict,
+                         geo_reference = geo_reference )
 
 
@@ -35 +37 @@
     # This doesn't work on the domain instance.
     # This is still needed so -ve elevations don't cuase 'lakes'
-    # The fixme we discussed was to only create a quantity when its values are set.
+    # The fixme we discussed was to only create a quantity when its values
+    #are set.
     # I think that's the way to go still
     
@@ -70 +73 @@
     volumes = mesh_dict['triangles']
 
-    #if setting_function:
-    #    if not type(setting_function) is ListType:
-    #        setting_function = [setting_function]
-    #    for funct in setting_function:
-    #        mesh_dict = funct(mesh_dict, vertices = mesh_vertices,
-    #                        volumes = volumes)
-
-
     vertex_quantity_dict = {}
     point_atts = transpose(mesh_dict['vertex_attributes'])
     point_titles  = mesh_dict['vertex_attribute_titles']
+    geo_reference  = mesh_dict['geo_reference']
     for quantity, value_vector in map (None, point_titles, point_atts):
         vertex_quantity_dict[quantity] = value_vector
     tag_dict = pmesh_dict_to_tag_dict(mesh_dict)
     tagged_elements_dict = build_tagged_elements_dictionary(mesh_dict)
-    return vertex_coordinates, volumes, tag_dict, vertex_quantity_dict,tagged_elements_dict
+    return vertex_coordinates, volumes, tag_dict, vertex_quantity_dict,tagged_elements_dict, geo_reference