Changeset 6258

Timestamp:

Feb 2, 2009, 5:07:32 PM (16 years ago)

Author:

ole

Message:

Made second order accuracy the default and tested.

Location:

anuga_core/source/anuga

Files:

• abstract_2d_finite_volumes/test_domain.py (modified) (5 diffs)
• config.py (modified) (1 diff)
• shallow_water/test_shallow_water_domain.py (modified) (1 diff)

anuga_core/source/anuga/abstract_2d_finite_volumes/test_domain.py

@@ -542 +542 @@
                         conserved_quantities =\
                         ['stage', 'xmomentum', 'ymomentum'])
+        domain.set_default_order(1)
         domain.check_integrity()
 
@@ -548 +549 @@
                                       [0,0,9], [-6, 3, 3]])
 
-        assert num.allclose( domain.quantities['stage'].centroid_values,
-                             [2,5,3,0] )
+        assert num.allclose(domain.quantities['stage'].centroid_values,
+                            [2,5,3,0])
 
         domain.set_quantity('xmomentum', [[1,1,1], [2,2,2],
@@ -560 +561 @@
         domain.distribute_to_vertices_and_edges()
 
-        #First order extrapolation
+        # First order extrapolation
         assert num.allclose( domain.quantities['stage'].vertex_values,
                              [[ 2.,  2.,  2.],
@@ -650 +651 @@
                         conserved_quantities =\
                         ['stage', 'xmomentum', 'ymomentum'])
+        domain.set_default_order(1)                        
         domain.check_integrity()
 
@@ -667 +669 @@
         domain.distribute_to_vertices_and_edges()
 
-        #First order extrapolation
+        # First order extrapolation
         assert num.allclose( domain.quantities['stage'].vertex_values,
                              [[ 2.,  2.,  2.],

anuga_core/source/anuga/config.py

@@ -89 +89 @@
         
 # FIXME (Ole) Maybe get rid of order altogether and use beta_w
-# ... and isn't it about time we make the default 2?
-default_order = 1
+default_order = 2
 
 ################################################################################

anuga_core/source/anuga/shallow_water/test_shallow_water_domain.py

@@ -1756 +1756 @@
         points, vertices, boundary = rectangular_cross(10, 10) # Basic mesh
         domain = Domain(points, vertices, boundary) # Create domain
+        domain.set_default_order(1)        
         domain.set_quantities_to_be_stored(None)
         domain.set_maximum_allowed_speed(100) #FIXME (Ole): try to remove this