Changeset 3694

Timestamp:

Oct 4, 2006, 4:04:07 PM (18 years ago)

Author:

duncan

Message:

In ferret2sww set default of inverted_bathymetry to True

Location:

anuga_core/source/anuga/shallow_water

Files:

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

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -2530 +2530 @@
                NaN_filler = 0,
                elevation = None,
-               inverted_bathymetry = False
+               inverted_bathymetry = True
                ): #FIXME: Bathymetry should be obtained
                                   #from MOST somehow.
@@ -2585 +2585 @@
     #Get NetCDF data
     if verbose: print 'Reading files %s_*.nc' %basename_in
+    #print "basename_in + '_ha.nc'",basename_in + '_ha.nc' 
     file_h = NetCDFFile(basename_in + '_ha.nc', 'r') #Wave amplitude (cm)
     file_u = NetCDFFile(basename_in + '_ua.nc', 'r') #Velocity (x) (cm/s)

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -2442 +2442 @@
         #Call conversion (with zero origin)
         ferret2sww('test', verbose=False,
-                   origin = (56, 0, 0))
+                   origin = (56, 0, 0), inverted_bathymetry=False)
 
         os.remove('test_va.nc')
@@ -2605 +2605 @@
 
         #Call conversion (with zero origin)
-        ferret2sww('test', verbose=False, origin = (56, 0, 0))
+        ferret2sww('test', verbose=False, origin = (56, 0, 0)
+                   , inverted_bathymetry=False)
 
         os.remove('test_va.nc')