Changeset 6428 for branches/numpy/anuga/abstract_2d_finite_volumes/test_general_mesh.py

Timestamp:

Feb 27, 2009, 11:54:09 AM (14 years ago)

Author:

rwilson

Message:

numpy changes

File:

• branches/numpy/anuga/abstract_2d_finite_volumes/test_general_mesh.py (modified) (4 diffs)

branches/numpy/anuga/abstract_2d_finite_volumes/test_general_mesh.py

@@ -53 +53 @@
         e = [2.0, 2.0]
         f = [4.0, 0.0]
-
         nodes = num.array([a, b, c, d, e, f])
 
         nodes_absolute = geo.get_absolute(nodes)
         
-        #bac, bce, ecf, dbe, daf, dae
+        #                        bac,     bce,     ecf,     dbe
         triangles = num.array([[1,0,2], [1,2,4], [4,2,5], [3,1,4]], num.int)
 
-        domain = General_mesh(nodes, triangles,
-                       geo_reference = geo)
-
-        verts = domain.get_vertex_coordinates(triangle_id=0)        
-        msg = ("num.array([b,a,c])=\n%s\nshould be the same as 'verts'=\n%s"
+        domain = General_mesh(nodes, triangles, geo_reference=geo)
+
+        verts = domain.get_vertex_coordinates(triangle_id=0)    # bac
+        msg = ("num.array([b,a,c])=\n%s\nshould be close to 'verts'=\n%s"
                % (str(num.array([b,a,c])), str(verts)))
-        #self.assert_(num.allclose(num.array([b,a,c]), verts))
-        assert num.allclose(num.array([b,a,c]), verts), msg
+        self.failUnless(num.allclose(num.array([b,a,c]), verts), msg)
 
         verts = domain.get_vertex_coordinates(triangle_id=0)       
-        self.assert_(num.allclose(num.array([b,a,c]), verts))
+        msg = ("num.array([b,a,c])=\n%s\nshould be close to 'verts'=\n%s"
+               % (str(num.array([b,a,c])), str(verts)))
+        self.assert_(num.allclose(num.array([b,a,c]), verts), msg)
+
+        verts = domain.get_vertex_coordinates(triangle_id=0, absolute=True)
+        msg = ("num.array([...])=\n%s\nshould be close to 'verts'=\n%s"
+               % (str(num.array([nodes_absolute[1],
+                                 nodes_absolute[0],
+                                 nodes_absolute[2]])),
+                  str(verts)))
+        self.assert_(num.allclose(num.array([nodes_absolute[1],
+                                             nodes_absolute[0],
+                                             nodes_absolute[2]]),
+                                  verts), msg)
+
         verts = domain.get_vertex_coordinates(triangle_id=0,
                                               absolute=True)       
+        msg = ("num.array([...])=\n%s\nshould be close to 'verts'=\n%s"
+               % (str(num.array([nodes_absolute[1],
+                                 nodes_absolute[0],
+                                 nodes_absolute[2]])),
+                  str(verts)))
         self.assert_(num.allclose(num.array([nodes_absolute[1],
-                                     nodes_absolute[0],
-                                     nodes_absolute[2]]), verts))
-        verts = domain.get_vertex_coordinates(triangle_id=0,
-                                              absolute=True)       
-        self.assert_(num.allclose(num.array([nodes_absolute[1],
-                                     nodes_absolute[0],
-                                     nodes_absolute[2]]), verts))
-        
-        
+                                             nodes_absolute[0],
+                                             nodes_absolute[2]]),
+                                  verts), msg)
 
     def test_get_vertex_coordinates_triangle_id(self):
@@ -283 +293 @@
         nodes_absolute = geo.get_absolute(nodes)
         
-        #bac, bce, ecf, dbe, daf, dae
+        #                        bac,     bce,     ecf,     dbe
         triangles = num.array([[1,0,2], [1,2,4], [4,2,5], [3,1,4]])
 
-        domain = General_mesh(nodes, triangles,
-                       geo_reference = geo)
+        domain = General_mesh(nodes, triangles, geo_reference = geo)
         node = domain.get_node(2)        
-        #self.assertEqual(c, node)
-        msg = ('\nc=%s\nmode=%s' % (str(c), str(node)))
+        msg = ('\nc=%s\nnode=%s' % (str(c), str(node)))
         self.failUnless(num.alltrue(c == node), msg)
+
+        # repeat get_node(), see if result same
+        node = domain.get_node(2)        
+        msg = ('\nc=%s\nnode=%s' % (str(c), str(node)))
+        self.failUnless(num.alltrue(c == node), msg)
         
         node = domain.get_node(2, absolute=True)     
-        #self.assertEqual(nodes_absolute[2], node)
-        self.failUnless(num.alltrue(nodes_absolute[2] == node))
-        
+        msg = ('\nnodes_absolute[2]=%s\nnode=%s'
+               % (str(nodes_absolute[2]), str(node)))
+        self.failUnless(num.alltrue(nodes_absolute[2] == node), msg)
+       
+        # repeat get_node(absolute=True), see if result same
         node = domain.get_node(2, absolute=True)     
-        #self.assertEqual(nodes_absolute[2], node)
-        self.failUnless(num.alltrue(nodes_absolute[2] == node))
+        msg = ('\nnodes_absolute[2]=%s\nnode=%s'
+               % (str(nodes_absolute[2]), str(node)))
+        self.failUnless(num.alltrue(nodes_absolute[2] == node), msg)
         
 
@@ -337 +353 @@
         self.failUnlessRaises(AssertionError, General_mesh,
                               nodes, triangles, geo_reference=geo)
+
+    def test_raw_change_points_geo_ref(self):
+        x0 = 1000.0
+        y0 = 2000.0
+        geo = Geo_reference(56, x0, y0)
+        
         
 
@@ -343 +365 @@
 
 if __name__ == "__main__":
-    suite = unittest.makeSuite(Test_General_Mesh,'test') 
+    suite = unittest.makeSuite(Test_General_Mesh, 'test') 
+    #suite = unittest.makeSuite(Test_General_Mesh, 'test_get_vertex_coordinates_with_geo_ref') 
     runner = unittest.TextTestRunner()
     runner.run(suite)