Changeset 3532


Ignore:
Timestamp:
Aug 25, 2006, 4:38:51 PM (18 years ago)
Author:
duncan
Message:

name change

Location:
anuga_core/source/anuga
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • anuga_core/source/anuga/config.py

    r3531 r3532  
    108108maximum_allowed_speed = 100.0 #Maximal particle speed of water
    109109
    110 minimum_allowed_depth = 0.0
     110minimum_sww_depth = 0.0
  • anuga_core/source/anuga/pyvolution/data_manager.py

    r3529 r3532  
    6767from anuga.coordinate_transforms.geo_reference import Geo_reference
    6868from anuga.geospatial_data.geospatial_data import Geospatial_data
    69 from anuga.config import minimum_allowed_depth
     69from anuga.config import minimum_sww_depth
    7070
    7171def make_filename(s):
     
    252252        Data_format.__init__(self, domain, 'sww', mode)
    253253
    254         if hasattr(domain, 'minimum_allowed_depth'):
    255             self.minimum_allowed_depth =  domain.minimum_allowed_depth
     254        if hasattr(domain, 'minimum_sww_depth'):
     255            self.minimum_sww_depth =  domain.minimum_sww_depth
    256256        else:
    257             self.minimum_allowed_depth = minimum_allowed_depth
     257            self.minimum_sww_depth = minimum_sww_depth
    258258
    259259        # NetCDF file definition
     
    380380        from os import stat
    381381
    382         minimum_allowed_depth = 0.001
    383         #minimum_allowed_depth = 0.0  #FIXME pass in or read from domain
     382        minimum_sww_depth = 0.001
     383        #minimum_sww_depth = 0.0  #FIXME pass in or read from domain
    384384        from Numeric import choose
    385385
     
    482482                    #print z[:]
    483483                    #print A-z[:]
    484                     A = choose( A-z[:] >= self.minimum_allowed_depth,
     484                    A = choose( A-z[:] >= self.minimum_sww_depth,
    485485                                (z[:], A))
    486486                    stage[i,:] = A.astype(self.precision)
  • anuga_core/source/anuga/pyvolution/shallow_water.py

    r3529 r3532  
    6363
    6464from anuga.utilities.numerical_tools import gradient, mean
    65 from anuga.config import minimum_allowed_depth
     65from anuga.config import minimum_sww_depth
    6666
    6767
     
    126126        self.format = 'sww'
    127127        self.set_store_vertices_uniquely(False)
    128         self.minimum_allowed_depth = minimum_allowed_depth
     128        self.minimum_sww_depth = minimum_sww_depth
    129129        self.quantities_to_be_stored = ['stage','xmomentum','ymomentum']
    130130
  • anuga_core/source/anuga/pyvolution/test_data_manager.py

    r3529 r3532  
    459459
    460460
    461     def test_sww_minimum_allowed_depth(self):
     461    def test_sww_minimum_sww_depth(self):
    462462        """Test that sww information can be written correctly
    463463        multiple timesteps using a different reduction operator (min)
     
    472472        self.domain.smooth = True
    473473        self.domain.reduction = min
    474         self.domain.minimum_allowed_depth = 100
     474        self.domain.minimum_sww_depth = 100
    475475
    476476        sww = get_dataobject(self.domain)
     
    49924992#-------------------------------------------------------------
    49934993if __name__ == "__main__":
    4994     #suite = unittest.makeSuite(Test_Data_Manager,'test_sww_minimum_allowed_depth')
     4994    #suite = unittest.makeSuite(Test_Data_Manager,'test_sww_minimum_sww_depth')
    49954995    suite = unittest.makeSuite(Test_Data_Manager,'test')
    49964996    runner = unittest.TextTestRunner()
Note: See TracChangeset for help on using the changeset viewer.