Changeset 2074

Timestamp:

Nov 25, 2005, 12:25:50 PM (19 years ago)

Author:

duncan

Message:

Removing file leaks in tests, moving tsh2sww to data_manager

Location:

inundation/pyvolution

Files:

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

inundation/pyvolution/data_manager.py

@@ -3338 +3338 @@
 #***************
 
+
+def tsh2sww(filename, verbose=False): #test_tsh2sww
+    """
+    to check if a tsh/msh file 'looks' good.
+    """
+
+    #FIXME Move to data_manager
+    from shallow_water import Domain
+    from pmesh2domain import pmesh_to_domain_instance
+    import time, os
+    from data_manager import get_dataobject
+    from os import sep, path
+    from util import mean
+
+    if verbose == True:print 'Creating domain from', filename
+    domain = pmesh_to_domain_instance(filename, Domain)
+    if verbose == True:print "Number of triangles = ", len(domain)
+
+    domain.smooth = True
+    domain.format = 'sww'   #Native netcdf visualisation format
+    file_path, filename = path.split(filename)
+    filename, ext = path.splitext(filename)
+    domain.filename = filename
+    domain.reduction = mean
+    if verbose == True:print "file_path",file_path
+    if file_path == "":file_path = "."
+    domain.set_datadir(file_path)
+
+    if verbose == True:
+        print "Output written to " + domain.get_datadir() + sep + \
+              domain.filename + "." + domain.format
+    sww = get_dataobject(domain)
+    sww.store_connectivity()
+    sww.store_timestep('stage')
+
+
 def asc_csiro2sww(bath_dir,
                   elevation_dir,

inundation/pyvolution/test_combine_pts.py

@@ -87 +87 @@
         #clean up
         os.remove(out_file)
+        #os.remove(fine_file)
 
     def test_combine_rectangular_points_filesII(self):
@@ -194 +195 @@
         os.remove(fine_file)
         os.remove(coarse_file)
+        #os.remove(out_file)
       
     def test_reduce_points_to_mesh_extent(self):
@@ -265 +267 @@
                          'final number of points wrong. failed.')
         assert allclose(results['attributelist']['elevation'], answer)
+       
+        #clean up
+        os.remove(points_file)
+        os.remove(mesh_file)
         
         #clean up

inundation/pyvolution/test_data_manager.py

@@ -2923 +2923 @@
         os.remove(elevation_dir_filename2)
         os.rmdir(elevation_dir)
+        
+        os.remove(ucur_dir_filename1)
+        os.remove(ucur_dir_filename2)
+        os.rmdir(ucur_dir)
+        
+        os.remove(vcur_dir_filename1)
+        os.remove(vcur_dir_filename2)
+        os.rmdir(vcur_dir)
 
 
@@ -3041 +3049 @@
             os.remove(elevation_dir_filename2)
             os.rmdir(elevation_dir)
+        
+            os.remove(ucur_dir_filename1)
+            os.remove(ucur_dir_filename2)
+            os.rmdir(ucur_dir)
+        
+            os.remove(vcur_dir_filename1)
+            os.remove(vcur_dir_filename2)
+            os.rmdir(vcur_dir)
         else:
             #tidy up
@@ -3050 +3066 @@
             os.rmdir(elevation_dir)
             raise 'Should raise exception'
+        
+            os.remove(ucur_dir_filename1)
+            os.remove(ucur_dir_filename2)
+            os.rmdir(ucur_dir)
+        
+            os.remove(vcur_dir_filename1)
+            os.remove(vcur_dir_filename2)
+            os.rmdir(vcur_dir)
+
         
      
@@ -3209 +3234 @@
         os.remove(elevation_dir_filename2)
         os.rmdir(elevation_dir)
-
+        
+        os.remove(ucur_dir_filename1)
+        os.remove(ucur_dir_filename2)
+        os.rmdir(ucur_dir)
+        
+        os.remove(vcur_dir_filename1)
+        os.remove(vcur_dir_filename2)
+        os.rmdir(vcur_dir)
 
         # remove sww file
@@ -3404 +3436 @@
         os.remove(elevation_dir_filename2)
         os.rmdir(elevation_dir)
