Changeset 2607

Timestamp:

Mar 27, 2006, 2:23:37 PM (18 years ago)

Author:

duncan

Message:

method name fix

Location:

inundation/pyvolution

Files:

• domain.py (modified) (2 diffs)
• pmesh2domain.py (modified) (3 diffs)

inundation/pyvolution/domain.py

@@ -14 +14 @@
 from generic_boundary_conditions import Time_boundary
 from generic_boundary_conditions import Transmissive_boundary
-from pmesh2domain import _pmesh_to_domain
+from pmesh2domain import pmesh_to_domain
 
 import types
@@ -30 +30 @@
             coordinates, vertices, boundary, vertex_quantity_dict \
                                 ,tagged_elements, geo_reference = \
-                                _pmesh_to_domain(file_name=mesh_file)
+                                pmesh_to_domain(file_name=mesh_file)
             # FIXME(DSG-DSG) have to do something with vertex_quantity_dict
 

inundation/pyvolution/pmesh2domain.py

@@ -19 +19 @@
     vertex_coordinates, vertices, tag_dict, vertex_quantity_dict \
                         ,tagged_elements_dict, geo_reference = \
-                        _pmesh_to_domain(mesh_instance=mesh)
+                        pmesh_to_domain(mesh_instance=mesh)
 
 
@@ -79 +79 @@
     vertex_coordinates, vertices, tag_dict, vertex_quantity_dict \
                         ,tagged_elements_dict, geo_reference = \
-                        _pmesh_to_domain(file_name=file_name)
+                        pmesh_to_domain(file_name=file_name)
 
 
@@ -115 +115 @@
 
 
-def _pmesh_to_domain(file_name=None,
+def pmesh_to_domain(file_name=None,
                     mesh_instance=None):
     """
-    convert a pmesh dictionary to a list of Volumes.
-    Also, return a list of triangles which have boundary tags
-    mesh_dict structure;
-    generated point list: [(x1,y1),(x2,y2),...] (Tuples of doubles)
-    generated point attribute list:[(P1att1,P1attt2, ...),(P2att1,P2attt2,...),...]
-    generated segment list: [(point1,point2),(p3,p4),...] (Tuples of integers)
-    generated segment tag list: [S1Tag, S2Tag, ...] (list of ints)
-    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 strings)
+    Convert a pmesh file or a pmesh mesh instance to a bunch of lists
+    that can be used to instanciate a domain object.
     """