enclassify the profile stuff -- there is now a TimerCollection that

holds instances of the Timer class.

Author: Michael Zingale

advection/simulation.py

@@ -4,10 +4,11 @@
 from advection.problems import *
 from advectiveFluxes import *
 import mesh.patch as patch
+from util import profile
 
 class Simulation:
 
-    def __init__(self, problem_name, rp):
+    def __init__(self, problem_name, rp, timers=None):
 
         self.rp = rp
         self.cc_data = None
@@ -16,6 +17,12 @@ def __init__(self, problem_name, rp):
 
         self.problem_name = problem_name
 
+        if timers == None:
+            self.tc = profile.TimerCollection()
+        else:
+            self.tc = timers
+        
+
 
     def initialize(self):
         """ 

compressible/simulation.py

@@ -34,7 +34,7 @@ def __init__(self, idens=-1, ixmom=-1, iymom=-1, iener=-1):
 
 class Simulation:
 
-    def __init__(self, problem_name, rp):
+    def __init__(self, problem_name, rp, timers=None):
 
         self.rp = rp
         self.cc_data = None
@@ -44,6 +44,11 @@ def __init__(self, problem_name, rp):
 
         self.SMALL = 1.e-12
 
+        if timers == None:
+            self.tc = profile.TimerCollection()
+        else:
+            self.tc = timers
+
 
     def initialize(self):
         """ 
@@ -183,8 +188,8 @@ def evolve(self, dt):
         Evolve the equations of compressible hydrodynamics through a timestep dt
         """
 
-        pf = profile.timer("evolve")
-        pf.begin()
+        tm_evolve = self.tc.timer("evolve")
+        tm_evolve.begin()
 
         dens = self.cc_data.get_var("density")
         xmom = self.cc_data.get_var("x-momentum")
@@ -195,7 +200,7 @@ def evolve(self, dt):
 
         myg = self.cc_data.grid
 
-        Flux_x, Flux_y = unsplitFluxes(self.cc_data, self.rp, self.vars, dt)
+        Flux_x, Flux_y = unsplitFluxes(self.cc_data, self.rp, self.vars, self.tc, dt)
 
         old_dens = dens.copy()
         old_ymom = ymom.copy()
@@ -217,7 +222,7 @@ def evolve(self, dt):
         ymom += 0.5*dt*(dens + old_dens)*grav
         ener += 0.5*dt*(ymom + old_ymom)*grav
 
-        pf.end()
+        tm_evolve.end()
 
 
     def dovis(self, n):

compressible/unsplitFluxes.py

@@ -129,9 +129,8 @@
 import eos
 import interface_f
 import mesh.reconstruction_f as reconstruction_f
-from util import profile
 
-def unsplitFluxes(my_data, rp, vars, dt):
+def unsplitFluxes(my_data, rp, vars, tc, dt):
     """
     unsplitFluxes returns the fluxes through the x and y interfaces by
     doing an unsplit reconstruction of the interface values and then
