Changeset 2601 for inundation/pyvolution/domain.py

Timestamp:

Mar 27, 2006, 1:54:32 PM (19 years ago)

Author:

duncan

Message:

Add mesh_file to Domain interface, ticket 56

File:

• inundation/pyvolution/domain.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
 
 import types
@@ -19 +20 @@
 class Domain(Mesh):
 
-    def __init__(self, coordinates, vertices, boundary = None,
-                 conserved_quantities = None, other_quantities = None,
-                 tagged_elements = None, geo_reference = None,
-                 use_inscribed_circle=False):
+    def __init__(self, coordinates=None, vertices=None,
+                 boundary=None,
+                 conserved_quantities=None, other_quantities=None,
+                 tagged_elements=None, geo_reference=None,
+                 use_inscribed_circle=False,
+                 mesh_file=None):
+
+        if mesh_file is not None:
+            coordinates, vertices, boundary, vertex_quantity_dict \
+                                ,tagged_elements, geo_reference = \
+                                _pmesh_to_domain(file_name=mesh_file)
+            # FIXME(DSG-DSG) have to do something with vertex_quantity_dict
 
         Mesh.__init__(self, coordinates, vertices, boundary,
@@ -100 +109 @@
         self.already_computed_flux = zeros((N, 3), Int)
 
+        if mesh_file is not None:
+            # If the mesh file passed any quantity values
+            # , initialise with these values. 
+            self.set_quantity_vertices_dict(vertex_quantity_dict)
+
+        
 
     def set_default_order(self, n):