Even more pylint cleanup

pyro/advection/problems/smooth.py

@@ -8,6 +8,7 @@
 
 def init_data(my_data, rp):
     """ initialize the smooth advection problem """
+    del rp  # this problem doesn't use runtime params
 
     msg.bold("initializing the smooth advection problem...")
 

pyro/advection/problems/test.py

@@ -5,6 +5,7 @@
 
 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):

pyro/advection/problems/tophat.py

@@ -6,6 +6,7 @@
 
 def init_data(myd, rp):
     """ initialize the tophat advection problem """
+    del rp  # this problem doesn't use runtime params
 
     msg.bold("initializing the tophat advection problem...")
 

pyro/advection_fv4/interface.py

@@ -28,6 +28,7 @@ def states(a, ng, idir):
     out : ndarray, ndarray
         The state predicted to the left and right edges.
     """
+    # pylint: disable=too-many-nested-blocks
 
     qx, qy = a.shape
 

pyro/advection_fv4/problems/smooth.py

@@ -6,6 +6,7 @@
 
 def init_data(my_data, rp):
     """ initialize the smooth advection problem """
+    del rp  # this problem doesn't use runtime params
 
     msg.bold("initializing the smooth FV advection problem...")
 

pyro/advection_nonuniform/problems/test.py

@@ -4,6 +4,7 @@
 
 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):

pyro/analysis/convergence.py

@@ -25,8 +25,7 @@ def compare(fine, coarse):
     return float(np.abs(e).max()), e.norm()
 
 
-if __name__ == "__main__":
-
+def main():
     if len(sys.argv) != 3:
         print(usage)
         sys.exit(2)
@@ -40,3 +39,7 @@ def compare(fine, coarse):
     result = compare(ff.cc_data, cc.cc_data)
 
     print("inf norm of density: ", result)
+
+
+if __name__ == "__main__":
+    main()

pyro/analysis/dam_compare.py

@@ -106,7 +106,7 @@ def abort(string):
 h0 = rp.get_param("dam.h_right")
 
 
-def find_h2(h2):
+def find_h2(h2):  # pylint: disable=redefined-outer-name
     return (h2/h1)**3 - 9*(h2/h1)**2*(h0/h1) + \
         16*(h2/h1)**1.5*(h0/h1) - (h2/h1)*(h0/h1)*(h0/h1+8) + \
         (h0/h1)**3

pyro/analysis/gauss_diffusion_compare.py

@@ -104,8 +104,7 @@ def process(file):
     return bin_centers, phi_exact, phi_bin
 
 
-if __name__ == "__main__":
-
+def main():
     if len(sys.argv) < 2:
         print(usage)
         sys.exit(2)
@@ -137,3 +136,7 @@ def process(file):
 
     plt.savefig("gauss_diffusion_compare.png", bbox_inches="tight")
     plt.savefig("gauss_diffusion_compare.pdf", bbox_inches="tight", dpi=100)
+
+
+if __name__ == "__main__":
+    main()

pyro/analysis/incomp_converge_error.py

@@ -42,7 +42,7 @@ def get_errors(file):
     return udiff.norm(), vdiff.norm()
 
 
-if __name__ == "__main__":
+def main():
     if len(sys.argv) != 2:
         print(usage)
         sys.exit(2)
@@ -55,3 +55,7 @@ def get_errors(file):
 
     errors = get_errors(file)
     print("errors: ", errors[0], errors[1])
+
+
+if __name__ == "__main__":
+    main()

pyro/analysis/plot_thumbnail.py

@@ -33,8 +33,7 @@ def makeplot(myd, variable):
     plt.show()
 
 
-if __name__ == "__main__":
-
+def main():
     print(sys.argv)
 
     file = sys.argv[1]
@@ -43,3 +42,7 @@ def makeplot(myd, variable):
     sim = io.read(file)
 
     makeplot(sim.cc_data, variable)
+
+
+if __name__ == "__main__":
+    main()

pyro/analysis/plotcompact.py

@@ -63,9 +63,7 @@ def get_args():
     parser.add_argument("variable", type=str, nargs=1,
                         help="the name of the solver used to run the simulation")
 
-    args = parser.parse_args()
-
-    return args
+    return parser.parse_args()
 
 
 if __name__ == "__main__":

pyro/analysis/plotvar.py

@@ -74,9 +74,7 @@ def get_args():
     parser.add_argument("variable", type=str, nargs=1,
                         help="the name of the solver used to run the simulation")
 
-    args = parser.parse_args()
-
-    return args
+    return parser.parse_args()
 
 
 if __name__ == "__main__":

pyro/compressible/BC.py

@@ -41,6 +41,7 @@ def user(bc_name, bc_edge, variable, ccdata):
         The data object
 
     """
