Changeset 2601

Timestamp:

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

Author:

duncan

Message:

Add mesh_file to Domain interface, ticket 56

Location:

inundation

Files:

• examples/beach.py (modified) (1 diff)
• pyvolution/domain.py (modified) (3 diffs)
• pyvolution/shallow_water.py (modified) (3 diffs)
• pyvolution/test_shallow_water.py (modified) (1 diff)

inundation/examples/beach.py

@@ -28 +28 @@
 name = 'beach'
 print 'Creating domain from %s.tsh' %name
-domain = pmesh_to_domain_instance(name + '.tsh', Domain)
+#domain = pmesh_to_domain_instance(name + '.tsh', Domain)
+domain = Domain(mesh_file= name + '.tsh')
 
 domain.store = True

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):

inundation/pyvolution/shallow_water.py

@@ -69 +69 @@
 class Domain(Generic_Domain):
 
-    def __init__(self, coordinates, vertices, boundary = None,
+    def __init__(self, coordinates=None, vertices=None, boundary = None,
                  tagged_elements = None, geo_reference = None,
-                 use_inscribed_circle=False):
+                 use_inscribed_circle=False,
+                 mesh_file=None):
 
         conserved_quantities = ['stage', 'xmomentum', 'ymomentum']
@@ -77 +78 @@
         Generic_Domain.__init__(self, coordinates, vertices, boundary,
                                 conserved_quantities, other_quantities,
-                                tagged_elements, geo_reference, use_inscribed_circle)
+                                tagged_elements, geo_reference, use_inscribed_circle, mesh_file)
 
         from config import minimum_allowed_height, maximum_allowed_speed, g
@@ -106 +107 @@
         self.quantities_to_be_stored = ['stage','xmomentum','ymomentum']
 
-
+        
     def set_quantities_to_be_stored(self, q):
         """Specify which quantities will be stored in the sww file.

inundation/pyvolution/test_shallow_water.py

@@ -3278 +3278 @@
 
 
+    def test_pmesh2Domain(self):
+         import os
+         import tempfile
+
+         fileName = tempfile.mktemp(".tsh")
+         file = open(fileName,"w")
+         file.write("4 3 # <vertex #> <x> <y> [attributes]\n \
+0 0.0 0.0 0.0 0.0 0.01 \n \
+1 1.0 0.0 10.0 10.0 0.02  \n \
+2 0.0 1.0 0.0 10.0 0.03  \n \
+3 0.5 0.25 8.0 12.0 0.04  \n \
+# Vert att title  \n \
+elevation  \n \
+stage  \n \
+friction  \n \
+2 # <triangle #> [<vertex #>] [<neigbouring triangle #>]  \n\
+0 0 3 2 -1  -1  1 dsg\n\
+1 0 1 3 -1  0 -1   ole nielsen\n\
+4 # <segment #> <vertex #>  <vertex #> [boundary tag] \n\
+0 1 0 2 \n\
+1 0 2 3 \n\
+2 2 3 \n\
+3 3 1 1 \n\
+3 0 # <x> <y> [attributes] ...Mesh Vertices... \n \
+0 216.0 -86.0 \n \
+1 160.0 -167.0 \n \
+2 114.0 -91.0 \n \
+3 # <vertex #>  <vertex #> [boundary tag] ...Mesh Segments... \n \
+0 0 1 0 \n \
+1 1 2 0 \n \
+2 2 0 0 \n \
+0 # <x> <y> ...Mesh Holes... \n \
+0 # <x> <y> <attribute>...Mesh Regions... \n \
+0 # <x> <y> <attribute>...Mesh Regions, area... \n\
+#Geo reference \n \
+56 \n \
+140 \n \
+120 \n")
+         file.close()
+
+         tags = {}
+         b1 =  Dirichlet_boundary(conserved_quantities = array([0.0]))
+         b2 =  Dirichlet_boundary(conserved_quantities = array([1.0]))
+         b3 =  Dirichlet_boundary(conserved_quantities = array([2.0]))
+         tags["1"] = b1
+         tags["2"] = b2
+         tags["3"] = b3
+
+         #from pmesh2domain import pmesh_to_domain_instance
+         #domain = pmesh_to_domain_instance(fileName, Domain)
+         
+         domain = Domain(mesh_file=fileName)
+         
+         os.remove(fileName)
+         #print "domain.tagged_elements", domain.tagged_elements
+         ## check the quantities
+         #print domain.quantities['elevation'].vertex_values
+         answer = [[0., 8., 0.],
+                   [0., 10., 8.]]
+         assert allclose(domain.quantities['elevation'].vertex_values,
+                        answer)
+
+         #print domain.quantities['stage'].vertex_values
+         answer = [[0., 12., 10.],
+                   [0., 10., 12.]]
+         assert allclose(domain.quantities['stage'].vertex_values,
+                        answer)
+
+         #print domain.quantities['friction'].vertex_values
+         answer = [[0.01, 0.04, 0.03],
+                   [0.01, 0.02, 0.04]]
+         assert allclose(domain.quantities['friction'].vertex_values,
+                        answer)
+
+         #print domain.quantities['friction'].vertex_values
+         assert allclose(domain.tagged_elements['dsg'][0],0)
+         assert allclose(domain.tagged_elements['ole nielsen'][0],1)
+
+         self.failUnless( domain.boundary[(1, 0)]  == '1',
+                          "test_tags_to_boundaries  failed. Single boundary wasn't added.")
+         self.failUnless( domain.boundary[(1, 2)]  == '2',
+                          "test_tags_to_boundaries  failed. Single boundary wasn't added.")
+         self.failUnless( domain.boundary[(0, 1)]  == '3',
+                          "test_tags_to_boundaries  failed. Single boundary wasn't added.")
+         self.failUnless( domain.boundary[(0, 0)]  == 'exterior',
+                          "test_tags_to_boundaries  failed. Single boundary wasn't added.")
+         #print "domain.boundary",domain.boundary
+         self.failUnless( len(domain.boundary)  == 4,
+                          "test_pmesh2Domain Too many boundaries")
+         #FIXME change to use get_xllcorner
+         #print "d.geo_reference.xllcorner",domain.geo_reference.xllcorner 
+         self.failUnless(domain.geo_reference.xllcorner  == 140.0,
+                          "bad geo_referece")
+    #************
+
         #-------------------------------------------------------------
 if __name__ == "__main__":