@@ -142,8 +141,8 @@ def unsplitFluxes(my_data, rp, vars, dt):
     grav is the gravitational acceleration in the y-direction            
     """
 
-    pf = profile.timer("unsplitFluxes")
-    pf.begin()
+    tm_flux = tc.timer("unsplitFluxes")
+    tm_flux.begin()
 
     myg = my_data.grid
 
@@ -197,8 +196,8 @@ def unsplitFluxes(my_data, rp, vars, dt):
     #=========================================================================
 
     # monotonized central differences in x-direction
-    pfa = profile.timer("limiting")
-    pfa.begin()
+    tm_limit = tc.timer("limiting")
+    tm_limit.begin()
 
     limiter = rp.get_param("compressible.limiter")
     if limiter == 0:
@@ -213,11 +212,11 @@ def unsplitFluxes(my_data, rp, vars, dt):
     ldelta_v = xi*limitFunc(1, v, myg.qx, myg.qy, myg.ng)
     ldelta_p = xi*limitFunc(1, p, myg.qx, myg.qy, myg.ng)
 
-    pfa.end()
+    tm_limit.end()
 
     # left and right primitive variable states
-    pfb = profile.timer("interfaceStates")
-    pfb.begin()
+    tm_states = tc.timer("interfaceStates")
+    tm_states.begin()
 
     gamma = rp.get_param("eos.gamma")
 
@@ -230,7 +229,7 @@ def unsplitFluxes(my_data, rp, vars, dt):
                                   r, u, v, p,
                                   ldelta_r, ldelta_u, ldelta_v, ldelta_p) 
 
-    pfb.end()
+    tm_states.end()
 
 
     # transform interface states back into conserved variables
@@ -256,25 +255,25 @@ def unsplitFluxes(my_data, rp, vars, dt):
     #=========================================================================
 
     # monotonized central differences in y-direction
-    pfa.begin()
+    tm_limit.begin()
 
     ldelta_r = xi*limitFunc(2, r, myg.qx, myg.qy, myg.ng)
     ldelta_u = xi*limitFunc(2, u, myg.qx, myg.qy, myg.ng)
     ldelta_v = xi*limitFunc(2, v, myg.qx, myg.qy, myg.ng)
     ldelta_p = xi*limitFunc(2, p, myg.qx, myg.qy, myg.ng)
 
-    pfa.end()
+    tm_limit.end()
 
     # left and right primitive variable states
-    pfb.begin()
+    tm_states.begin()
 
     V_l, V_r = interface_f.states(2, myg.qx, myg.qy, myg.ng, myg.dy, dt,
                                   vars.nvar,
                                   gamma,
                                   r, u, v, p,
                                   ldelta_r, ldelta_u, ldelta_v, ldelta_p)                                    
 
-    pfb.end()
+    tm_states.end()
 
 
     # transform interface states back into conserved variables
@@ -331,8 +330,8 @@ def unsplitFluxes(my_data, rp, vars, dt):
     #=========================================================================
     # compute transverse fluxes
     #=========================================================================
-    pfc = profile.timer("riemann")
-    pfc.begin()
+    tm_riem = tc.timer("riemann")
+    tm_riem.begin()
 
     riemann = rp.get_param("compressible.riemann")
 
@@ -352,7 +351,7 @@ def unsplitFluxes(my_data, rp, vars, dt):
                       vars.nvar, vars.idens, vars.ixmom, vars.iymom, vars.iener, 
                       gamma, U_yl, U_yr)
 
-    pfc.end()
+    tm_riem.end()
 
     #=========================================================================
     # construct the interface values of U now
@@ -401,8 +400,8 @@ def unsplitFluxes(my_data, rp, vars, dt):
                                        
     """
 
-    pfd = profile.timer("transverse flux addition")
-    pfd.begin()
+    tm_transverse = tc.timer("transverse flux addition")
+    tm_transverse.begin()
 
     # U_xl[i,j,:] = U_xl[i,j,:] - 0.5*dt/dy * (F_y[i-1,j+1,:] - F_y[i-1,j,:])
     U_xl[myg.ilo-2:myg.ihi+2,myg.jlo-2:myg.jhi+2,:] += \
@@ -424,7 +423,7 @@ def unsplitFluxes(my_data, rp, vars, dt):
         - 0.5*dt/myg.dx * (F_x[myg.ilo-1:myg.ihi+3,myg.jlo-2:myg.jhi+2,:] - \
                            F_x[myg.ilo-2:myg.ihi+2,myg.jlo-2:myg.jhi+2,:])
 
-    pfd.end()
+    tm_transverse.end()
 
 
     #=========================================================================
@@ -434,7 +433,7 @@ def unsplitFluxes(my_data, rp, vars, dt):
     # up until now, F_x and F_y stored the transverse fluxes, now we
     # overwrite with the fluxes normal to the interfaces
 
-    pfc.begin()
+    tm_riem.begin()
 
     F_x = riemannFunc(1, myg.qx, myg.qy, myg.ng, 
                       vars.nvar, vars.idens, vars.ixmom, vars.iymom, vars.iener, 
@@ -444,7 +443,7 @@ def unsplitFluxes(my_data, rp, vars, dt):
                       vars.nvar, vars.idens, vars.ixmom, vars.iymom, vars.iener, 
                       gamma, U_yl, U_yr)
 
