Changeset 9380

Timestamp:

Dec 12, 2014, 12:55:09 PM (10 years ago)

Author:

steve

Message:

Strange problem with importing protect

File:

• trunk/anuga_core/source/anuga/shallow_water/shallow_water_domain.py (modified) (4 diffs)

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

@@ -1893 +1893 @@
         if self.flow_algorithm == 'tsunami':
 
-            from swb2_domain_ext import protect
+            from swb2_domain_ext import protect as protect_swb2
 
             # shortcuts
@@ -1904 +1904 @@
             areas = self.areas
 
-            mass_error = protect(self.minimum_allowed_height, self.maximum_allowed_speed,
+            mass_error = protect_swb2(self.minimum_allowed_height, self.maximum_allowed_speed,
                 self.epsilon, wc, wv, zc,zv, xmomc, ymomc, areas)
 
@@ -1912 +1912 @@
         elif self.flow_algorithm.startswith('DE'):
 
-            from swDE1_domain_ext import protect
+            from swDE1_domain_ext import protect as protect_de
 
             # shortcuts
@@ -1925 +1925 @@
             yc = self.centroid_coordinates[:,1] 
 
-            mass_error = protect(self.minimum_allowed_height, self.maximum_allowed_speed,
+            mass_error = protect_de(self.minimum_allowed_height, self.maximum_allowed_speed,
                     self.epsilon, wc, wv, zc,zv, xmomc, ymomc, areas, xc, yc)