Changeset 486 for inundation/ga/storm_surge

Timestamp:

Nov 5, 2004, 3:35:13 PM (20 years ago)

Author:

ole

Message:

Cleanup

Location:

inundation/ga/storm_surge/pyvolution

Files:

• mesh.py (modified) (1 diff)
• mesh_factory.py (modified) (1 diff)
• test_domain.py (modified) (3 diffs)
• test_mesh.py (modified) (6 diffs)

inundation/ga/storm_surge/pyvolution/mesh.py

@@ -432 +432 @@
         #    assert self.neighbours[id,edge] < 0
 
-#FIXME: May get rid of
-def rectangular_mesh(m, n, len1=1.0, len2=1.0, origin = (0.0, 0.0)):
-    from mesh_factory import rectangular
-    points, triangles, boundary = rectangular(m, n, len1, len2, origin)
-
-    return Mesh(points, triangles, boundary)
-
-
-#FIXME: Get oblique and contracting and circular meshes from Chris
-
+

inundation/ga/storm_surge/pyvolution/mesh_factory.py

@@ -62 +62 @@
     return points, elements, boundary       
 
+
+#FIXME: Get oblique and contracting and circular meshes from Chris
 
 

inundation/ga/storm_surge/pyvolution/test_domain.py

@@ -6 +6 @@
 from domain import *
 from config import epsilon
-from Numeric import allclose, array
+from Numeric import allclose, array, ones, Float
 
 
@@ -266 +266 @@
         domain.update_conserved_quantities()
 
-
-        #FIXME: Update this test once I understand the semi_implicit scheme    
-        #x = array([1, 2, 3, 4]) + array( [.4,.3,.2,.1] )
-        #x /= array( [.9,.9,.9,.9] )
-        #
-        #for name in domain.conserved_quantities:
-        #    assert allclose(domain.quantities[name].centroid_values, x)   
+        sem = array([1.,1.,1.,1.])/array([1, 2, 3, 4])
+        denom = ones(4, Float)-domain.timestep*sem
+
+        x = array([1, 2, 3, 4]) + array( [.4,.3,.2,.1] )
+        x /= denom
+
+        for name in domain.conserved_quantities:
+            assert allclose(domain.quantities[name].centroid_values, x)   
 
 
     def testz_set_region(self):
-        """Domain implements a default first order gradient limiter
+        """Set quantities for sub region
         """
         
@@ -326 +327 @@
         domain.set_region([add_to_verts])
         
-        self.failUnless( domain.test == "Mound",
+        self.failUnless(domain.test == "Mound",
                         'set region failed')
         
 #-------------------------------------------------------------
 if __name__ == "__main__":
-    suite = unittest.makeSuite(TestCase,'testz')
+    suite = unittest.makeSuite(TestCase,'test')
     runner = unittest.TextTestRunner()
     runner.run(suite)

inundation/ga/storm_surge/pyvolution/test_mesh.py

@@ -7 +7 @@
 
 from mesh import *
+from mesh_factory import rectangular
 from config import epsilon
 from Numeric import allclose, array
@@ -343 +344 @@
         M=1
         N=1
-        mesh = rectangular_mesh(M, N)
+
+        points, vertices, boundary = rectangular(M, N)
+        mesh = Mesh(points, vertices, boundary)
 
         #Test that points are arranged in a counter clock wise order        
@@ -350 +353 @@
         M=2
         N=2
-        mesh = rectangular_mesh(M, N)
-        
+        points, vertices, boundary = rectangular(M, N)
+        mesh = Mesh(points, vertices, boundary)
+        
         #Test that points are arranged in a counter clock wise order        
         mesh.check_integrity()
@@ -363 +367 @@
         
 
-        mesh = rectangular_mesh(4, 4)
+        points, vertices, boundary = rectangular(4, 4)
+        mesh = Mesh(points, vertices, boundary)
+        
 
         #Test that points are arranged in a counter clock wise order        
@@ -389 +395 @@
         len1 = 100.0
         len2 = 17.0
-        mesh = rectangular_mesh(M, N, len1, len2)
+        
+        points, vertices, boundary = rectangular(M, N, len1, len2)
+        mesh = Mesh(points, vertices, boundary)
 
         assert len(mesh) == 2*M*N        
@@ -408 +416 @@
         #Check that integers don't cause trouble
         N = 16
-        mesh = rectangular_mesh(2*N, N, len1=10, len2=10)
+        
+        points, vertices, boundary = rectangular(2*N, N, len1=10, len2=10)
+        mesh = Mesh(points, vertices, boundary)
+