Changeset 9493

Timestamp:

Jan 24, 2015, 8:14:14 PM (10 years ago)

Author:

steve

Message:

Moved anuga_1d out of anuga_core

Location:

trunk

Files:

• anuga_1d_core (moved) (moved from trunk/anuga_core/source/anuga_1d)
• anuga_core/examples/anuga/operators/run_bed_shear_erosion.py (modified) (2 diffs)
• anuga_core/examples/anuga/operators/run_flat_slice_erosion.py (modified) (2 diffs)
• anuga_core/examples/anuga/operators/run_polygon_erosion.py (modified) (2 diffs)
• anuga_core/source/anuga/operators/erosion_operators.py (modified) (1 diff)

trunk/anuga_core/examples/anuga/operators/run_bed_shear_erosion.py

@@ -70 +70 @@
                                                len1=length, len2=width)
 domain = Domain(points, vertices, boundary)
-domain.set_flow_algorithm('2_0')
-domain.set_name('bed_shear_erosion') # Output name
+domain.set_flow_algorithm('DE0')
+domain.set_name() # Output name
 domain.set_store_vertices_uniquely(True)
 
@@ -101 +101 @@
 print 'Set up Erosion Area to test...'
 
-from rudy_erosion import Bed_shear_erosion_operator
+from anuga import Bed_shear_erosion_operator
 polygon1 = [ [10.6, 1.0], [13.7, 1.0], [13.7, 4.0], [10.6, 4.0] ]
 

trunk/anuga_core/examples/anuga/operators/run_flat_slice_erosion.py

@@ -71 +71 @@
 domain = Domain(points, vertices, boundary)
 domain.set_flow_algorithm('DE1')
-domain.set_name('flat_slice_erosion') # Output name
+domain.set_name() # Output name
 print domain.statistics()
 
@@ -99 +99 @@
 print 'Set up Erosion Area to test...'
 
-from rudy_erosion import Flat_slice_erosion_operator
+from anuga import Flat_slice_erosion_operator
 polygon1 = [ [10.6, 1.0], [13.7, 1.0], [13.7, 4.0], [10.6, 4.0] ]
 

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

@@ -82 +82 @@
 
         else:
+            ind = self.indices
+            m = num.sqrt(self.xmom_c[ind]**2 + self.ymom_c[ind]**2)
+            
+            if self.domain.get_using_discontinuous_elevation():
+                height = self.stage_c[ind] - self.elev_c[ind]
+                
+                m = num.where(m>self.threshold, m, 0.0)
+                self.elev_c[ind] = num.maximum(self.elev_c[ind] - m*dt, self.base)
 
+                self.stage_c[ind] = self.elev_c[ind] + height
+            else:
             #--------------------------------------
             # Update all three vertices for each cell
             #--------------------------------------
-            ind = self.indices
-            m = num.sqrt(self.xmom_c[ind]**2 + self.ymom_c[ind]**2)
-            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, self.base)
-             #num.maximum(self.elev_v[ind] - momentum*dt, Z)
+            
+            
+                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, self.base)
+                #num.maximum(self.elev_v[ind] - momentum*dt, Z)
 
 
@@ -114 +124 @@
 domain = Domain(points, vertices, boundary)
 domain.set_name() # Output name based on script
+domain.set_flow_algorithm('DE1')
 print domain.statistics()
+domain.set_store_vertices_uniquely(True)
+
 domain.set_quantities_to_be_stored({'elevation': 2,
                                     'stage': 2,

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

@@ -606 +606 @@
 
 
-            if self.domain.get_discontinuous_elavation():
+            if self.domain.get_using_discontinuous_elevation():
                 height = self.stage_c[ind] - self.elev_c[ind]