add a DEFAULT_INPUTS to each problem setup (#225)

zingale · web-flow · commit 771daa759529 · 2024-08-31T18:50:18.000-04:00
this allows us to run a problem without specifying an inputs file
diff --git a/pyro/advection/problems/smooth.py b/pyro/advection/problems/smooth.py
@@ -5,6 +5,8 @@
 from pyro.mesh import patch
 from pyro.util import msg
 
+DEFAULT_INPUTS = "inputs.smooth"
+
 
 def init_data(my_data, rp):
     """ initialize the smooth advection problem """
diff --git a/pyro/advection/problems/test.py b/pyro/advection/problems/test.py
@@ -2,6 +2,8 @@
 
 from pyro.mesh import patch
 
+DEFAULT_INPUTS = None
+
 
 def init_data(my_data, rp):
     """ an init routine for unit testing """
diff --git a/pyro/advection/problems/tophat.py b/pyro/advection/problems/tophat.py
@@ -3,6 +3,8 @@
 from pyro.mesh import patch
 from pyro.util import msg
 
+DEFAULT_INPUTS = "inputs.tophat"
+
 
 def init_data(myd, rp):
     """ initialize the tophat advection problem """
diff --git a/pyro/advection_fv4/problems/smooth.py b/pyro/advection_fv4/problems/smooth.py
@@ -3,6 +3,8 @@
 from pyro.mesh import fv
 from pyro.util import msg
 
+DEFAULT_INPUTS = "inputs.smooth"
+
 
 def init_data(my_data, rp):
     """ initialize the smooth advection problem """
diff --git a/pyro/advection_nonuniform/problems/slotted.py b/pyro/advection_nonuniform/problems/slotted.py
@@ -3,6 +3,8 @@
 from pyro.mesh import patch
 from pyro.util import msg
 
+DEFAULT_INPUTS = "inputs.slotted"
+
 
 def init_data(my_data, rp):
     """ initialize the slotted advection problem """
diff --git a/pyro/advection_nonuniform/problems/test.py b/pyro/advection_nonuniform/problems/test.py
@@ -1,6 +1,8 @@
 from pyro.mesh import patch
 from pyro.util import msg
 
+DEFAULT_INPUTS = None
+
 
 def init_data(my_data, rp):
     """ an init routine for unit testing """
diff --git a/pyro/burgers/problems/converge.py b/pyro/burgers/problems/converge.py
@@ -5,6 +5,8 @@
 from pyro.mesh import patch
 from pyro.util import msg
 
+DEFAULT_INPUTS = "inputs.converge.64"
+
 
 def init_data(my_data, rp):
     """ initialize the smooth burgers convergence problem """
diff --git a/pyro/burgers/problems/test.py b/pyro/burgers/problems/test.py
@@ -3,6 +3,8 @@
 from pyro.mesh import patch
 from pyro.util import msg
 
+DEFAULT_INPUTS = "inputs.test"
+
 
 def init_data(myd, rp):
     """ initialize the burgers test problem """
diff --git a/pyro/burgers/problems/tophat.py b/pyro/burgers/problems/tophat.py
@@ -3,6 +3,8 @@
 from pyro.mesh import patch
 from pyro.util import msg
 
+DEFAULT_INPUTS = "inputs.tophat"
+
 
 def init_data(myd, rp):
     """ initialize the tophat burgers problem """
diff --git a/pyro/compressible/problems/acoustic_pulse.py b/pyro/compressible/problems/acoustic_pulse.py
@@ -5,6 +5,8 @@
 from pyro.mesh import fv
 from pyro.util import msg
 
+DEFAULT_INPUTS = "inputs.acoustic_pulse"
+
 
 def init_data(myd, rp):
     """initialize the acoustic_pulse problem.  This comes from
diff --git a/pyro/compressible/problems/advect.py b/pyro/compressible/problems/advect.py
@@ -5,6 +5,8 @@
 from pyro.mesh import patch
 from pyro.util import msg
 
+DEFAULT_INPUTS = "inputs.advect.64"
+
 
 def init_data(my_data, rp):
     """ initialize a smooth advection problem for testing convergence """
diff --git a/pyro/compressible/problems/bubble.py b/pyro/compressible/problems/bubble.py
@@ -5,6 +5,8 @@
 from pyro.mesh import patch
 from pyro.util import msg
 
+DEFAULT_INPUTS = "inputs.bubble"
+
 
 def init_data(my_data, rp):
     """ initialize the bubble problem """
diff --git a/pyro/compressible/problems/gresho.py b/pyro/compressible/problems/gresho.py
@@ -5,6 +5,8 @@
 from pyro.mesh import patch
 from pyro.util import msg
 
+DEFAULT_INPUTS = "inputs.gresho"
+
 
 def init_data(my_data, rp):
     """ initialize the Gresho vortex problem """
diff --git a/pyro/compressible/problems/hse.py b/pyro/compressible/problems/hse.py
@@ -5,6 +5,8 @@
 from pyro.mesh import patch
 from pyro.util import msg
 
+DEFAULT_INPUTS = "inputs.hse"
+
 
 def init_data(my_data, rp):
     """ initialize the HSE problem """
diff --git a/pyro/compressible/problems/kh.py b/pyro/compressible/problems/kh.py
@@ -3,6 +3,8 @@
 from pyro.mesh import patch
 from pyro.util import msg
 
+DEFAULT_INPUTS = "inputs.kh"
+
 
 def init_data(my_data, rp):
     """ initialize the Kelvin-Helmholtz problem """
diff --git a/pyro/compressible/problems/logo.py b/pyro/compressible/problems/logo.py
@@ -6,6 +6,8 @@
 from pyro.mesh import patch
 from pyro.util import msg
 
+DEFAULT_INPUTS = "inputs.logo"
+
 
 def init_data(my_data, rp):
     """ initialize the logo problem """
diff --git a/pyro/compressible/problems/quad.py b/pyro/compressible/problems/quad.py
@@ -5,6 +5,8 @@
 from pyro.mesh import patch
 from pyro.util import msg
 
+DEFAULT_INPUTS = "inputs.quad"
+
 
 def init_data(my_data, rp):
     """ initialize the quadrant problem """
diff --git a/pyro/compressible/problems/ramp.py b/pyro/compressible/problems/ramp.py
@@ -6,6 +6,8 @@
 from pyro.mesh import patch
 from pyro.util import msg
 
+DEFAULT_INPUTS = "inputs.ramp"
+
 
 def init_data(my_data, rp):
     """ initialize the double Mach reflection problem """
diff --git a/pyro/compressible/problems/rt.py b/pyro/compressible/problems/rt.py
@@ -5,6 +5,8 @@
 from pyro.mesh import patch
 from pyro.util import msg
 
+DEFAULT_INPUTS = "inputs.rt"
+
 
 def init_data(my_data, rp):
     """ initialize the rt problem """
diff --git a/pyro/compressible/problems/rt2.py b/pyro/compressible/problems/rt2.py
@@ -11,6 +11,8 @@
 from pyro.mesh import patch
 from pyro.util import msg
 
+DEFAULT_INPUTS = "inputs.rt2"
+
 
 def init_data(my_data, rp):
 
diff --git a/pyro/compressible/problems/sedov.py b/pyro/compressible/problems/sedov.py
@@ -6,6 +6,8 @@
 from pyro.mesh import patch
 from pyro.util import msg
 
+DEFAULT_INPUTS = "inputs.sedov"
+
 
 def init_data(my_data, rp):
     """ initialize the sedov problem """
diff --git a/pyro/compressible/problems/sod.py b/pyro/compressible/problems/sod.py
@@ -3,6 +3,8 @@
 from pyro.mesh import patch
 from pyro.util import msg
 
+DEFAULT_INPUTS = "inputs.sod.x"
+
 
 def init_data(my_data, rp):
     """ initialize the sod problem """
diff --git a/pyro/compressible/problems/test.py b/pyro/compressible/problems/test.py
@@ -2,6 +2,8 @@
 
 from pyro.mesh import patch
 
+DEFAULT_INPUTS = None
+
 
 def init_data(my_data, rp):
     """ an init routine for unit testing """
diff --git a/pyro/compressible_react/problems/flame.py b/pyro/compressible_react/problems/flame.py
@@ -6,6 +6,8 @@
 from pyro.mesh import patch
 from pyro.util import msg
 
+DEFAULT_INPUTS = "inputs.flame"
+
 
 def init_data(my_data, rp):
     """ initialize the sedov problem """
diff --git a/pyro/compressible_react/problems/rt.py b/pyro/compressible_react/problems/rt.py
@@ -5,6 +5,8 @@
 from pyro.mesh import patch
 from pyro.util import msg
 
+DEFAULT_INPUTS = "inputs.rt"
+
 
 def init_data(my_data, rp):
     """ initialize the rt problem """
diff --git a/pyro/diffusion/problems/gaussian.py b/pyro/diffusion/problems/gaussian.py
@@ -5,6 +5,8 @@
 from pyro.mesh import patch
 from pyro.util import msg
 
+DEFAULT_INPUTS = "inputs.gaussian"
+
 
 def phi_analytic(dist, t, t_0, k, phi_1, phi_2):
     """ the analytic solution to the Gaussian diffusion problem """
diff --git a/pyro/diffusion/problems/test.py b/pyro/diffusion/problems/test.py
@@ -2,6 +2,8 @@
 
 from pyro.mesh import patch
 
+DEFAULT_INPUTS = None
+
 
 def init_data(my_data, rp):
     """ an init routine for unit testing """
diff --git a/pyro/incompressible/problems/converge.py b/pyro/incompressible/problems/converge.py
@@ -31,6 +31,8 @@
 from pyro.mesh import patch
 from pyro.util import msg
 
+DEFAULT_INPUTS = "inputs.converge.64"
+
 
 def init_data(my_data, rp):
     """ initialize the incompressible converge problem """
diff --git a/pyro/incompressible/problems/shear.py b/pyro/incompressible/problems/shear.py
@@ -21,6 +21,8 @@
 from pyro.mesh import patch
 from pyro.util import msg
 
+DEFAULT_INPUTS = "inputs.shear"
+
 
 def init_data(my_data, rp):
     """ initialize the incompressible shear problem """
diff --git a/pyro/incompressible_viscous/problems/cavity.py b/pyro/incompressible_viscous/problems/cavity.py
@@ -13,6 +13,8 @@
 from pyro.mesh import patch
 from pyro.util import msg
 
+DEFAULT_INPUTS = "inputs.cavity"
+
 
 def init_data(my_data, rp):
     """ initialize the lid-driven cavity """
diff --git a/pyro/incompressible_viscous/problems/converge.py b/pyro/incompressible_viscous/problems/converge.py
@@ -30,6 +30,8 @@
 from pyro.mesh import patch
 from pyro.util import msg
 
+DEFAULT_INPUTS = "inputs.converge.64"
+
 
 def init_data(my_data, rp):
     """ initialize the incompressible viscous converge problem """
diff --git a/pyro/incompressible_viscous/problems/shear.py b/pyro/incompressible_viscous/problems/shear.py
@@ -21,6 +21,8 @@
 from pyro.mesh import patch
 from pyro.util import msg
 
+DEFAULT_INPUTS = "inputs.shear"
+
 
 def init_data(my_data, rp):
     """ initialize the incompressible shear problem """
diff --git a/pyro/lm_atm/problems/bubble.py b/pyro/lm_atm/problems/bubble.py
@@ -5,6 +5,8 @@
 from pyro.mesh import patch
 from pyro.util import msg
 
+DEFAULT_INPUTS = "inputs.bubble"
+
 
 def init_data(my_data, base, rp):
     """ initialize the bubble problem """
diff --git a/pyro/lm_atm/problems/gresho.py b/pyro/lm_atm/problems/gresho.py
@@ -5,6 +5,8 @@
 from pyro.mesh import patch
 from pyro.util import msg
 
+DEFAULT_INPUTS = "inputs.gresho"
+
 
 def init_data(my_data, base, rp):
     """ initialize the Gresho vortex problem """
diff --git a/pyro/pyro_sim.py b/pyro/pyro_sim.py
@@ -112,6 +112,10 @@ def initialize_problem(self, problem_name, inputs_file=None, inputs_dict=None,
             self.rp.load_params(problem_defaults_file)
 
         # now read in the inputs file
+        if inputs_file is None:
+            problem = importlib.import_module("pyro.{}.problems.{}".format(self.solver_name, problem_name))
+            inputs_file = problem.DEFAULT_INPUTS
+
         if inputs_file is not None:
             if not os.path.isfile(inputs_file):
                 # check if the param file lives in the solver's problems directory
diff --git a/pyro/swe/problems/acoustic_pulse.py b/pyro/swe/problems/acoustic_pulse.py
@@ -5,6 +5,8 @@
 from pyro.mesh import patch
 from pyro.util import msg
 
+DEFAULT_INPUTS = "inputs.acoustic_pulse"
+
 
 def init_data(myd, rp):
     """initialize the acoustic_pulse problem.  This comes from
diff --git a/pyro/swe/problems/advect.py b/pyro/swe/problems/advect.py
@@ -5,6 +5,8 @@
 from pyro.mesh import patch
 from pyro.util import msg
 
+DEFAULT_INPUTS = "inputs.advect"
+
 
 def init_data(my_data, rp):
     """ initialize a smooth advection problem for testing convergence """
diff --git a/pyro/swe/problems/dam.py b/pyro/swe/problems/dam.py
@@ -3,6 +3,8 @@
 from pyro.mesh import patch
 from pyro.util import msg
 
+DEFAULT_INPUTS = "inputs.dam.x"
+
 
 def init_data(my_data, rp):
     """ initialize the dam problem """
diff --git a/pyro/swe/problems/kh.py b/pyro/swe/problems/kh.py
@@ -3,6 +3,8 @@
 from pyro.mesh import patch
 from pyro.util import msg
 
+DEFAULT_INPUTS = "inputs.kh"
+
 
 def init_data(my_data, rp):
     """ initialize the Kelvin-Helmholtz problem """
diff --git a/pyro/swe/problems/logo.py b/pyro/swe/problems/logo.py
@@ -6,6 +6,8 @@
 from pyro.mesh import patch
 from pyro.util import msg
 
+DEFAULT_INPUTS = "inputs.logo"
+
 
 def init_data(my_data, rp):
     """ initialize the sedov problem """
diff --git a/pyro/swe/problems/quad.py b/pyro/swe/problems/quad.py
@@ -5,6 +5,8 @@
 from pyro.mesh import patch
 from pyro.util import msg
 
+DEFAULT_INPUTS = "inputs.quad"
+
 
 def init_data(my_data, rp):
     """ initialize the quadrant problem """
diff --git a/pyro/swe/problems/test.py b/pyro/swe/problems/test.py
@@ -2,6 +2,8 @@
 
 from pyro.mesh import patch
 
+DEFAULT_INPTUS = None
+
 
 def init_data(my_data, rp):
     """ an init routine for unit testing """
