Changeset 8420

Timestamp:

May 8, 2012, 7:06:21 PM (12 years ago)

Author:

steve

Message:

Changed parallel_safe to parallel_safe because it seems that inheriting from with didn't work.

Location:

trunk/anuga_core/source

Files:

• anuga/abstract_2d_finite_volumes/generic_domain.py (modified) (1 diff)
• anuga/abstract_2d_finite_volumes/test_domain.py (modified) (1 diff)
• anuga/operators/mannings_operator.py (modified) (1 diff)
• anuga/operators/rate_operators.py (modified) (1 diff)
• anuga/shallow_water/forcing.py (modified) (2 diffs)
• anuga_parallel/parallel_boyd_box_operator.py (modified) (1 diff)
• anuga_parallel/parallel_inlet.py (modified) (1 diff)
• anuga_parallel/parallel_inlet_operator.py (modified) (1 diff)

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

@@ -479 +479 @@
         if cfl > 2.0:
             self.CFL = cfl
-            log.warn('Setting CFL > 2.0')
+            msg = 'Setting CFL > 2.0'
+            #warnings.warn(msg)
+            log.warn()
 
         assert cfl > 0.0

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

@@ -88 +88 @@
         
         try:
-            domain.set_CFL(2.0)
+            domain.set_CFL(3.0)
         except:
             pass
         else:
-            msg = 'Should have warned of cfl>1.0'
+            msg = 'Should have warned of cfl>2.0'
             raise Exception, msg
 
-        assert domain.CFL == 2.0
+        assert domain.CFL == 3.0
         
 

trunk/anuga_core/source/anuga/operators/mannings_operator.py

@@ -63 +63 @@
 
 
-    def __parallel_safe(self):
+    def parallel_safe(self):
         """
         This operator only works with centroid values of quantities

trunk/anuga_core/source/anuga/operators/rate_operators.py

@@ -154 +154 @@
         return rate
 
-    def __parallel_safe(self):
+    def parallel_safe(self):
         """Operator is applied independently on each cell and
         so is parallel safe.

trunk/anuga_core/source/anuga/shallow_water/forcing.py

@@ -278 +278 @@
         if domain.numproc > 1:
             msg = 'Not implemented to run in parallel'
-            assert self.__parallel_safe(), msg
+            assert self.parallel_safe(), msg
 
         if center is None:
@@ -495 +495 @@
 
 
-    def __parallel_safe(self):
+    def parallel_safe(self):
         """
         These forcing terms only work on individual processors, the polygon

trunk/anuga_core/source/anuga_parallel/parallel_boyd_box_operator.py

@@ -95 +95 @@
 
 
-    def __parallel_safe(self):
+    def parallel_safe(self):
 
         print "ZZZZ parallel_boyd"

trunk/anuga_core/source/anuga_parallel/parallel_inlet.py

@@ -467 +467 @@
         return self.master_proc
 
-    def __parallel_safe(self):
+    def parallel_safe(self):
 
         return True

trunk/anuga_core/source/anuga_parallel/parallel_inlet_operator.py

@@ -215 +215 @@
         return self.master_proc
 
-    def __parallel_safe(self):
+    def parallel_safe(self):
         return True