some pylint-ing on mesh/ (#120)

Co-authored-by: Eric Johnson <[email protected]>

Author: zingale

.flake8

@@ -1,4 +1,4 @@
 [flake8]
-max-line-length = 120
+max-line-length = 132
 ignore = E126, E127, E128, E129, E226, E241, E265, E741, F401, F403, F841, W504, W291
 exclude = docs/,lm_combustion,radhydro

pyro/mesh/array_indexer.py

@@ -31,8 +31,8 @@ class ArrayIndexer(np.ndarray):
 
     """
 
-    def __new__(self, d, grid=None):
-        obj = np.asarray(d).view(self)
+    def __new__(cls, d, grid=None):
+        obj = np.asarray(d).view(cls)
         obj.g = grid
         obj.c = len(d.shape)
 
@@ -86,9 +86,9 @@ def ip_jp(self, ishift, jshift, buf=0, n=0, s=1):
         if c == 2:
             return np.asarray(self[self.g.ilo-bxlo+ishift:self.g.ihi+1+bxhi+ishift:s,
                                    self.g.jlo-bylo+jshift:self.g.jhi+1+byhi+jshift:s])
-        else:
-            return np.asarray(self[self.g.ilo-bxlo+ishift:self.g.ihi+1+bxhi+ishift:s,
-                                   self.g.jlo-bylo+jshift:self.g.jhi+1+byhi+jshift:s, n])
+
+        return np.asarray(self[self.g.ilo-bxlo+ishift:self.g.ihi+1+bxhi+ishift:s,
+                               self.g.jlo-bylo+jshift:self.g.jhi+1+byhi+jshift:s, n])
 
     def lap(self, n=0, buf=0):
         """return the 5-point Laplacian"""
@@ -107,10 +107,9 @@ def norm(self, n=0):
             return np.sqrt(self.g.dx * self.g.dy *
                            np.sum((self[self.g.ilo:self.g.ihi+1, self.g.jlo:self.g.jhi+1]**2).flat))
 
-        else:
-            _tmp = self[:, :, n]
-            return np.sqrt(self.g.dx * self.g.dy *
-                           np.sum((_tmp[self.g.ilo:self.g.ihi+1, self.g.jlo:self.g.jhi+1]**2).flat))
+        _tmp = self[:, :, n]
+        return np.sqrt(self.g.dx * self.g.dy *
+                       np.sum((_tmp[self.g.ilo:self.g.ihi+1, self.g.jlo:self.g.jhi+1]**2).flat))
 
     def copy(self):
         """make a copy of the array, defined on the same grid"""
@@ -341,8 +340,8 @@ class ArrayIndexerFC(ArrayIndexer):
 
     """
 
-    def __new__(self, d, idir, grid=None):
-        obj = np.asarray(d).view(self)
+    def __new__(cls, d, idir, grid=None):
+        obj = np.asarray(d).view(cls)
         obj.g = grid
         obj.idir = idir
         obj.c = len(d.shape)
@@ -375,17 +374,15 @@ def ip_jp(self, ishift, jshift, buf=0, n=0, s=1):
             if c == 2:
                 return np.asarray(self[self.g.ilo-bxlo+ishift:self.g.ihi+2+bxhi+ishift:s,
                                        self.g.jlo-bylo+jshift:self.g.jhi+1+byhi+jshift:s])
-            else:
-                return np.asarray(self[self.g.ilo-bxlo+ishift:self.g.ihi+2+bxhi+ishift:s,
-                                       self.g.jlo-bylo+jshift:self.g.jhi+1+byhi+jshift:s, n])
-        elif self.idir == 2:
+            return np.asarray(self[self.g.ilo-bxlo+ishift:self.g.ihi+2+bxhi+ishift:s,
+                                   self.g.jlo-bylo+jshift:self.g.jhi+1+byhi+jshift:s, n])
+        else:  # idir == 2
             # face-centered in y
             if c == 2:
                 return np.asarray(self[self.g.ilo-bxlo+ishift:self.g.ihi+1+bxhi+ishift:s,
                                        self.g.jlo-bylo+jshift:self.g.jhi+2+byhi+jshift:s])
-            else:
-                return np.asarray(self[self.g.ilo-bxlo+ishift:self.g.ihi+1+bxhi+ishift:s,
-                                       self.g.jlo-bylo+jshift:self.g.jhi+2+byhi+jshift:s, n])
+            return np.asarray(self[self.g.ilo-bxlo+ishift:self.g.ihi+1+bxhi+ishift:s,
+                                   self.g.jlo-bylo+jshift:self.g.jhi+2+byhi+jshift:s, n])
 
     def lap(self, n=0, buf=0):
         raise NotImplementedError("lap not implemented for ArrayIndexerFC")
@@ -402,19 +399,18 @@ def norm(self, n=0):
                 return np.sqrt(self.g.dx * self.g.dy *
                                np.sum((self[self.g.ilo:self.g.ihi+2, self.g.jlo:self.g.jhi+1]**2).flat))
 
-            else:
-                _tmp = self[:, :, n]
-                return np.sqrt(self.g.dx * self.g.dy *
-                               np.sum((_tmp[self.g.ilo:self.g.ihi+2, self.g.jlo:self.g.jhi+1]**2).flat))
-        elif self.idir == 2:
-            if c == 2:
-                return np.sqrt(self.g.dx * self.g.dy *
-                               np.sum((self[self.g.ilo:self.g.ihi+1, self.g.jlo:self.g.jhi+2]**2).flat))
+            _tmp = self[:, :, n]
+            return np.sqrt(self.g.dx * self.g.dy *
+                           np.sum((_tmp[self.g.ilo:self.g.ihi+2, self.g.jlo:self.g.jhi+1]**2).flat))
 
-            else:
-                _tmp = self[:, :, n]
-                return np.sqrt(self.g.dx * self.g.dy *
-                               np.sum((_tmp[self.g.ilo:self.g.ihi+1, self.g.jlo:self.g.jhi+2]**2).flat))
+        # idir == 2
+        if c == 2:
+            return np.sqrt(self.g.dx * self.g.dy *
+                           np.sum((self[self.g.ilo:self.g.ihi+1, self.g.jlo:self.g.jhi+2]**2).flat))
+
+        _tmp = self[:, :, n]
+        return np.sqrt(self.g.dx * self.g.dy *
+                       np.sum((_tmp[self.g.ilo:self.g.ihi+1, self.g.jlo:self.g.jhi+2]**2).flat))
 
     def copy(self):
         """make a copy of the array, defined on the same grid"""

pyro/mesh/boundary.py

@@ -35,8 +35,7 @@ def define_bc(bc_type, function, is_solid=False):
 def _set_reflect(odd_reflect_dir, dir_string):
     if odd_reflect_dir == dir_string:
         return "reflect-odd"
-    else:
-        return "reflect-even"
+    return "reflect-even"
 
 
 class BCProp:
@@ -157,31 +156,31 @@ def __init__(self,
             if self.xlb == "reflect":
                 self.xlb = _set_reflect(odd_reflect_dir, "x")
         else:
-            msg.fail("ERROR: xlb = %s invalid BC" % (xlb))
+            msg.fail(f"ERROR: xlb = {xlb} invalid BC")
 
         # +x boundary
         if xrb in valid:
             self.xrb = xrb
             if self.xrb == "reflect":
                 self.xrb = _set_reflect(odd_reflect_dir, "x")
         else:
-            msg.fail("ERROR: xrb = %s invalid BC" % (xrb))
+            msg.fail(f"ERROR: xrb = {xrb} invalid BC")
 
         # -y boundary
         if ylb in valid:
             self.ylb = ylb
             if self.ylb == "reflect":
                 self.ylb = _set_reflect(odd_reflect_dir, "y")
         else:
-            msg.fail("ERROR: ylb = %s invalid BC" % (ylb))
+            msg.fail(f"ERROR: ylb = {ylb} invalid BC")
 
         # +y boundary
         if yrb in valid:
             self.yrb = yrb
             if self.yrb == "reflect":
                 self.yrb = _set_reflect(odd_reflect_dir, "y")
         else:
-            msg.fail("ERROR: yrb = %s invalid BC" % (yrb))
+            msg.fail(f"ERROR: yrb = {yrb} invalid BC")
 
         # periodic checks
         if ((xlb == "periodic" and xrb != "periodic") or
@@ -207,7 +206,6 @@ def __init__(self,
     def __str__(self):
         """ print out some basic information about the BC object """
 
-        string = "BCs: -x: %s  +x: %s  -y: %s  +y: %s" % \
-            (self.xlb, self.xrb, self.ylb, self.yrb)
+        string = f"BCs: -x: {self.xlb}  +x: {self.xrb}  -y: {self.ylb}  +y: {self.yrb}"
 
         return string

pyro/mesh/patch.py

@@ -174,8 +174,7 @@ def fine_like(self, N):
 
     def __str__(self):
         """ print out some basic information about the grid object """
-        return "2-d grid: nx = {}, ny = {}, ng = {}".format(
-            self.nx, self.ny, self.ng)
+        return f"2-d grid: nx = {self.nx}, ny = {self.ny}, ng = {self.ng}"
 
     def __eq__(self, other):
         """ are two grids equivalent? """
@@ -336,19 +335,15 @@ def __str__(self):
             my_str = "CellCenterData2d object not yet initialized"
             return my_str
 
-        my_str = "cc data: nx = {}, ny = {}, ng = {}\n".format(
-            self.grid.nx, self.grid.ny, self.grid.ng)
+        my_str = f"cc data: nx = {self.grid.nx}, ny = {self.grid.ny}, ng = {self.grid.ng}\n"
         my_str += f"         nvars = {self.nvar}\n"
         my_str += "         variables:\n"
 
         for n in range(self.nvar):
-            my_str += "%16s: min: %15.10f    max: %15.10f\n" % \
-                (self.names[n], self.min(self.names[n]), self.max(self.names[n]))
-            my_str += "%16s  BCs: -x: %-12s +x: %-12s -y: %-12s +y: %-12s\n" %\
-                (" ", self.BCs[self.names[n]].xlb,
-                      self.BCs[self.names[n]].xrb,
-                      self.BCs[self.names[n]].ylb,
-                      self.BCs[self.names[n]].yrb)
+            name = self.names[n]
+            my_str += f"{name:>16s}: min: {self.min(name):15.10f}    max: {self.max(name):15.10f}\n"
+            my_str += f"{' ':>16s}  BCs: -x: {self.BCs[name].xlb:12s} +x: {self.BCs[name].xrb:12s}"
+            my_str += f" -y: {self.BCs[name].ylb:12s} +y: {self.BCs[name].yrb:12s}\n"
 
         return my_str
 
@@ -434,7 +429,7 @@ def get_aux(self, keyword):
             The value corresponding to the keyword
 
         """
-        if keyword in self.aux.keys():
+        if keyword in self.aux:
             return self.aux[keyword]
 
         return None
@@ -482,22 +477,22 @@ def fill_BC(self, name):
 
         # that will handle the standard type of BCs, but if we asked
         # for a custom BC, we handle it here
-        if self.BCs[name].xlb in bnd.ext_bcs.keys():
+        if self.BCs[name].xlb in bnd.ext_bcs:
             try:
                 bnd.ext_bcs[self.BCs[name].xlb](self.BCs[name].xlb, "xlb", name, self, self.ivars)
             except TypeError:
                 bnd.ext_bcs[self.BCs[name].xlb](self.BCs[name].xlb, "xlb", name, self)
-        if self.BCs[name].xrb in bnd.ext_bcs.keys():
+        if self.BCs[name].xrb in bnd.ext_bcs:
             try:
                 bnd.ext_bcs[self.BCs[name].xrb](self.BCs[name].xrb, "xrb", name, self)
             except TypeError:
                 bnd.ext_bcs[self.BCs[name].xrb](self.BCs[name].xrb, "xrb", name, self, self.ivars)
-        if self.BCs[name].ylb in bnd.ext_bcs.keys():
+        if self.BCs[name].ylb in bnd.ext_bcs:
             try:
                 bnd.ext_bcs[self.BCs[name].ylb](self.BCs[name].ylb, "ylb", name, self)
             except TypeError:
                 bnd.ext_bcs[self.BCs[name].ylb](self.BCs[name].ylb, "ylb", name, self, self.ivars)
-        if self.BCs[name].yrb in bnd.ext_bcs.keys():
+        if self.BCs[name].yrb in bnd.ext_bcs:
             try:
                 bnd.ext_bcs[self.BCs[name].yrb](self.BCs[name].yrb, "yrb", name, self)
             except TypeError:
@@ -725,19 +720,15 @@ def __str__(self):
             my_str = "FaceCenterData2d object not yet initialized"
             return my_str
 
-        my_str = "fc data: idir = {}, nx = {}, ny = {}, ng = {}\n".format(
-            self.idir, self.grid.nx, self.grid.ny, self.grid.ng)
+        my_str = f"fc data: idir = {self.idir}, nx = {self.grid.nx}, ny = {self.grid.ny}, ng = {self.grid.ng}\n"
         my_str += f"         nvars = {self.nvar}\n"
         my_str += "         variables:\n"
 
         for n in range(self.nvar):
-            my_str += "%16s: min: %15.10f    max: %15.10f\n" % \
-                (self.names[n], self.min(self.names[n]), self.max(self.names[n]))
-            my_str += "%16s  BCs: -x: %-12s +x: %-12s -y: %-12s +y: %-12s\n" %\
-                (" ", self.BCs[self.names[n]].xlb,
-                      self.BCs[self.names[n]].xrb,
-                      self.BCs[self.names[n]].ylb,
-                      self.BCs[self.names[n]].yrb)
+            name = self.names[n]
+            my_str += f"{name:>16s}: min: {self.min(name):15.10f}    max: {self.max(name):15.10f}\n"
+            my_str += f"{' ':>16s}  BCs: -x: {self.BCs[name].xlb:12s} +x: {self.BCs[name].xrb:12s}"
+            my_str += f" -y: {self.BCs[name].ylb:12s} +y: {self.BCs[name].yrb:12s}\n"
 
         return my_str
 
@@ -794,10 +785,10 @@ def fill_BC(self, name):
         n = self.names.index(name)
         self.data.fill_ghost(n=n, bc=self.BCs[name])
 
-        if self.BCs[name].xlb in bnd.ext_bcs.keys() or \
-           self.BCs[name].xrb in bnd.ext_bcs.keys() or \
-           self.BCs[name].ylb in bnd.ext_bcs.keys() or \
-           self.BCs[name].yrb in bnd.ext_bcs.keys():
+        if self.BCs[name].xlb in bnd.ext_bcs or \
+           self.BCs[name].xrb in bnd.ext_bcs or \
+           self.BCs[name].ylb in bnd.ext_bcs or \
+           self.BCs[name].yrb in bnd.ext_bcs:
             raise NotImplementedError("custom boundary conditions not supported for FaceCenterData2d")
 
     def restrict(self, varname, N=2):

pyro/mesh/reconstruction.py

@@ -11,10 +11,11 @@ def limit(data, myg, idir, limiter):
     of the limiter input variable."""
     if limiter == 0:
         return nolimit(data, myg, idir)
-    elif limiter == 1:
+
+    if limiter == 1:
         return limit2(data, myg, idir)
-    else:
-        return limit4(data, myg, idir)
+
+    return limit4(data, myg, idir)
 
 
 def well_balance(q, myg, limiter, iv, grav):