Changeset 3529

Timestamp:

Aug 25, 2006, 11:19:49 AM (17 years ago)

Author:

duncan

Message:

minimum_allowed_depth is now an attribute of domain

Location:

anuga_core/source/anuga/pyvolution

Files:

• data_manager.py (modified) (3 diffs)
• shallow_water.py (modified) (2 diffs)
• test_data_manager.py (modified) (2 diffs)

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
 
 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
+        else:
+            self.minimum_allowed_depth = minimum_allowed_depth
 
         # NetCDF file definition
@@ -478 +482 @@
                     #print z[:]
                     #print A-z[:]
-                    A = choose( A-z[:] >= minimum_allowed_depth, (z[:], A))
+                    A = choose( A-z[:] >= self.minimum_allowed_depth,
+                                (z[:], A))
                     stage[i,:] = A.astype(self.precision)
                 elif name == 'xmomentum':

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
 
 
@@ -126 +126 @@
         self.format = 'sww'
         self.set_store_vertices_uniquely(False)
-
+        self.minimum_allowed_depth = minimum_allowed_depth
         self.quantities_to_be_stored = ['stage','xmomentum','ymomentum']
 

anuga_core/source/anuga/pyvolution/test_data_manager.py

@@ -459 +459 @@
 
 
-
-    def test_sww_DSG(self):
+    def test_sww_minimum_allowed_depth(self):
+        """Test that sww information can be written correctly
+        multiple timesteps using a different reduction operator (min)
+        """
+
+        import time, os
+        from Numeric import array, zeros, allclose, Float, concatenate
+        from Scientific.IO.NetCDF import NetCDFFile
+
+        self.domain.filename = 'datatest' + str(id(self))
+        self.domain.format = 'sww'
+        self.domain.smooth = True
+        self.domain.reduction = min
+        self.domain.minimum_allowed_depth = 100
+
+        sww = get_dataobject(self.domain)
+        sww.store_connectivity()
+        sww.store_timestep('stage')
+
+        self.domain.evolve_to_end(finaltime = 0.01)
+        sww.store_timestep('stage')
+
+
+        #Check contents
+        #Get NetCDF
+        fid = NetCDFFile(sww.filename, 'r')
+
+
+        # Get the variables
+        x = fid.variables['x']
+        y = fid.variables['y']
+        z = fid.variables['elevation']
+        time = fid.variables['time']
+        stage = fid.variables['stage']
+
+        #Check values
+        Q = self.domain.quantities['stage']
+        Q0 = Q.vertex_values[:,0]
+        Q1 = Q.vertex_values[:,1]
+        Q2 = Q.vertex_values[:,2]
+
+        A = stage[1,:]
+        assert allclose(stage[1,:], z[:])
+        fid.close()
+
+        #Cleanup
+        os.remove(sww.filename)
+
+
+    def Not_a_test_sww_DSG(self):
         """Not a test, rather a look at the sww format
         """
@@ -4944 +4992 @@
 #-------------------------------------------------------------
 if __name__ == "__main__":
-    #suite = unittest.makeSuite(Test_Data_Manager,'test_exposure_csv_loading_x_y2')
+    #suite = unittest.makeSuite(Test_Data_Manager,'test_sww_minimum_allowed_depth')
     suite = unittest.makeSuite(Test_Data_Manager,'test')
     runner = unittest.TextTestRunner()