Changeset 7704 for anuga_core/source/anuga/abstract_2d_finite_volumes/domain.py

Timestamp:

Apr 30, 2010, 5:11:19 PM (14 years ago)

Author:

steve

Message:

Changed import of boundary conditions

File:

• anuga_core/source/anuga/abstract_2d_finite_volumes/domain.py (modified) (3 diffs)

anuga_core/source/anuga/abstract_2d_finite_volumes/domain.py

@@ -15 +15 @@
 
 from anuga.abstract_2d_finite_volumes.neighbour_mesh import Mesh
-from anuga.abstract_2d_finite_volumes.generic_boundary_conditions\
-     import Boundary
-from anuga.abstract_2d_finite_volumes.generic_boundary_conditions\
-     import File_boundary
-from anuga.abstract_2d_finite_volumes.generic_boundary_conditions\
-     import AWI_boundary
-from anuga.abstract_2d_finite_volumes.generic_boundary_conditions\
-     import Dirichlet_boundary
-from anuga.abstract_2d_finite_volumes.generic_boundary_conditions\
-     import Time_boundary
-from anuga.abstract_2d_finite_volumes.generic_boundary_conditions\
-     import Transmissive_boundary
+from anuga.abstract_2d_finite_volumes.generic_boundary_conditions \
+        import ( Boundary, File_boundary, AWI_boundary, 
+                 Dirichlet_boundary, Time_boundary, Transmissive_boundary )
 from anuga.abstract_2d_finite_volumes.pmesh2domain import pmesh_to_domain
-from anuga.abstract_2d_finite_volumes.region\
-     import Set_region as region_set_region
+from anuga.abstract_2d_finite_volumes.region \
+        import Set_region as region_set_region
 from anuga.utilities.polygon import inside_polygon
 from anuga.abstract_2d_finite_volumes.util import get_textual_float
@@ -1853 +1844 @@
         # Protect against degenerate timesteps arising from isolated
         # triangles
-        # FIXME (Steve): This should be in shallow_water as it assumes x and y
-        # momentum
-        if self.protect_against_isolated_degenerate_timesteps is True and \
-               num.max(self.max_speed) > 10.0: # FIXME (Ole): Make this configurable
-
-            # Setup 10 bins for speed histogram
-            from anuga.utilities.numerical_tools import histogram, create_bins
-
-            bins = create_bins(self.max_speed, 10)
-            hist = histogram(self.max_speed, bins)
-
-            # Look for characteristic signature
-            if len(hist) > 1 and hist[-1] > 0 and \
-                hist[4] == hist[5] == hist[6] == hist[7] == hist[8] == 0:
-                    # Danger of isolated degenerate triangles
-
-                    # Find triangles in last bin
-                    # FIXME - speed up using numeric package
-                    d = 0
-                    for i in range(self.number_of_full_triangles):
-                        if self.max_speed[i] > bins[-1]:
-                            msg = 'Time=%f: Ignoring isolated high ' % self.time
-                            msg += 'speed triangle '
-                            msg += '#%d of %d with max speed=%f' \
-                                      % (i, self.number_of_full_triangles,
-                                         self.max_speed[i])
-
-                            self.get_quantity('xmomentum').\
-                                            set_values(0.0, indices=[i])
-                            self.get_quantity('ymomentum').\
-                                            set_values(0.0, indices=[i])
-                            self.max_speed[i]=0.0
-                            d += 1
-
+        self.apply_protection_against_isolated_degenerate_timesteps()
+                
         # self.timestep is calculated from speed of characteristics
         # Apply CFL condition here
@@ -2027 +1986 @@
 
         return normfunc(self.quantities[quantity].centroid_values)
+
+
+
+    def apply_protection_against_isolated_degenerate_timesteps(self):
+
+        # FIXME (Steve): This should be in shallow_water as it assumes x and y
+        # momentum
+        if self.protect_against_isolated_degenerate_timesteps is False:
+            return
+        
+        # FIXME (Ole): Make this configurable
+        if num.max(self.max_speed) < 10.0: 
+            return
+
+        # Setup 10 bins for speed histogram
+        from anuga.utilities.numerical_tools import histogram, create_bins
+
+        bins = create_bins(self.max_speed, 10)
+        hist = histogram(self.max_speed, bins)
+
+        # Look for characteristic signature
+        if len(hist) > 1 and hist[-1] > 0 and \
+            hist[4] == hist[5] == hist[6] == hist[7] == hist[8] == 0:
+            # Danger of isolated degenerate triangles
+
+            # Find triangles in last bin
+            # FIXME - speed up using numeric package
+            d = 0
+            for i in range(self.number_of_full_triangles):
+                if self.max_speed[i] > bins[-1]:
+                    msg = 'Time=%f: Ignoring isolated high ' % self.time
+                    msg += 'speed triangle '
+                    msg += '#%d of %d with max speed=%f' \
+                        % (i, self.number_of_full_triangles, self.max_speed[i])
+
+                    self.get_quantity('xmomentum').\
+                        set_values(0.0, indices=[i])
+                    self.get_quantity('ymomentum').\
+                        set_values(0.0, indices=[i])
+                    self.max_speed[i]=0.0
+                    d += 1