Changeset 3532

Timestamp:

Aug 25, 2006, 4:38:51 PM (17 years ago)

Author:

duncan

Message:

name change

Location:

anuga_core/source/anuga

Files:

• config.py (modified) (1 diff)
• pyvolution/data_manager.py (modified) (4 diffs)
• pyvolution/shallow_water.py (modified) (2 diffs)
• pyvolution/test_data_manager.py (modified) (3 diffs)

anuga_core/source/anuga/config.py

@@ -108 +108 @@
 maximum_allowed_speed = 100.0 #Maximal particle speed of water
 
-minimum_allowed_depth = 0.0
+minimum_sww_depth = 0.0

anuga_core/source/anuga/pyvolution/data_manager.py

@@ -67 +67 @@
 from anuga.coordinate_transforms.geo_reference import Geo_reference
 from anuga.geospatial_data.geospatial_data import Geospatial_data
-from anuga.config import minimum_allowed_depth
+from anuga.config import minimum_sww_depth
 
 def make_filename(s):
@@ -252 +252 @@
         Data_format.__init__(self, domain, 'sww', mode)
 
-        if hasattr(domain, 'minimum_allowed_depth'):
-            self.minimum_allowed_depth =  domain.minimum_allowed_depth
+        if hasattr(domain, 'minimum_sww_depth'):
+            self.minimum_sww_depth =  domain.minimum_sww_depth
         else:
-            self.minimum_allowed_depth = minimum_allowed_depth
+            self.minimum_sww_depth = minimum_sww_depth
 
         # NetCDF file definition
@@ -380 +380 @@
         from os import stat
 
-        minimum_allowed_depth = 0.001
-        #minimum_allowed_depth = 0.0  #FIXME pass in or read from domain
+        minimum_sww_depth = 0.001
+        #minimum_sww_depth = 0.0  #FIXME pass in or read from domain
         from Numeric import choose
 
@@ -482 +482 @@
                     #print z[:]
                     #print A-z[:]
-                    A = choose( A-z[:] >= self.minimum_allowed_depth,
+                    A = choose( A-z[:] >= self.minimum_sww_depth,
                                 (z[:], A))
                     stage[i,:] = A.astype(self.precision)

anuga_core/source/anuga/pyvolution/shallow_water.py

@@ -63 +63 @@
 
 from anuga.utilities.numerical_tools import gradient, mean
-from anuga.config import minimum_allowed_depth
+from anuga.config import minimum_sww_depth
 
 
@@ -126 +126 @@
         self.format = 'sww'
         self.set_store_vertices_uniquely(False)
-        self.minimum_allowed_depth = minimum_allowed_depth
+        self.minimum_sww_depth = minimum_sww_depth
         self.quantities_to_be_stored = ['stage','xmomentum','ymomentum']
 

anuga_core/source/anuga/pyvolution/test_data_manager.py

@@ -459 +459 @@
 
 
-    def test_sww_minimum_allowed_depth(self):
+    def test_sww_minimum_sww_depth(self):
         """Test that sww information can be written correctly
         multiple timesteps using a different reduction operator (min)
@@ -472 +472 @@
         self.domain.smooth = True
         self.domain.reduction = min
-        self.domain.minimum_allowed_depth = 100
+        self.domain.minimum_sww_depth = 100
 
         sww = get_dataobject(self.domain)
@@ -4992 +4992 @@
 #-------------------------------------------------------------
 if __name__ == "__main__":
-    #suite = unittest.makeSuite(Test_Data_Manager,'test_sww_minimum_allowed_depth')
+    #suite = unittest.makeSuite(Test_Data_Manager,'test_sww_minimum_sww_depth')
     suite = unittest.makeSuite(Test_Data_Manager,'test')
     runner = unittest.TextTestRunner()