Changeset 8708

Timestamp:

Feb 19, 2013, 5:37:23 PM (12 years ago)

Author:

steve

Message:

Working on test_neighbour_mesh

Location:

trunk/anuga_core/source/anuga

Files:

• abstract_2d_finite_volumes/neighbour_mesh.py (modified) (4 diffs)
• abstract_2d_finite_volumes/test_neighbour_mesh.py (modified) (2 diffs)
• utilities/compile.py (modified) (1 diff)

trunk/anuga_core/source/anuga/abstract_2d_finite_volumes/neighbour_mesh.py

@@ -804 +804 @@
         y2 = V[2::3, 1]
 
+
         #print 'check areas'
         area = self.areas
@@ -810 +811 @@
 
 
-
         assert num.sum(num.abs((area - ref)/area)) < epsilon, 'Error in areas'
 
@@ -818 +818 @@
         tx0 = x2 - x1
         ty0 = y2 - y1
+        a0  = num.sqrt(tx0**2 + ty0**2)
+
+
+        tx0 = tx0/a0
+        ty0 = ty0/a0
+
+
         tx1 = x0 - x2
         ty1 = y0 - y2
+        a1  = num.sqrt(tx1**2 + ty1**2)
+        tx1 = tx1/a1
+        ty1 = ty1/a1
+
         tx2 = x1 - x0
         ty2 = y1 - y0
+        a2  = num.sqrt(tx2**2 + ty2**2)
+        tx2 = tx2/a2
+        ty2 = ty2/a2
 
         nx0 = self.normals[:,0]
@@ -830 +844 @@
         ny2 = self.normals[:,5]
 
-        #print nx0.shape
-        #print tx0.shape
-        #print ny0.shape
-        #print ty0.shape
-
-
-        #print 'check edge |_ to normals'
+
         assert num.all(tx0*nx0 + ty0*ny0 < epsilon), 'Normal not perpendicular to edge'
         assert num.all(tx1*nx1 + ty1*ny1 < epsilon), 'Normal not perpendicular to edge'

trunk/anuga_core/source/anuga/abstract_2d_finite_volumes/test_neighbour_mesh.py

@@ -1014 +1014 @@
                      [19,17, 4],
                      [16, 6, 5]]
+
+
+        triangles = num.array(triangles,num.int)
+        points = num.array(points,num.float)
 
         mesh = Mesh(points, triangles)
@@ -1846 +1850 @@
 if __name__ == "__main__":
     suite = unittest.makeSuite(Test_Mesh, 'test_')
-    runner = unittest.TextTestRunner()
+    runner = unittest.TextTestRunner()#verbosity=2)
     runner.run(suite)

trunk/anuga_core/source/anuga/utilities/compile.py

@@ -29 +29 @@
     netcdf_lib_dirs = ' -L"%s" ' % NETCDF_LIB_DIR
 
-print 'netcdf_lib_dirs: ',netcdf_lib_dirs
+#print 'netcdf_lib_dirs: ',netcdf_lib_dirs
 
 #NumPy ------------------------------------