Changeset 9493


Ignore:
Timestamp:
Jan 24, 2015, 8:14:14 PM (9 years ago)
Author:
steve
Message:

Moved anuga_1d out of anuga_core

Location:
trunk
Files:
4 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/anuga_core/examples/anuga/operators/run_bed_shear_erosion.py

    r9445 r9493  
    7070                                               len1=length, len2=width)
    7171domain = Domain(points, vertices, boundary)
    72 domain.set_flow_algorithm('2_0')
    73 domain.set_name('bed_shear_erosion') # Output name
     72domain.set_flow_algorithm('DE0')
     73domain.set_name() # Output name
    7474domain.set_store_vertices_uniquely(True)
    7575
     
    101101print 'Set up Erosion Area to test...'
    102102
    103 from rudy_erosion import Bed_shear_erosion_operator
     103from anuga import Bed_shear_erosion_operator
    104104polygon1 = [ [10.6, 1.0], [13.7, 1.0], [13.7, 4.0], [10.6, 4.0] ]
    105105
  • trunk/anuga_core/examples/anuga/operators/run_flat_slice_erosion.py

    r9445 r9493  
    7171domain = Domain(points, vertices, boundary)
    7272domain.set_flow_algorithm('DE1')
    73 domain.set_name('flat_slice_erosion') # Output name
     73domain.set_name() # Output name
    7474print domain.statistics()
    7575
     
    9999print 'Set up Erosion Area to test...'
    100100
    101 from rudy_erosion import Flat_slice_erosion_operator
     101from anuga import Flat_slice_erosion_operator
    102102polygon1 = [ [10.6, 1.0], [13.7, 1.0], [13.7, 4.0], [10.6, 4.0] ]
    103103
  • trunk/anuga_core/examples/anuga/operators/run_polygon_erosion.py

    r9445 r9493  
    8282
    8383        else:
     84            ind = self.indices
     85            m = num.sqrt(self.xmom_c[ind]**2 + self.ymom_c[ind]**2)
     86           
     87            if self.domain.get_using_discontinuous_elevation():
     88                height = self.stage_c[ind] - self.elev_c[ind]
     89               
     90                m = num.where(m>self.threshold, m, 0.0)
     91                self.elev_c[ind] = num.maximum(self.elev_c[ind] - m*dt, self.base)
    8492
     93                self.stage_c[ind] = self.elev_c[ind] + height
     94            else:
    8595            #--------------------------------------
    8696            # Update all three vertices for each cell
    8797            #--------------------------------------
    88             ind = self.indices
    89             m = num.sqrt(self.xmom_c[ind]**2 + self.ymom_c[ind]**2)
    90             m = num.vstack((m,m,m)).T
    91             m = num.where(m>self.threshold, m, 0.0)
    92             self.elev_v[ind] = num.maximum(self.elev_v[ind] - m*dt, self.base)
    93              #num.maximum(self.elev_v[ind] - momentum*dt, Z)
     98           
     99           
     100                m = num.vstack((m,m,m)).T
     101                m = num.where(m>self.threshold, m, 0.0)
     102                self.elev_v[ind] = num.maximum(self.elev_v[ind] - m*dt, self.base)
     103                #num.maximum(self.elev_v[ind] - momentum*dt, Z)
    94104
    95105
     
    114124domain = Domain(points, vertices, boundary)
    115125domain.set_name() # Output name based on script
     126domain.set_flow_algorithm('DE1')
    116127print domain.statistics()
     128domain.set_store_vertices_uniquely(True)
     129
    117130domain.set_quantities_to_be_stored({'elevation': 2,
    118131                                    'stage': 2,
  • trunk/anuga_core/source/anuga/operators/erosion_operators.py

    r9125 r9493  
    606606
    607607
    608             if self.domain.get_discontinuous_elavation():
     608            if self.domain.get_using_discontinuous_elevation():
    609609                height = self.stage_c[ind] - self.elev_c[ind]
    610610               
Note: See TracChangeset for help on using the changeset viewer.