remove the isinstance check in the problem setups (#258)

we don't need to restrict the setups to CellCenterData2d -- FV2d
works just as well for most.

Additionally, enforcing this check is not really pythonic

Author: zingale

pyro/advection/problems/smooth.py

@@ -1,8 +1,5 @@
-import sys
-
 import numpy
 
-from pyro.mesh import patch
 from pyro.util import msg
 
 DEFAULT_INPUTS = "inputs.smooth"
@@ -16,12 +13,6 @@ def init_data(my_data, rp):
     if rp.get_param("driver.verbose"):
         msg.bold("initializing the smooth advection problem...")
 
-    # make sure that we are passed a valid patch object
-    if not isinstance(my_data, patch.CellCenterData2d):
-        print("ERROR: patch invalid in smooth.py")
-        print(my_data.__class__)
-        sys.exit()
-
     dens = my_data.get_var("density")
 
     xmin = my_data.grid.xmin

pyro/advection/problems/test.py

@@ -1,7 +1,3 @@
-import sys
-
-from pyro.mesh import patch
-
 DEFAULT_INPUTS = None
 
 PROBLEM_PARAMS = {}
@@ -11,12 +7,6 @@ def init_data(my_data, rp):
     """ an init routine for unit testing """
     del rp  # this problem doesn't use runtime params
 
-    # make sure that we are passed a valid patch object
-    if not isinstance(my_data, patch.CellCenterData2d):
-        print("ERROR: patch invalid in sedov.py")
-        print(my_data.__class__)
-        sys.exit()
-
     # get the density, momenta, and energy as separate variables
     dens = my_data.get_var("density")
 

pyro/advection/problems/tophat.py

@@ -1,6 +1,3 @@
-import sys
-
-from pyro.mesh import patch
 from pyro.util import msg
 
 DEFAULT_INPUTS = "inputs.tophat"
@@ -14,12 +11,6 @@ def init_data(myd, rp):
     if rp.get_param("driver.verbose"):
         msg.bold("initializing the tophat advection problem...")
 
-    # make sure that we are passed a valid patch object
-    if not isinstance(myd, patch.CellCenterData2d):
-        print("ERROR: patch invalid in tophat.py")
-        print(myd.__class__)
-        sys.exit()
-
     dens = myd.get_var("density")
 
     xmin = myd.grid.xmin

pyro/advection_nonuniform/problems/slotted.py

@@ -1,6 +1,5 @@
 import numpy as np
 
-from pyro.mesh import patch
 from pyro.util import msg
 
 DEFAULT_INPUTS = "inputs.slotted"
@@ -15,11 +14,6 @@ def init_data(my_data, rp):
     if rp.get_param("driver.verbose"):
         msg.bold("initializing the slotted advection problem...")
 
-    # make sure that we are passed a valid patch object
-    if not isinstance(my_data, patch.CellCenterData2d):
-        print(my_data.__class__)
-        msg.fail("ERROR: patch invalid in slotted.py")
-
     offset = rp.get_param("slotted.offset")
     omega = rp.get_param("slotted.omega")
 

pyro/advection_nonuniform/problems/test.py

@@ -1,6 +1,3 @@
-from pyro.mesh import patch
-from pyro.util import msg
-
 DEFAULT_INPUTS = None
 
 PROBLEM_PARAMS = {}
@@ -10,11 +7,6 @@ def init_data(my_data, rp):
     """ an init routine for unit testing """
     del rp  # this problem doesn't use runtime params
 
-    # make sure that we are passed a valid patch object
-    if not isinstance(my_data, patch.CellCenterData2d):
-        print(my_data.__class__)
-        msg.fail("ERROR: patch invalid in slotted.py")
-
     # get the density, momenta, and energy as separate variables
     dens = my_data.get_var("density")
 

pyro/burgers/problems/converge.py

@@ -1,8 +1,5 @@
-import sys
-
 import numpy
 
-from pyro.mesh import patch
 from pyro.util import msg
 
 DEFAULT_INPUTS = "inputs.converge.64"
@@ -14,12 +11,6 @@ def init_data(my_data, rp):
     if rp.get_param("driver.verbose"):
         msg.bold("initializing the smooth burgers convergence problem...")
 
-    # make sure that we are passed a valid patch object
-    if not isinstance(my_data, patch.CellCenterData2d):
-        print("ERROR: patch invalid in converge.py")
-        print(my_data.__class__)
-        sys.exit()
-
     u = my_data.get_var("x-velocity")
     v = my_data.get_var("y-velocity")
 

pyro/burgers/problems/test.py

@@ -1,6 +1,3 @@
-import sys
-
-from pyro.mesh import patch
 from pyro.util import msg
 
 DEFAULT_INPUTS = "inputs.test"
@@ -14,12 +11,6 @@ def init_data(myd, rp):
     if rp.get_param("driver.verbose"):
         msg.bold("initializing the burgers test problem...")
 
-    # make sure that we are passed a valid patch object
-    if not isinstance(myd, patch.CellCenterData2d):
-        print("ERROR: patch invalid in test.py")
-        print(myd.__class__)
-        sys.exit()
-
     u = myd.get_var("x-velocity")
     v = myd.get_var("y-velocity")
 

pyro/burgers/problems/tophat.py

@@ -1,6 +1,3 @@
-import sys
-
-from pyro.mesh import patch
 from pyro.util import msg
 
 DEFAULT_INPUTS = "inputs.tophat"
@@ -12,12 +9,6 @@ def init_data(myd, rp):
     if rp.get_param("driver.verbose"):
         msg.bold("initializing the tophat burgers problem...")
 
-    # make sure that we are passed a valid patch object
-    if not isinstance(myd, patch.CellCenterData2d):
-        print("ERROR: patch invalid in tophat.py")
-        print(myd.__class__)
-        sys.exit()
-
     u = myd.get_var("x-velocity")
     v = myd.get_var("y-velocity")
 

pyro/compressible/problems/acoustic_pulse.py

@@ -1,8 +1,5 @@
-import sys
-
 import numpy as np
 
-from pyro.mesh import fv, patch
 from pyro.util import msg
 
 DEFAULT_INPUTS = "inputs.acoustic_pulse"
@@ -18,12 +15,6 @@ def init_data(myd, rp):
     if rp.get_param("driver.verbose"):
         msg.bold("initializing the acoustic pulse problem...")
 
-    # make sure that we are passed a valid patch object
-    if not isinstance(myd, (patch.CellCenterData2d, fv.FV2d)):
-        print("ERROR: patch invalid in acoustic_pulse.py")
-        print(myd.__class__)
-        sys.exit()
-
     # get the density, momenta, and energy as separate variables
     dens = myd.get_var("density")
     xmom = myd.get_var("x-momentum")

pyro/compressible/problems/advect.py

@@ -1,8 +1,5 @@
-import sys
-
 import numpy as np
 
-from pyro.mesh import patch
 from pyro.util import msg
 
 DEFAULT_INPUTS = "inputs.advect.64"
@@ -16,12 +13,6 @@ def init_data(my_data, rp):
     if rp.get_param("driver.verbose"):
         msg.bold("initializing the advect problem...")
 
-    # make sure that we are passed a valid patch object
-    if not isinstance(my_data, patch.CellCenterData2d):
-        print("ERROR: patch invalid in advect.py")
-        print(my_data.__class__)
-        sys.exit()
-
     # get the density, momenta, and energy as separate variables
     dens = my_data.get_var("density")
     xmom = my_data.get_var("x-momentum")

pyro/compressible/problems/bubble.py

@@ -1,8 +1,5 @@
-import sys
-
 import numpy as np
 
-from pyro.mesh import patch
 from pyro.util import msg
 
 DEFAULT_INPUTS = "inputs.bubble"
@@ -22,12 +19,6 @@ def init_data(my_data, rp):
     if rp.get_param("driver.verbose"):
         msg.bold("initializing the bubble problem...")
 
-    # make sure that we are passed a valid patch object
-    if not isinstance(my_data, patch.CellCenterData2d):
-        print("ERROR: patch invalid in bubble.py")
-        print(my_data.__class__)
-        sys.exit()
-
     # get the density, momenta, and energy as separate variables
     dens = my_data.get_var("density")
     xmom = my_data.get_var("x-momentum")

pyro/compressible/problems/gresho.py

@@ -1,8 +1,5 @@
-import sys
-
 import numpy as np
 
-from pyro.mesh import patch
 from pyro.util import msg
 
 DEFAULT_INPUTS = "inputs.gresho"
@@ -19,12 +16,6 @@ def init_data(my_data, rp):
     if rp.get_param("driver.verbose"):
         msg.bold("initializing the Gresho vortex problem...")
 
-    # make sure that we are passed a valid patch object
-    if not isinstance(my_data, patch.CellCenterData2d):
-        print("Error: patch invalid in gresho.py")
-        print(my_data.__class__)
-        sys.exit()
-
     # get the density and velocities
     dens = my_data.get_var("density")
     xmom = my_data.get_var("x-momentum")

pyro/compressible/problems/hse.py

@@ -1,8 +1,5 @@
-import sys
-
 import numpy as np
 
-from pyro.mesh import patch
 from pyro.util import msg
 
 DEFAULT_INPUTS = "inputs.hse"
@@ -17,12 +14,6 @@ def init_data(my_data, rp):
     if rp.get_param("driver.verbose"):
         msg.bold("initializing the HSE problem...")
 
-    # make sure that we are passed a valid patch object
-    if not isinstance(my_data, patch.CellCenterData2d):
-        print("ERROR: patch invalid in hse.py")
-        print(my_data.__class__)
-        sys.exit()
-
     # get the density, momenta, and energy as separate variables
     dens = my_data.get_var("density")
     xmom = my_data.get_var("x-momentum")

pyro/compressible/problems/kh.py

@@ -1,6 +1,5 @@
 import numpy as np
 
-from pyro.mesh import patch
 from pyro.util import msg
 
 DEFAULT_INPUTS = "inputs.kh"
@@ -18,11 +17,6 @@ def init_data(my_data, rp):
     if rp.get_param("driver.verbose"):
         msg.bold("initializing the Kelvin-Helmholtz problem...")
 
-    # make sure that we are passed a valid patch object
-    if not isinstance(my_data, patch.CellCenterData2d):
-        print(my_data.__class__)
-        msg.fail("ERROR: patch invalid in kh.py")
-
     # get the density, momenta, and energy as separate variables
     dens = my_data.get_var("density")
     xmom = my_data.get_var("x-momentum")

pyro/compressible/problems/logo.py

@@ -1,9 +1,6 @@
-import sys
-
 import matplotlib.pyplot as plt
 import numpy as np
 
-from pyro.mesh import patch
 from pyro.util import msg
 
 DEFAULT_INPUTS = "inputs.logo"
@@ -17,12 +14,6 @@ def init_data(my_data, rp):
     if rp.get_param("driver.verbose"):
         msg.bold("initializing the logo problem...")
 
-    # make sure that we are passed a valid patch object
-    if not isinstance(my_data, patch.CellCenterData2d):
-        print("ERROR: patch invalid in logo.py")
-        print(my_data.__class__)
-        sys.exit()
-
     # create the logo
     myg = my_data.grid
 

pyro/compressible/problems/quad.py

@@ -1,8 +1,5 @@
-import sys
-
 import numpy as np
 
-from pyro.mesh import patch
 from pyro.util import msg
 
 DEFAULT_INPUTS = "inputs.quad"
@@ -41,12 +38,6 @@ def init_data(my_data, rp):
     if rp.get_param("driver.verbose"):
         msg.bold("initializing the quadrant problem...")
 
-    # make sure that we are passed a valid patch object
-    if not isinstance(my_data, patch.CellCenterData2d):
-        print("ERROR: patch invalid in quad.py")
-        print(my_data.__class__)
-        sys.exit()
-
     # get the density, momenta, and energy as separate variables
     dens = my_data.get_var("density")
     xmom = my_data.get_var("x-momentum")

pyro/compressible/problems/ramp.py

@@ -1,9 +1,7 @@
 import math
-import sys
 
 import numpy as np
 
-from pyro.mesh import patch
 from pyro.util import msg
 
 DEFAULT_INPUTS = "inputs.ramp"
@@ -29,12 +27,6 @@ def init_data(my_data, rp):
     if rp.get_param("driver.verbose"):
         msg.bold("initializing the double Mach reflection problem...")
 
-    # make sure that we are passed a valid patch object
-    if not isinstance(my_data, patch.CellCenterData2d):
-        print("ERROR: patch invalid in ramp.py")
-        print(my_data.__class__)
-        sys.exit()
-
     # get the density, momenta, and energy as separate variables
     dens = my_data.get_var("density")
     xmom = my_data.get_var("x-momentum")

pyro/compressible/problems/rt.py

@@ -1,8 +1,5 @@
-import sys
-
 import numpy as np
 
-from pyro.mesh import patch
 from pyro.util import msg
 
 DEFAULT_INPUTS = "inputs.rt"
@@ -20,12 +17,6 @@ def init_data(my_data, rp):
     if rp.get_param("driver.verbose"):
         msg.bold("initializing the rt problem...")
 
-    # make sure that we are passed a valid patch object
-    if not isinstance(my_data, patch.CellCenterData2d):
-        print("ERROR: patch invalid in rt.py")
-        print(my_data.__class__)
-        sys.exit()
-
     # get the density, momenta, and energy as separate variables
     dens = my_data.get_var("density")
     xmom = my_data.get_var("x-momentum")