diff --git a/gridlock/__init__.py b/gridlock/__init__.py index 281c2b1..45d1aa8 100644 --- a/gridlock/__init__.py +++ b/gridlock/__init__.py @@ -19,5 +19,5 @@ from .error import GridError as GridError from .grid import Grid as Grid __author__ = 'Jan Petykiewicz' -__version__ = '1.2' +__version__ = '1.1' version = __version__ diff --git a/gridlock/draw.py b/gridlock/draw.py index 52e02f5..e10d4ff 100644 --- a/gridlock/draw.py +++ b/gridlock/draw.py @@ -297,7 +297,7 @@ class GridDrawMixin(GridPosMixin): p = numpy.array([[-dimensions[0], +dimensions[1]], [+dimensions[0], +dimensions[1]], [+dimensions[0], -dimensions[1]], - [-dimensions[0], -dimensions[1]]], dtype=float) * 0.5 + [-dimensions[0], -dimensions[1]]], dtype=float) / 2.0 thickness = dimensions[2] self.draw_polygon(cell_data, 2, center, p, thickness, foreground) diff --git a/gridlock/examples/ex0.py b/gridlock/examples/ex0.py index d13a8cf..b96cdca 100644 --- a/gridlock/examples/ex0.py +++ b/gridlock/examples/ex0.py @@ -29,9 +29,9 @@ if __name__ == '__main__': # numpy.linspace(-5.5, 5.5, 10)] half_x = [.25, .5, 0.75, 1, 1.25, 1.5, 2, 2.5, 3, 3.5] - xyz3 = [numpy.array([-x for x in half_x[::-1]] + [0] + half_x, dtype=float), - numpy.linspace(-5.5, 5.5, 10, dtype=float), - numpy.linspace(-5.5, 5.5, 10, dtype=float)] + xyz3 = [numpy.array([-x for x in half_x[::-1]] + [0] + half_x), + numpy.linspace(-5.5, 5.5, 10), + numpy.linspace(-5.5, 5.5, 10)] eg = Grid(xyz3) egc = eg.allocate(0) # eg.draw_slab(Direction.z, 0, 10, 2) diff --git a/gridlock/grid.py b/gridlock/grid.py index 5790dbd..c8fe998 100644 --- a/gridlock/grid.py +++ b/gridlock/grid.py @@ -94,7 +94,7 @@ class Grid(GridDrawMixin, GridReadMixin, GridPosMixin): Raises: `GridError` on invalid input """ - edge_arrs = [numpy.array(cc) for cc in pixel_edge_coordinates] + edge_arrs = [numpy.asarray(cc) for cc in pixel_edge_coordinates] self.exyz = [numpy.unique(edges) for edges in edge_arrs] self.shifts = numpy.array(shifts, dtype=float) diff --git a/gridlock/test/test_grid.py b/gridlock/test/test_grid.py index 7a70211..183c9cf 100644 --- a/gridlock/test/test_grid.py +++ b/gridlock/test/test_grid.py @@ -1,4 +1,4 @@ -# import pytest +import pytest # type: ignore import numpy from numpy.testing import assert_allclose #, assert_array_equal