Changeset 6304 for branches/numpy/anuga/abstract_2d_finite_volumes/test_region.py

Timestamp:

Feb 10, 2009, 11:11:04 AM (16 years ago)

Author:

rwilson

Message:

Initial commit of numpy changes. Still a long way to go.

Location:

branches/numpy

Files:

• . (copied) (copied from anuga_core/source)
• anuga/abstract_2d_finite_volumes/test_region.py (modified) (7 diffs)

branches/numpy/anuga/abstract_2d_finite_volumes/test_region.py

@@ -8 +8 @@
 #from anuga.config import epsilon
 
-import Numeric as num
+import numpy as num
 
 
@@ -42 +42 @@
 
     def test_region_tags(self):
-        """
-        get values based on triangle lists.
-        """
-        from mesh_factory import rectangular
-        from shallow_water import Domain
-
-        #Create basic mesh
-        points, vertices, boundary = rectangular(1, 3)
-
-        #Create shallow water domain
-        domain = Domain(points, vertices, boundary)
-        domain.build_tagged_elements_dictionary({'bottom':[0,1],
-                                                 'top':[4,5],
-                                                 'all':[0,1,2,3,4,5]})
-
+        """get values based on triangle lists."""
+
+        from mesh_factory import rectangular
+        from shallow_water import Domain
+
+        #Create basic mesh
+        points, vertices, boundary = rectangular(1, 3)
+
+        #Create shallow water domain
+        domain = Domain(points, vertices, boundary)
+        domain.build_tagged_elements_dictionary({'bottom': [0,1],
+                                                 'top': [4,5],
+                                                 'all': [0,1,2,3,4,5]})
 
         #Set friction
@@ -65 +63 @@
         b = Set_region('top', 'friction', 1.0)
         domain.set_region([a, b])
-        #print domain.quantities['friction'].get_values()
-        assert num.allclose(domain.quantities['friction'].get_values(),\
-                            [[ 0.09,  0.09,  0.09],
-                             [ 0.09,  0.09,  0.09],
-                             [ 0.07,  0.07,  0.07],
-                             [ 0.07,  0.07,  0.07],
-                             [ 1.0,  1.0,  1.0],
-                             [ 1.0,  1.0,  1.0]])
+
+        expected = [[ 0.09,  0.09,  0.09],
+                    [ 0.09,  0.09,  0.09],
+                    [ 0.07,  0.07,  0.07],
+                    [ 0.07,  0.07,  0.07],
+                    [ 1.0,  1.0,  1.0],
+                    [ 1.0,  1.0,  1.0]]
+        msg = ("\ndomain.quantities['friction']=%s\nexpected value=%s"
+               % (str(domain.quantities['friction'].get_values()),
+                  str(expected)))
+        assert num.allclose(domain.quantities['friction'].get_values(),
+                            expected), msg
 
         #c = Add_Value_To_region('all', 'friction', 10.0)
@@ -126 +128 @@
         
     def test_unique_vertices(self):
-        """
-        get values based on triangle lists.
-        """
+        """get values based on triangle lists."""
+
         from mesh_factory import rectangular
         from shallow_water import Domain
@@ -147 +148 @@
         a = Set_region('bottom', 'friction', 0.09, location = 'unique vertices')
         domain.set_region(a)
-        #print domain.quantities['friction'].get_values()
-        assert num.allclose(domain.quantities['friction'].get_values(),\
+        assert num.allclose(domain.quantities['friction'].get_values(),
                             [[ 0.09,  0.09,  0.09],
                              [ 0.09,  0.09,  0.09],
@@ -217 +217 @@
         #print domain.quantities['friction'].get_values()
         frict_points = domain.quantities['friction'].get_values()
-        assert num.allclose(frict_points[0],\
-                            [ calc_frict, calc_frict, calc_frict])
-        assert num.allclose(frict_points[1],\
-                            [ calc_frict, calc_frict, calc_frict])
+        expected = [calc_frict, calc_frict, calc_frict]
+        msg = ('frict_points[0]=%s\nexpected=%s' % (str(frict_points[0]),
+                                                    str(expected)))
+        assert num.allclose(frict_points[0], expected), msg
+        msg = ('frict_points[1]=%s\nexpected=%s' % (str(frict_points[1]),
+                                                    str(expected)))
+        assert num.allclose(frict_points[1], expected), msg
   
     def test_unique_vertices_average_loc_unique_vert(self):
@@ -262 +265 @@
 #-------------------------------------------------------------
 if __name__ == "__main__":
-    suite = unittest.makeSuite(Test_Region,'test')
+    suite = unittest.makeSuite(Test_Region, 'test')    
     runner = unittest.TextTestRunner()
     runner.run(suite)