+        
+        os.remove(ucur_dir_filename1)
+        os.remove(ucur_dir_filename2)
+        os.rmdir(ucur_dir)
+        
+        os.remove(vcur_dir_filename1)
+        os.remove(vcur_dir_filename2)
+        os.rmdir(vcur_dir)
+
 
       
@@ -3608 +3649 @@
                          'failed')
         
+    def test_tsh2sww(self):
+        import os
+        import tempfile
+        
+        tsh_file = tempfile.mktemp(".tsh")
+        file = open(tsh_file,"w")
+        file.write("4 3 # <vertex #> <x> <y> [attributes]\n \
+0 0.0 0.0 0.0 0.0 0.01 \n \
+1 1.0 0.0 10.0 10.0 0.02  \n \
+2 0.0 1.0 0.0 10.0 0.03  \n \
+3 0.5 0.25 8.0 12.0 0.04  \n \
+# Vert att title  \n \
+elevation  \n \
+stage  \n \
+friction  \n \
+2 # <triangle #> [<vertex #>] [<neigbouring triangle #>]  \n\
+0 0 3 2 -1  -1  1 dsg\n\
+1 0 1 3 -1  0 -1   ole nielsen\n\
+4 # <segment #> <vertex #>  <vertex #> [boundary tag] \n\
+0 1 0 2 \n\
+1 0 2 3 \n\
+2 2 3 \n\
+3 3 1 1 \n\
+3 0 # <x> <y> [attributes] ...Mesh Vertices... \n \
+0 216.0 -86.0 \n \
+1 160.0 -167.0 \n \
+2 114.0 -91.0 \n \
+3 # <vertex #>  <vertex #> [boundary tag] ...Mesh Segments... \n \
+0 0 1 0 \n \
+1 1 2 0 \n \
+2 2 0 0 \n \
+0 # <x> <y> ...Mesh Holes... \n \
+0 # <x> <y> <attribute>...Mesh Regions... \n \
+0 # <x> <y> <attribute>...Mesh Regions, area... \n\
+#Geo reference \n \
+56 \n \
+140 \n \
+120 \n")
+        file.close()
+
+        #sww_file = tempfile.mktemp(".sww")
+        #print "sww_file",sww_file 
+        #print "sww_file",tsh_file
+        tsh2sww(tsh_file)
+
+        os.remove(tsh_file)
+        os.remove(tsh_file[:-4] + '.sww')
 #-------------------------------------------------------------
 if __name__ == "__main__":
-    #suite = unittest.makeSuite(Test_Data_Manager,'test_get_min_max_indexes3')
+    #suite = unittest.makeSuite(Test_Data_Manager,'test_tsh2sww')
     suite = unittest.makeSuite(Test_Data_Manager,'test')
     #suite = unittest.makeSuite(Test_Data_Manager,'test_sww2dem_asc_missing_points')
@@ -3619 +3707 @@
     runner = unittest.TextTestRunner()
     runner.run(suite)
+ 

inundation/pyvolution/util.py

@@ -472 +472 @@
 
 
-def tsh2sww(filename, verbose=True):
-    """
-    to check if a tsh/msh file 'looks' good.
-    """
-
-    #FIXME Move to data_manager
-    from shallow_water import Domain
-    from pmesh2domain import pmesh_to_domain_instance
-    import time, os
-    from data_manager import get_dataobject
-    from os import sep, path
-    #from util import mean
-
-    if verbose == True:print 'Creating domain from', filename
-    domain = pmesh_to_domain_instance(filename, Domain)
-    if verbose == True:print "Number of triangles = ", len(domain)
-
-    domain.smooth = True
-    domain.format = 'sww'   #Native netcdf visualisation format
-    file_path, filename = path.split(filename)
-    filename, ext = path.splitext(filename)
-    domain.filename = filename
-    domain.reduction = mean
-    if verbose == True:print "file_path",file_path
-    if file_path == "":file_path = "."
-    domain.set_datadir(file_path)
-
-    if verbose == True:
-        print "Output written to " + domain.get_datadir() + sep + \
-              domain.filename + "." + domain.format
-    sww = get_dataobject(domain)
-    sww.store_connectivity()
-    sww.store_timestep('stage')
-
-
-
 
 def multiple_replace(text, dictionary):