Changeset 4666 for anuga_core/source/anuga/shallow_water

Timestamp:

Aug 8, 2007, 2:29:01 PM (18 years ago)

Author:

duncan

Message:

unverified solution to ticket#176

File:

• anuga_core/source/anuga/shallow_water/benchmark_sww2dem.py (modified) (5 diffs)

anuga_core/source/anuga/shallow_water/benchmark_sww2dem.py

@@ -22 +22 @@
 import profile , pstats
 import tempfile
+import gc
+
 from Scientific.IO.NetCDF import NetCDFFile
 from Numeric import array
@@ -27 +29 @@
 from anuga.fit_interpolate.interpolate import Interpolate
 from anuga.fit_interpolate.fit import Fit
-from anuga.pmesh.mesh import Mesh
 from anuga.geospatial_data.geospatial_data import Geospatial_data
 from anuga.shallow_water import Domain
@@ -56 +57 @@
 
 
-class Benchmarksww2dem:
 
+def trial(vert_rows,
+          vert_columns,
+          output_quantities=['elevation'],
+          save=False,
+          verbose=False,
+          run_profile=False):
+    import time
+  
+    sww_file_name = build_sww(vert_rows, vert_columns, save=save)
+        
+    #Initial time and memory
+    t0 = time.time()
+    #m0 = None on windows
+    m0 = mem_usage()
+    #print "m0", m0
+
+    fileout = export_grid(sww_file_name, quantities=output_quantities)
+        
+    time_taken_sec = (time.time()-t0)
+    m1 = mem_usage()
+    #print "m1", m1
+    if m0 is None or m1 is None:
+        memory_used = None
+    else:
+        memory_used = (m1 - m0)
+    return time_taken_sec, memory_used, m0, m1
+
+def build_sww(vert_rows, vert_columns, save):
     """
-
-    Note(DSG-DSG): If you are interested in benchmarking fitting, before
-    and after blocking O:\1\dgray\before_blocking_subsandpit is before blocking
-
+    Build an sww file we can read. 
+    verts_rows and vert_columns have to be greater that 1
     """
-
-    def __init__(self):
-        pass
-
-    def trial(self,
-              vert_rows,
-              vert_columns,
-              output_quantities=['elevation'],
-              save=False,
-              verbose=False,
-              run_profile=False):
-  
-        import time
+    from anuga.pmesh.mesh import Mesh
+    m = Mesh()
+    m.build_grid(vert_rows, vert_columns)
+    if save is True:
+            m.export_mesh_file("aaaa.tsh")
+    mesh_dict =  m.Mesh2IOTriangulationDict()
+    
+    sww_fileName = tempfile.mktemp(".sww" )
+    # sww_fileName = "aa.sww" 
+    elevation = array(range(len(mesh_dict["vertices"])))
+    stage = elevation
+    ymomentum = elevation
+    xmomentum = elevation
         
-        sww_file_name = self._build_sww(vert_rows, vert_columns, save=save)
+    # NetCDF file definition
+    fid = NetCDFFile(sww_fileName, 'w')
+    sww = Write_sww()
+    sww.header(fid, 0,
+               len(mesh_dict['triangles']),
+               len(mesh_dict["vertices"]))
+    sww.triangulation(fid,
+                      mesh_dict["vertices"], mesh_dict['triangles'],
+                      elevation)
         
-        #Initial time and memory
-        t0 = time.time()
-        #m0 = None on windows
-        m0 = mem_usage()
-        #print "m0", m0
-
-        fileout = export_grid(sww_file_name, quantities=output_quantities)
-        
-        time_taken_sec = (time.time()-t0)
-        m1 = mem_usage()
-        #print "m1", m1
-        if m0 is None or m1 is None:
-            memory_used = None
-        else:
-            memory_used = (m1 - m0)
-        #print 'That took %.2f seconds' %time_taken_sec
-        return time_taken_sec, memory_used, m0, m1
-
-    def _build_sww(self, vert_rows, vert_columns, save):
-        """
-        Build an sww file we can read. 
-        verts_rows and vert_columns have to be greater that 1
-        """
-        m = Mesh()
-        m.build_grid(vert_rows, vert_columns)
-        if save is True:
-            m.export_mesh_file("aaaa.tsh")
-        mesh_dict =  m.Mesh2IOTriangulationDict()
-        
-        sww_fileName = tempfile.mktemp(".sww" )
-        # sww_fileName = "aa.sww" 
-        elevation = array(range(len(mesh_dict["vertices"])))
-        stage = elevation
-        ymomentum = elevation
-        xmomentum = elevation
-        
-        # NetCDF file definition
-        fid = NetCDFFile(sww_fileName, 'w')
-        sww = Write_sww()
-        sww.header(fid, 0,
-                   len(mesh_dict['triangles']),
-                   len(mesh_dict["vertices"]))
-        sww.triangulation(fid,
-                   mesh_dict["vertices"], mesh_dict['triangles'],
-                          elevation)
-        
-        for time_step in range(10):
-            sww.quantities(fid, 
-                           time=time_step,
-                           stage=stage,
-                           xmomentum=xmomentum,
-                           ymomentum=ymomentum)     
-        #Close
-        fid.close()
-        return sww_fileName
+    for time_step in range(10):
+        sww.quantities(fid, 
+                       time=time_step,
+                       stage=stage,
+                       xmomentum=xmomentum,
+                       ymomentum=ymomentum)     
+    #Close
+    fid.close()
+    del mesh_dict
+    del Mesh
+    return sww_fileName
     
 #-------------------------------------------------------------
 if __name__ == "__main__":
-    b = Benchmarksww2dem() 
     delimiter = ','
 
     ofile = 'lbm_resultsII.csv'
     run_profile = False #True
-    size_list = [[4,5],[50,40]]
+    size_list = [[4,5],[5,40]]
+    #size_list = [[5,4]]
 
     quantitiy_list = [['elevation'],
@@ -165 +155 @@
             #sys.gettotalrefcount()
             #sys.getobjects() 
-            time, mem, m0, m1 = b.trial(size[0]
+            gc.collect()
+            #print " gc.get_objects() ", gc.get_objects() 
+            time, mem, m0, m1 = trial(size[0]
                                         ,size[1]
                                         ,output_quantities=quantitiy
@@ -172 +164 @@
             print "time",time
             print "mem", mem
+            gc.collect()
+            print "mem", mem
+            print " gc.get_objects() ", gc.get_objects() 
             #sys.gettotalrefcount() 
             fd.write(str(size[0]*size[1]) + delimiter +