Changeset 4932

Timestamp:

Jan 14, 2008, 8:17:29 AM (17 years ago)

Author:

steve

Message:

 

Location:

anuga_core

Files:

• documentation/user_manual/demos/cairns/project.py (modified) (2 diffs)
• source/anuga/abstract_2d_finite_volumes/test_domain.py (modified) (1 diff)
• source/anuga/utilities/quad.py (modified) (2 diffs)

anuga_core/documentation/user_manual/demos/cairns/project.py

@@ -31 +31 @@
 poly_shallow = read_polygon('shallow.csv')
 
-#plot_polygons([bounding_polygon,poly_cairns,poly_island0,poly_island1,\
-#               poly_island2,poly_island3,poly_shallow],\
-#              'boundingpoly',verbose=False)
+plot_polygons([bounding_polygon,poly_cairns,poly_island0,poly_island1,\
+               poly_island2,poly_island3,poly_shallow],\
+               style='boundingpoly',verbose=False)
+
 
 ###################################################################
@@ -50 +51 @@
 
 gauge_filename = 'gauges.csv'
+
+

anuga_core/source/anuga/abstract_2d_finite_volumes/test_domain.py

@@ -354 +354 @@
 
 
-        #Should have no trouble with euler or rk2
+        #Should have no trouble with euler, rk2 or rk3
         domain.set_timestepping_method('euler')
         domain.set_timestepping_method('rk2')
+        domain.set_timestepping_method('rk3')
 
         #test get timestepping method
-        assert domain.get_timestepping_method() == 'rk2'
+        assert domain.get_timestepping_method() == 'rk3'
 
 

anuga_core/source/anuga/utilities/quad.py

@@ -130 +130 @@
     def contains(*args):    
         """True only if P's coordinates lie within cell boundaries
-        This methods has two forms:
-        
-        cell.contains(index)
-          #True if cell contains indexed point
-        cell.contains(x, y)
-          #True if cell contains point (x,y)    
-
-        """
-        
-        self = args[0]
-        if len(args) == 2:
-            point_id = int(args[1])
+        This methods has two forms:
+        
+        cell.contains(index)
+        #True if cell contains indexed point
+        cell.contains(x, y)
+        #True if cell contains point (x,y)      
+        """
+        self = args[0]
+        if len(args) == 2:
+            point_id = int(args[1])
             x, y = self.mesh.get_node(point_id, absolute=True)
-        elif len(args) == 3:
-            x = float(args[1])
-            y = float(args[2])
-        else:
-            msg = 'Number of arguments to method must be two or three'
-            raise msg                         
+        elif len(args) == 3:
+            x = float(args[1])
+            y = float(args[2])
+        else:
+            msg = 'Number of arguments to method must be two or three'
+            raise msg                         
         
         if y <  self.southern: return False
@@ -302 +300 @@
         #FIXME, mincellsize removed.  base it on side length, if needed
         
-        #Protect against silly thresholds such as -1
-        if threshold < 1:
-            return
+        #Protect against silly thresholds such as -1
+        if threshold < 1:
+            return
         
         if not self.children:               # Leaf cell