remove the hack of the runtime parameters living in the CellCenterData2d

object -- they now live in the Simulation object.  Also initData -> init_data

Author: Michael Zingale

advection/advectiveFluxes.py

@@ -2,7 +2,7 @@
 
 import mesh.reconstruction_f as reconstruction_f
 
-def unsplitFluxes(my_data, dt, scalar_name):
+def unsplitFluxes(my_data, rp, dt, scalar_name):
     """
     Construct the fluxes through the interfaces for the linear advection 
     equation:
@@ -52,7 +52,6 @@ def unsplitFluxes(my_data, dt, scalar_name):
     """
 
     my_grid = my_data.grid
-    rp = my_data.rp
 
     a = my_data.get_var(scalar_name)
 

advection/problems/smooth.py

@@ -3,13 +3,11 @@
 import numpy
 from util import msg
 
-def initData(my_data):
+def init_data(my_data, rp):
     """ initialize the smooth advection problem """
 
     msg.bold("initializing the smooth advection problem...")
 
-    rp = my_data.rp
-
     # make sure that we are passed a valid patch object
     if not isinstance(my_data, patch.CellCenterData2d):
         print "ERROR: patch invalid in smooth.py"

advection/problems/tophat.py

@@ -3,7 +3,7 @@
 import numpy
 from util import msg
 
-def initData(my_data):
+def init_data(my_data, rp):
     """ initialize the tophat advection problem """
 
     msg.bold("initializing the tophat advection problem...")

advection/simulation.py

@@ -52,7 +52,7 @@ def initialize(self):
         bc = patch.BCObject(xlb=xlb_type, xrb=xrb_type, 
                             ylb=ylb_type, yrb=yrb_type)
 
-        my_data = patch.CellCenterData2d(my_grid, runtime_parameters=self.rp)
+        my_data = patch.CellCenterData2d(my_grid)
 
         my_data.register_var("density", bc)
 
@@ -61,7 +61,7 @@ def initialize(self):
         self.cc_data = my_data
 
         # now set the initial conditions for the problem
-        exec self.problem_name + '.initData(self.cc_data)'
+        exec self.problem_name + '.init_data(self.cc_data, self.rp)'
 
 
     def timestep(self):
@@ -109,7 +109,7 @@ def evolve(self, dt):
         dtdx = dt/self.cc_data.grid.dx
         dtdy = dt/self.cc_data.grid.dy
 
-        flux_x, flux_y =  unsplitFluxes(self.cc_data, dt, "density")
+        flux_x, flux_y =  unsplitFluxes(self.cc_data, self.rp, dt, "density")
 
         """
         do the differencing for the fluxes now.  Here, we use slices so we

analysis/smooth_error.py

@@ -39,7 +39,7 @@ def abort(string):
 analytic.create()
 
 # use the original initialization routine to set the analytic solution
-smooth.initData(analytic)
+smooth.init_data(analytic, None)
 
 # compare the error
 dens_numerical = myd.get_var("density")

compressible/problems/bubble.py

@@ -3,13 +3,11 @@
 import numpy
 from util import msg
 
-def initData(my_data):
+def init_data(my_data, rp):
     """ initialize the bubble problem """
 
     msg.bold("initializing the bubble problem...")
 
-    rp = my_data.rp
-
     # make sure that we are passed a valid patch object
     if not isinstance(my_data, patch.CellCenterData2d):
         print "ERROR: patch invalid in bubble.py"

compressible/problems/kh.py

@@ -4,13 +4,11 @@
 from util import msg
 import math
 
-def initData(my_data):
+def init_data(my_data, rp):
     """ initialize the Kelvin-Helmholtz problem """
 
     msg.bold("initializing the sedov problem...")
 
-    rp = my_data.rp
-
     # make sure that we are passed a valid patch object
     if not isinstance(my_data, patch.CellCenterData2d):
         print my_data.__class__

compressible/problems/quad.py

@@ -3,13 +3,11 @@
 import numpy
 from util import msg
 
-def initData(my_data):
+def init_data(my_data, rp):
     """ initialize the quadrant problem """
 
     msg.bold("initializing the quadrant problem...")
 
-    rp = my_data.rp
-
     # make sure that we are passed a valid patch object
     if not isinstance(my_data, patch.CellCenterData2d):
         print "ERROR: patch invalid in quad.py"

compressible/problems/rt.py

@@ -5,13 +5,11 @@
 import mesh.patch as patch
 from util import msg
 
-def initData(my_data):
+def init_data(my_data, rp):
     """ initialize the rt problem """
 
     msg.bold("initializing the rt problem...")
 
-    rp = my_data.rp
-
     # make sure that we are passed a valid patch object
     if not isinstance(my_data, patch.CellCenterData2d):
         print "ERROR: patch invalid in rt.py"

compressible/problems/sedov.py

@@ -4,13 +4,11 @@
 from util import msg
 import math
 
-def initData(my_data):
+def init_data(my_data, rp):
     """ initialize the sedov problem """
 
     msg.bold("initializing the sedov problem...")
 
-    rp = my_data.rp
-
     # make sure that we are passed a valid patch object
     if not isinstance(my_data, patch.CellCenterData2d):
         print "ERROR: patch invalid in sedov.py"