-    pfc.end()
+    tm_riem.end()
 
     #=========================================================================
     # apply artificial viscosity
@@ -500,7 +499,7 @@ def unsplitFluxes(my_data, rp, vars, dt):
 
 
 
-    pf.end()
+    tm_flux.end()
 
     return F_x, F_y
 

diffusion/simulation.py

@@ -4,17 +4,22 @@
 from diffusion.problems import *
 import mesh.patch as patch
 import multigrid.multigrid as multigrid
-from util import msg, runparams
+from util import msg, profile, runparams
 
 class Simulation:
 
-    def __init__(self, problem_name, rp):
+    def __init__(self, problem_name, rp, timers=None):
 
         self.rp = rp
         self.cc_data = None
 
         self.problem_name = problem_name
 
+        if timers == None:
+            self.tc = profile.TimerCollection()
+        else:
+            self.tc = timers
+
 
     def initialize(self):
         """ 

incompressible/simulation.py

@@ -6,16 +6,22 @@
 import mesh.reconstruction_f as reconstruction_f
 import mesh.patch as patch
 import multigrid.multigrid as multigrid
+from util import profile
 
 class Simulation:
 
-    def __init__(self, problem_name, rp):
+    def __init__(self, problem_name, rp, timers=None):
 
         self.rp = rp
         self.cc_data = None
 
         self.problem_name = problem_name
 
+        if timers == None:
+            self.tc = profile.TimerCollection()
+        else:
+            self.tc = timers
+
 
     def initialize(self):
         """ 

pyro.py

@@ -3,7 +3,6 @@
 import getopt
 import os
 import sys
-import time
 
 import numpy
 import pylab
@@ -54,8 +53,10 @@
 
 msg.bold('pyro ...')
 
-pf = profile.timer("main")
-pf.begin()
+tc = profile.TimerCollection()
+
+tm_main = tc.timer("main")
+tm_main.begin()
 
 #-----------------------------------------------------------------------------
 # command line arguments / solver setup
@@ -151,7 +152,7 @@
 
 # initialize the Simulation object -- this will hold the grid and data and
 # know about the runtime parameters and which problem we are running
-sim = solver.Simulation(problem_name, rp)
+sim = solver.Simulation(problem_name, rp, timers=tc)
 
 sim.initialize()
 sim.preevolve()
@@ -186,10 +187,10 @@
 while sim.cc_data.t < tmax and n < max_steps:
 
     # fill boundary conditions
-    pfb = profile.timer("fill_bc")
-    pfb.begin()
+    tm_bc = tc.timer("fill_bc")
+    tm_bc.begin()
     sim.cc_data.fill_BC_all()
-    pfb.end()
+    tm_bc.end()
 
     # get the timestep
     dt = sim.timestep()
@@ -222,21 +223,21 @@
 
     if sim.cc_data.t >= (nout + 1)*dt_out or n%n_out == 0:
 
-        pfc = profile.timer("output")
-        pfc.begin()
+        tm_io = tc.timer("output")
+        tm_io.begin()
 
         msg.warning("outputting...")
         basename = rp.get_param("io.basename")
         sim.cc_data.write(basename + "%4.4d" % (n))
         nout += 1
 
-        pfc.end()
+        tm_io.end()
 
 
     # visualization
     if dovis: 
-        pfd = profile.timer("vis")
-        pfd.begin()
+        tm_vis = tc.timer("vis")
+        tm_vis.begin()
 
         sim.dovis(n)
         store = rp.get_param("vis.store_images")
@@ -245,9 +246,9 @@
             basename = rp.get_param("io.basename")
             pylab.savefig(basename + "%4.4d" % (n) + ".png")
 
-        pfd.end()
+        tm_vis.end()
 
-pf.end()
+tm_main.end()
 
 
 #-----------------------------------------------------------------------------
@@ -278,7 +279,7 @@
 # final reports
 #-----------------------------------------------------------------------------
 rp.print_unused_params()
-profile.timeReport()
+tc.report()
 
 sim.finalize()