Merge branch 'more-6' of https://github.com/boutproject/zoidberg into…

… more-6

zoidberg/__init__.py

@@ -9,8 +9,7 @@
 
     __version__ = get_version(root="..", relative_to=__file__)
 
-from . import zoidberg
-from . import field, fieldtracer, grid, plot
+from . import field, fieldtracer, grid, plot, zoidberg
 from .zoidberg import make_maps, write_maps
 
 __all__ = [

zoidberg/field.py

@@ -316,21 +316,8 @@ def Rfunc(self, x, z, phi):
 
 
 try:
-    from sympy import (
-        And,
-        Piecewise,
-        Sum,
-        Symbol,
-        atan2,
-        cos,
-        diff,
-        factorial,
-        lambdify,
-        log,
-        pi,
-        sin,
-        sqrt,
-    )
+    from sympy import (And, Piecewise, Sum, Symbol, atan2, cos, diff,
+                       factorial, lambdify, log, pi, sin, sqrt)
 
     class StraightStellarator(MagneticField):
         """A "rotating ellipse" stellarator without curvature

zoidberg/poloidal_grid.py

@@ -383,9 +383,9 @@ def findIndex(self, R, Z, tol=1e-10, show=False):
 
         # Create a mask for the positions
         mask = np.ones(xind.shape)
-        mask[
-            np.logical_or((xind < 0.5), (xind > (nx - 1.5)))
-        ] = 0.0  # Set to zero if near the boundary
+        mask[np.logical_or((xind < 0.5), (xind > (nx - 1.5)))] = (
+            0.0  # Set to zero if near the boundary
+        )
 
         if show and plotting_available:
             plt.plot(self.R, self.Z, ".")