Changeset 3975

Timestamp:

Nov 13, 2006, 5:51:05 PM (18 years ago)

Author:

duncan

Message:

extend tests of urs2sww.

Location:

anuga_core/source/anuga/shallow_water

Files:

• data_manager.py (modified) (1 diff)
• test_data_manager.py (modified) (7 diffs)

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -4182 +4182 @@
                                          file_out,
                                          quantity)
+        #print "lonlatdep", lonlatdep 
         if hashed_elevation == None:
             elevation_file = basename_out+'_e.nc'

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -4569 +4569 @@
         mux_names = ['-z-mux','-e-mux','-n-mux']
         quantities_init = [[],[],[]]
+        # urs binary is latitude fastest
         for i,lon in enumerate(longitudes):
             for j,lat in enumerate(latitudes):
@@ -4657 +4658 @@
         tide = 1
         base_name, files = self.create_mux()
-        urs2sww(base_name, mean_stage=tide)
+        urs2sww(base_name
+                #, origin=(0,0,0)
+                , mean_stage=tide
+                , remove_nc_files=False
+                )
         sww_file = base_name + '.sww'
         
-        #Let's interigate the sww file 
+        #Let's interigate the sww file
+        # Note, the sww info is not gridded.  It is point data.
         fid = NetCDFFile(sww_file)
 
@@ -4666 +4672 @@
         y = fid.variables['y'][:]
         geo_reference = Geo_reference(NetCDFObject=fid)
+
         
         #Check that first coordinate is correctly represented       
@@ -4673 +4680 @@
         assert allclose(geo_reference.get_absolute([[x[0],y[0]]]), [e,n])
 
+        # Make x and y absolute
+        points = geo_reference.get_absolute(map(None, x, y))
+        points = ensure_numeric(points)
+        x = points[:,0]
+        y = points[:,1]
+        
         #Check first value
         stage = fid.variables['stage'][:]
         xmomentum = fid.variables['xmomentum'][:]
         ymomentum = fid.variables['ymomentum'][:]
-
-        #print ymomentum
+        elevation = fid.variables['elevation'][:]
         assert allclose(stage[0,0], e +tide)  #Meters
 
@@ -4688 +4700 @@
         answer = n*(e+tide+n)
         actual = xmomentum[0,0]
-        #print "answer",answer
-        #print "actual",actual 
         assert allclose(answer, actual)  #Meters
+
+        # check the stage values, first time step.
+        # These arrays are equal since the Easting values were used as
+        # the stage
+        assert allclose(stage[0], x +tide)  #Meters
+
+        # check the elevation values.
+        # -ve since urs measures depth, sww meshers height,
+        # these arrays are equal since the northing values were used as
+        # the elevation
+        assert allclose(-elevation, y)  #Meters
+
         
         fid.close()
@@ -4698 +4720 @@
         os.remove(sww_file)
         
-    def bad_test_assuming_theres_a_mux_file(self):
-        # these mux files aren't in the repository, plus they are bad!
-        base_name = 'o-z-mux' 
-        base_name = 'o-e-mux'
-        file_name = base_name + '.nc'
-        lonlatdep_numeric, lon, lat, depth = \
-                           _binary_c2nc(base_name, file_name, 'HA')
-        
-        #os.remove(file_name)
         
     def test_lon_lat2grid(self):
@@ -4779 +4792 @@
 if __name__ == "__main__":
     #suite = unittest.makeSuite(Test_Data_Manager,'test_lon')
-    #suite = unittest.makeSuite(Test_Data_Manager,'trial')
+    #suite = unittest.makeSuite(Test_Data_Manager,'test_urs2sww')
     suite = unittest.makeSuite(Test_Data_Manager,'test')
     runner = unittest.TextTestRunner()