Changeset 7276 for anuga_core/source/anuga/fit_interpolate/test_fit.py

Timestamp:

Jun 30, 2009, 2:07:41 PM (15 years ago)

Author:

ole

Message:

Merged numpy branch back into the trunk.

In ~/sandpit/anuga/anuga_core/source
svn merge -r 6246:HEAD ../../branches/numpy .

In ~/sandpit/anuga/anuga_validation
svn merge -r 6417:HEAD ../branches/numpy_anuga_validation .

In ~/sandpit/anuga/misc
svn merge -r 6809:HEAD ../branches/numpy_misc .

For all merges, I used numpy version where conflicts existed

The suites test_all.py (in source/anuga) and validate_all.py passed using Python2.5 with numpy on my Ubuntu Linux box.

File:

• anuga_core/source/anuga/fit_interpolate/test_fit.py (modified) (8 diffs)

anuga_core/source/anuga/fit_interpolate/test_fit.py

@@ -21 +21 @@
 from anuga.shallow_water import Domain
 
-import Numeric as num
+import numpy as num
 
 
@@ -582 +582 @@
 
         #Define f(x,y) = x
-        f = num.array([0,0,2], num.Int) #Value at global vertex 2      #array default#
+        f = num.array([0,0,2]) #Value at global vertex 2
 
         #Check that int (df/dx)**2 + (df/dy)**2 dx dy =
@@ -589 +589 @@
 
         #Define f(x,y) = y
-        f = num.array([0,2,0], num.Int)  #Value at global vertex 1      #array default#
+        f = num.array([0,2,0])  #Value at global vertex 1
 
         #Check that int (df/dx)**2 + (df/dy)**2 dx dy =
@@ -596 +596 @@
 
         #Define f(x,y) = x+y
-        f = num.array([0,2,2], num.Int)  #Values at global vertex 1 and 2      #array default#
+        f = num.array([0,2,2])  #Values at global vertex 1 and 2
 
         #Check that int (df/dx)**2 + (df/dy)**2 dx dy =
@@ -623 +623 @@
 
         #Define f(x,y) = x
-        f = num.array([0,0,2,0,2,4], num.Int) #f evaluated at points a-f      #array default#
+        f = num.array([0,0,2,0,2,4]) #f evaluated at points a-f
 
         #Check that int (df/dx)**2 + (df/dy)**2 dx dy =
@@ -630 +630 @@
 
         #Define f(x,y) = y
-        f = num.array([0,2,0,4,2,0], num.Int) #f evaluated at points a-f      #array default#
+        f = num.array([0,2,0,4,2,0]) #f evaluated at points a-f
 
         #Check that int (df/dx)**2 + (df/dy)**2 dx dy =
@@ -637 +637 @@
 
         #Define f(x,y) = x+y
-        f = num.array([0,2,2,4,4,4], num.Int)  #f evaluated at points a-f     #array default#
+        f = num.array([0,2,2,4,4,4])  #f evaluated at points a-f
 
         #Check that int (df/dx)**2 + (df/dy)**2 dx dy =
@@ -1099 +1099 @@
 if __name__ == "__main__":
     suite = unittest.makeSuite(Test_Fit,'test')
-    #suite = unittest.makeSuite(Test_Fit,'test_smooth_attributes_to_mesh_function')
-    #suite = unittest.makeSuite(Test_Fit,'')
-    runner = unittest.TextTestRunner(verbosity=1)
+    runner = unittest.TextTestRunner() #verbosity=1)
     runner.run(suite)
 
-
-
-
-