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

Timestamp:

Oct 18, 2004, 1:53:59 PM (20 years ago)

Author:

duncan

Message:

added element tags to Domain

File:

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

inundation/ga/storm_surge/pyvolution/pmesh2domain.py

@@ -8 +8 @@
 
 
-def pmesh_to_domain_instance(fileName, DomainClass,tags = None, setting_function = None):
+def pmesh_to_domain_instance(fileName, DomainClass, setting_function = None):
     """
     """
-    #FIXME:  The current design doesn't seem to accomadate tags
-    #  being passed into the domain at this point.
-
     import sys
     from domain import Domain
 
-    vertex_coordinates, volumes, marker_dict, vertex_quantity_dict = \
+    vertex_coordinates, volumes, marker_dict, vertex_quantity_dict ,tagged_elements_dict = \
                         pmesh_to_domain(fileName,
                                                    setting_function=setting_function)
         
     assert issubclass(DomainClass, Domain), "DomainClass is not a subclass of Domain."
-    domain = DomainClass(vertex_coordinates, volumes, marker_dict)
+    domain = DomainClass(vertex_coordinates, volumes, marker_dict,
+                         tagged_elements = tagged_elements_dict )
 
     # set the water level to be the elevation
@@ -44 +42 @@
     triangle list:  [(point1,point2, point3),(p5,p4, p1),...] (Tuples of integers)
     triangle neighbor list: [(triangle1,triangle2, triangle3),(t5,t4, t1),...] (Tuples of integers) -1 means there's no triangle neighbor
-    triangle attribute list: [T1att, T2att, ...] (list of floats)
+    triangle attribute list: [T1att, T2att, ...] (list of strings)
     """
     
@@ -69 +67 @@
     for quantity, value_vector in map (None, point_titles, point_atts):
         vertex_quantity_dict[quantity] = value_vector
-    marker_dict = pmesh_dict_to_marker_dict(volumes, mesh_dict,
-                                            vertex_coordinates)
-    
-    return vertex_coordinates, volumes, marker_dict, vertex_quantity_dict
+    marker_dict = pmesh_dict_to_marker_dict(mesh_dict)
+    tagged_elements_dict = build_tagged_elements_dictionary(mesh_dict)
+    return vertex_coordinates, volumes, marker_dict, vertex_quantity_dict,tagged_elements_dict
 
 
 
+def build_tagged_elements_dictionary(mesh_dict):
+    """Build the dictionary of element tags.
+    tagged_elements is a dictionary of element arrays,
+    keyed by tag:
+    { (tag): [e1, e2, e3..] }
+    """
+    tri_atts = mesh_dict['generatedtriangleattributelist']
+    #print "tri_atts", tri_atts
+    tagged_elements = {}
+    for tri_att_index in range(len(tri_atts)):
+        tagged_elements.setdefault(tri_atts[tri_att_index][0],[]).append(tri_att_index)
+    #print "DSG pm2do tagged_elements", tagged_elements
+    return tagged_elements
 
 #FIXME: The issue is whether this format should be stored in the tsh file
@@ -85 +95 @@
 #using netCDF.
 
-   
-def pmesh_dict_to_marker_dict(triangles,mesh_dict,Vertices):
+def pmesh_dict_to_marker_dict(mesh_dict):
     """ Convert the pmesh dictionary (mesh_dict) description of boundary tags
     to a dictionary of markers, indexed with volume id and face number.
     """
+    triangles = mesh_dict['generatedtrianglelist']
     sides = calc_sides(triangles)
     marker_dict = {}