+    # pylint: disable=too-many-nested-blocks
 
     myg = ccdata.grid
 

pyro/compressible/interface.py

@@ -996,7 +996,7 @@ def riemann_hllc(idir, ng,
                 F[i, j, :] = consFlux(idir, gamma, idens, ixmom, iymom, iener, irhoX, nspec,
                                       U_state)
 
-            elif S_r > 0.0 and S_c <= 0:
+            elif S_c <= 0.0 < S_r:
                 # R* region
                 HLLCfactor = rho_r * (S_r - un_r) / (S_r - S_c)
 
@@ -1024,7 +1024,7 @@ def riemann_hllc(idir, ng,
                 # correct the flux
                 F[i, j, :] = F[i, j, :] + S_r * (U_state[:] - U_r[i, j, :])
 
-            elif S_c > 0.0 and S_l < 0.0:
+            elif S_l < 0.0 < S_c:
                 # L* region
                 HLLCfactor = rho_l * (S_l - un_l) / (S_l - S_c)
 

pyro/compressible/problems/advect.py

@@ -59,7 +59,5 @@ def init_data(my_data, rp):
 def finalize():
     """ print out any information to the user at the end of the run """
 
-    msg = """
-          """
-
-    print(msg)
+    print("""
+          """)

pyro/compressible/problems/logo.py

@@ -71,11 +71,9 @@ def init_data(my_data, rp):
 def finalize():
     """ print out any information to the user at the end of the run """
 
-    msg = """
+    print("""
           The script analysis/sedov_compare.py can be used to analyze these
           results.  That will perform an average at constant radius and
           compare the radial profiles to the exact solution.  Sample exact
           data is provided as analysis/cylindrical-sedov.out
-          """
-
-    print(msg)
+          """)

pyro/compressible/problems/sedov.py

@@ -80,11 +80,9 @@ def init_data(my_data, rp):
 def finalize():
     """ print out any information to the user at the end of the run """
 
-    msg = """
+    print("""
           The script analysis/sedov_compare.py can be used to analyze these
           results.  That will perform an average at constant radius and
           compare the radial profiles to the exact solution.  Sample exact
           data is provided as analysis/cylindrical-sedov.out
-          """
-
-    print(msg)
+          """)

pyro/compressible/problems/sod.py

@@ -89,10 +89,8 @@ def init_data(my_data, rp):
 def finalize():
     """ print out any information to the user at the end of the run """
 
-    msg = """
+    print("""
           The script analysis/sod_compare.py can be used to compare
           this output to the exact solution.  Some sample exact solution
           data is present as analysis/sod-exact.out
-          """
-
-    print(msg)
+          """)

pyro/compressible/problems/test.py

@@ -5,6 +5,7 @@
 
 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):

pyro/compressible_fv4/simulation.py

@@ -8,8 +8,8 @@ class Simulation(compressible_rk.Simulation):
     def __init__(self, solver_name, problem_name, rp, timers=None, data_class=fv.FV2d):
         super().__init__(solver_name, problem_name, rp, timers=timers, data_class=data_class)
 
