Changeset 8484

Timestamp:

Jul 30, 2012, 9:57:15 PM (13 years ago)

Author:

steve

Message:

slight improvement to erosion operator

Location:

trunk/anuga_core/source/anuga/operators

Files:

• erosion_operators.py (modified) (9 diffs)
• run_polygon_erosion.py (modified) (3 diffs)

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

@@ -9 +9 @@
 
 
-from anuga import Domain
-from anuga import Quantity
+
 import numpy as num
-import anuga.utilities.log as log
-
 from anuga.geometry.polygon import inside_polygon
-
 from anuga.operators.base_operator import Operator
-
 from anuga import indent
-
 
 
@@ -28 +22 @@
     indices: None == all triangles, Empty list [] no triangles
 
-    rate can be a function of time.
+    threshold: Impose erosion if || momentum || > threshold
+    base: Allow erosion down to base level
 
     """
@@ -35 +30 @@
                  domain,
                  threshold= 0.0,
+                 base=0.0,
                  indices=None,
                  description = None,
@@ -48 +44 @@
         #------------------------------------------
         self.threshold = threshold
+        self.base = base
         self.indices = indices
 
-
-
+        #------------------------------------------
+        # Extra aliases for changing elevation at
+        # vertices and edges
+        #------------------------------------------
         self.elev_v  = self.domain.quantities['elevation'].vertex_values
         self.elev_e = self.domain.quantities['elevation'].edge_values
-        self.stage_v = self.domain.quantities['stage'].vertex_values
 
         #------------------------------------------
@@ -96 +94 @@
             m = num.vstack((m,m,m)).T
             m = num.where(m>self.threshold, m, 0.0)
-            self.elev_v[ind] = num.maximum(self.elev_v[ind] - m*dt, 0.0)
+            self.elev_v[ind] = num.maximum(self.elev_v[ind] - m*dt, self.base)
              #num.maximum(self.elev_v[ind] - momentum*dt, Z)
 
@@ -402 +400 @@
     def __init__(self, domain,
                  threshold=0.0,
+                 base=0.0,
                  center=None,
                  radius=None,
@@ -445 +444 @@
                                   domain,
                                   threshold,
+                                  base,
                                   indices=indices,
                                   verbose=verbose)
@@ -463 +463 @@
     def __init__(self, domain,
                  threshold=0.0,
+                 base=0.0,
                  polygon=None,
                  verbose=False):
@@ -482 +483 @@
                                   domain,
                                   threshold=threshold,
+                                  base=base,
                                   indices=indices,
                                   verbose=verbose)

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

@@ -76 +76 @@
 #------------------------------------------------------------------------------
 
-polygon1 = [ [12., 2.0], [13., 2.0], [13., 3.0], [12., 3.0] ]
-op1 = Polygonal_erosion_operator(domain, threshold=0.0, polygon=polygon1)
+polygon1 = [ [12., 0.0], [13., 0.0], [13., 5.0], [12., 5.0] ]
+op1 = Polygonal_erosion_operator(domain, threshold=0.0, base=-0.1, polygon=polygon1)
 
 
@@ -83 +83 @@
 # Evolve system through time
 #------------------------------------------------------------------------------
-
-for t in domain.evolve(yieldstep=0.2, finaltime=30.0):
+for t in domain.evolve(yieldstep=0.2, finaltime=40.0):
     domain.print_timestepping_statistics()
     domain.print_operator_timestepping_statistics()
-
-#    elev_v = domain.get_quantity('elevation').vertex_values
-#    stage_v = domain.get_quantity('stage').vertex_values
-#    elev_c = domain.get_quantity('elevation').centroid_values
-#    stage_c = domain.get_quantity('stage').centroid_values
-#    ind = op1.indices
-#    from pprint import pprint
-#    pprint(ind)
-#    print elev_v[ind]
-#    print stage_v[ind]
-#    print elev_c[ind]
-#    print stage_c[ind]
 
 
@@ -107 +94 @@
 
 
+
+