Changeset 3243

Timestamp:

Jun 27, 2006, 12:13:45 PM (18 years ago)

Author:

jack

Message:

Fixed unit teset.

File:

• inundation/parallel/test_parallel_sw.py (modified) (1 diff)

inundation/parallel/test_parallel_sw.py

@@ -206 +206 @@
             assert_(len(l2norm_seq) == len(linfnorm_seq))
             # Anything smaller than tol we consider to be 0.
-            tol = pow(10, -1 * double_precision())
+            # This usualy comes out to be 10^-14 (DBL_DIG = 10^-15)
+            # * 10 to cater for rounding error in computation.
+            tol = pow(10, -1 * (double_precision() - 1))
             for x in range(len(l1norm_seq)):
                 for y in range(3):
-                    assert_(abs(((l1norm_seq[x][y] - l1norm_par[x][y]) < tol)))
-                    assert_(abs(((l2norm_seq[x][y] - l2norm_par[x][y]) < tol)))
-                    assert_(abs(((linfnorm_seq[x][y] - linfnorm_par[x][y]) < tol)))
+                    # Calculate relative difference in the norms
+                    assert_(abs(l1norm_seq[x][y] - l1norm_par[x][y])/l1norm_seq[x][y] < tol)
+                    assert_(abs(l2norm_seq[x][y] - l2norm_par[x][y])/l2norm_seq[x][y] < tol)
+                    assert_(abs(linfnorm_seq[x][y] - linfnorm_par[x][y])/linfnorm_seq[x][y] < tol)
                     if x > 0:
-                        assert_(abs(((l1norm_seq[x][y] - l1norm_seq[x-1][y]) < tol)))
-                        assert_(abs(((l2norm_seq[x][y] - l2norm_seq[x-1][y]) < tol)))
-                        assert_(abs(((linfnorm_seq[x][y] - linfnorm_seq[x-1][y]) < tol)))
-                        assert_(abs(((l1norm_par[x][y] - l1norm_par[x-1][y]) < tol)))
-                        assert_(abs(((l2norm_par[x][y] - l2norm_par[x-1][y]) < tol)))
-                        assert_(abs(((linfnorm_par[x][y] - linfnorm_par[x-1][y]) < tol)))
+                        # Verify that the quantity is being conserved across iterations.
+                        assert_(abs(l1norm_seq[x][y] - l1norm_seq[x-1][y]) < tol)
+                        assert_(abs(l2norm_seq[x][y] - l2norm_seq[x-1][y]) < tol)
+                        assert_(abs(linfnorm_seq[x][y] - linfnorm_seq[x-1][y]) < tol)
+                        assert_(abs(l1norm_par[x][y] - l1norm_par[x-1][y]) < tol)
+                        assert_(abs(l2norm_par[x][y] - l2norm_par[x-1][y]) < tol)
+                        assert_(abs(linfnorm_par[x][y] - linfnorm_par[x-1][y]) < tol)
         pypar.finalize()