-    def initialize(self, ng=5):
-        super().initialize(ng=ng)
+    def initialize(self, extra_vars=None, ng=5):
+        super().initialize(extra_vars=extra_vars, ng=ng)
 
     def substep(self, myd):
         """

pyro/compressible_react/problems/flame.py

@@ -86,11 +86,9 @@ def init_data(my_data, rp):
 def finalize():
     """ print out any information to the user at the end of the run """
 
-    msg = """
+    print("""
           The script analysis/sedov_compare.py can be used to analyze these
           results.  That will perform an average at constant radius and
           compare the radial profiles to the exact solution.  Sample exact
           data is provided as analysis/cylindrical-sedov.out
-          """
-
-    print(msg)
+          """)

pyro/compressible_react/simulation.py

@@ -9,13 +9,13 @@
 
 class Simulation(compressible.Simulation):
 
-    def initialize(self):
+    def initialize(self, extra_vars=None, ng=4):
         """
         For the reacting compressible solver, our initialization of
         the data is the same as the compressible solver, but we
         supply additional variables.
         """
-        super().initialize(extra_vars=["fuel", "ash"])
+        super().initialize(extra_vars=["fuel", "ash"] + (extra_vars or []), ng=ng)
 
     def burn(self, dt):
         """ react fuel to ash """

pyro/compressible_sr/BC.py

@@ -42,6 +42,7 @@ def user(bc_name, bc_edge, variable, ccdata, ivars):
         The data object
 
     """
+    # pylint: disable=too-many-nested-blocks
 
     myg = ccdata.grid
 

pyro/compressible_sr/c2p.py

@@ -45,21 +45,16 @@ def brentq(x1, b, U, gamma, idens, ixmom, iymom, iener,
 
     # switch variables
     if abs(fa) < abs(fb):
-        d = a
-        a = b
-        b = d
-
-        d = fa
-        fa = fb
-        fb = d
+        a, b = b, a
+        fa, fb = fb, fa
 
     c = a
     fc = fa
 
     mflag = True
 
     for _ in range(ITMAX):
-        if fa != fc and fb != fc:
+        if fa != fc and fb != fc:  # pylint: disable=consider-using-in
             s = a*fb*fc / ((fa-fb) * (fa-fc)) + b*fa*fc / ((fb-fa)*(fb-fc)) + \
                 c*fa*fb / ((fc-fa)*(fc-fb))
         else:
@@ -92,13 +87,8 @@ def brentq(x1, b, U, gamma, idens, ixmom, iymom, iener,
         fs = f(s, U, gamma, idens, ixmom, iymom, iener)
 
         if abs(fa) < abs(fb):
-            d = a
-            a = b
-            b = d
-
-            d = fa
-            fa = fb
-            fb = d
+            a, b = b, a
+            fa, fb = fb, fa
 
         d = c
         c = b

pyro/compressible_sr/eos.py

@@ -4,7 +4,7 @@
 """
 
 
-def pres(gamma, dens, eint):
+def pres(gamma, rho, eint):
     """
     Given the density and the specific internal energy, return the
     pressure
@@ -13,7 +13,7 @@ def pres(gamma, dens, eint):
     ----------
     gamma : float
         The ratio of specific heats
-    dens : float
+    rho : float
         The density
     eint : float
         The specific internal energy
@@ -24,10 +24,10 @@ def pres(gamma, dens, eint):
        The pressure
 
      """
-    return dens*eint*(gamma - 1.0)
+    return rho * eint * (gamma - 1.0)
 
 
-def dens(gamma, pres, eint):
+def dens(gamma, p, eint):
     """
     Given the pressure and the specific internal energy, return
     the density
@@ -36,7 +36,7 @@ def dens(gamma, pres, eint):
     ----------
     gamma : float
         The ratio of specific heats
-    pres : float
+    p : float
         The pressure
     eint : float
         The specific internal energy
@@ -47,18 +47,18 @@ def dens(gamma, pres, eint):
        The density
 
     """
-    return pres/(eint*(gamma - 1.0))
+    return p / (eint * (gamma - 1.0))
 
 
-def rhoe(gamma, pres):
+def rhoe(gamma, p):
     """
     Given the pressure, return (rho * e)
 
     Parameters
     ----------
     gamma : float
         The ratio of specific heats
-    pres : float
+    p : float
         The pressure
 
     Returns
@@ -67,7 +67,7 @@ def rhoe(gamma, pres):
        The internal energy density, rho e
 
     """
-    return pres/(gamma - 1.0)
+    return p / (gamma - 1.0)
 
 
 def h_from_eps(gamma, eint):