Changeset 994

Timestamp:

Mar 3, 2005, 4:03:23 PM (20 years ago)

Author:

ole

Message:

Removed generated garbage from testings

Location:

inundation/ga/storm_surge/pyvolution

Files:

• data_manager.py (modified) (2 diffs)
• test_data_manager.py (modified) (15 diffs)
• test_least_squares.py (modified) (1 diff)
• test_util.py (modified) (2 diffs)
• util.py (modified) (1 diff)

inundation/ga/storm_surge/pyvolution/data_manager.py

@@ -1238 +1238 @@
     #print file_h.variables.keys()    
 
+    file_h.close()
+    file_u.close()
+    file_v.close()    
+
+
     if verbose: print 'Store to SWW file %s' %swwname
     # NetCDF file definition
@@ -1404 +1409 @@
     #print "min(stage.flat), mpythonax(stage.flat)",min(stage.flat), max(stage.flat)
     #print "min(stage)",min(stage)
+
+    fid.close()
+    
     return [min(x),max(x),min(y),max(y),min(stage.flat),max(stage.flat)]
 

inundation/ga/storm_surge/pyvolution/test_data_manager.py

@@ -135 +135 @@
         from Scientific.IO.NetCDF import NetCDFFile        
 
-        self.domain.filename = 'datatest' + str(time.time())
+        self.domain.filename = 'datatest' + str(id(self))
         self.domain.format = 'sww'
         self.domain.smooth = False
@@ -182 +182 @@
         from Scientific.IO.NetCDF import NetCDFFile        
 
-        self.domain.filename = 'datatest' + str(time.time())
+        self.domain.filename = 'datatest' + str(id(self))        
         self.domain.format = 'sww'
         self.domain.smooth = True
@@ -239 +239 @@
         from Scientific.IO.NetCDF import NetCDFFile        
 
-        self.domain.filename = 'datatest' + str(time.time())
+        self.domain.filename = 'datatest' + str(id(self))
         self.domain.format = 'sww'
         self.domain.smooth = True
@@ -294 +294 @@
         from Scientific.IO.NetCDF import NetCDFFile
 
-        self.domain.filename = 'datatest' + str(time.time())
+        self.domain.filename = 'datatest' + str(id(self))        
         self.domain.format = 'sww'
         self.domain.smooth = True
@@ -352 +352 @@
         from Scientific.IO.NetCDF import NetCDFFile
 
-        self.domain.filename = 'datatest' + str(time.time())
+        self.domain.filename = 'datatest' + str(id(self))        
         self.domain.format = 'sww'
         self.domain.smooth = True
@@ -444 +444 @@
         from Scientific.IO.NetCDF import NetCDFFile        
 
-        self.domain.filename = 'datatest' + str(time.time())
+        self.domain.filename = 'datatest' + str(id(self))                
         self.domain.format = 'sww'
         self.domain.smooth = True
@@ -489 +489 @@
 #         print "****************************"
 
-
-        
         
         fid.close()
@@ -634 +632 @@
         #Check fourth value
         assert allclose(stage[0,3], fourth_value/100)  #Meters        
+
+        fid.close()
+
+        #Cleanup
+        import os
+        os.remove('small.sww')
+
         
 
@@ -692 +697 @@
         assert allclose(stage[time_index, linear_point_index], test_value/100)
 
+        fid.close()
+
+        #Cleanup
+        import os
+        os.remove('small.sww')
+
+
+
         
     def test_sww_extent(self):
@@ -701 +714 @@
         from Scientific.IO.NetCDF import NetCDFFile        
 
-        self.domain.filename = 'datatest' + str(time.time())
+        self.domain.filename = 'datatest' + str(id(self))                        
         self.domain.format = 'sww'
         self.domain.smooth = True
@@ -723 +736 @@
         [xmin, xmax, ymin, ymax, stagemin, stagemax] = \
                extent_sww(file_and_extension_name )
-        #print "[xmin, xmax, ymin, ymax, stagemin, stagemax]",[xmin, xmax, ymin, ymax, stagemin, stagemax] 
+        
         assert allclose(xmin, 0.0) 
         assert allclose(xmax, 1.0) 
@@ -730 +743 @@
         assert allclose(stagemin, -0.85) 
         assert allclose(stagemax, 0.15)
+
+
+        #Cleanup
+        os.remove(sww.filename)
+        
         
     def test_ferret2sww_nz_origin(self):
@@ -738 +756 @@
         ferret2sww('small', verbose=False,
                    origin = (56, 100000, 200000, 500000, 10000000))
- 
+
 
         #Work out the UTM coordinates for first point
@@ -744 +762 @@
 
         #Read output file 'small.sww'
-        fid = NetCDFFile('small.sww')
+        fid = NetCDFFile('small.sww', 'r')
 
         x = fid.variables['x'][:]
@@ -753 +771 @@
         assert allclose(y[0], n-200000)
 
+        fid.close()
+
+        #Cleanup
+        import os
+        os.remove('small.sww')
 
         

inundation/ga/storm_surge/pyvolution/test_least_squares.py

@@ -1057 +1057 @@
         os.remove(mesh_file)
         os.remove(point_file)
+        os.remove(mesh_output_file)        
         
     def test_fit_to_mesh_fileII(self):

inundation/ga/storm_surge/pyvolution/test_util.py

@@ -536 +536 @@
         domain1.store = True    
         domain1.set_datadir('.')
-        domain1.set_name('spatio_temporal_boundary_source' + str(time.time()))
+        domain1.set_name('spatio_temporal_boundary_source_%d' %(id(self)))
         domain1.quantities_to_be_stored = ['stage', 'xmomentum', 'ymomentum']
                 
@@ -696 +696 @@
         
         fid.close()
-
+        import os
+        os.remove(filename)
+        
 
     def test_xya_ascii(self):

inundation/ga/storm_surge/pyvolution/util.py

@@ -297 +297 @@
 
                     
-                print '  Interpolation points (xi, eta):'
-                print '    xi in [%f, %f], len(xi) == %d'\
-                      %(min(P[:,0]), max(P[:,0]), P.shape[0])
-                print '    eta in [%f, %f], len(eta) == %d'\
-                      %(min(P[:,1]), max(P[:,1]), P.shape[1])
+                print '  Interpolation points (xi, eta):'\
+                      'number of points == %d ' %P.shape[0]
+                print '    xi in [%f, %f]' %(min(P[:,0]), max(P[:,0]))
+                print '    eta in [%f, %f]' %(min(P[:,1]), max(P[:,1]))
                 print '  Interpolated quantities:'
                 for name in self.quantities: