merge changes from master (#1)

* Update 00-quick-start.ipynb Should be a typo here for the grid-spacing * Bump version: 0.2.6 → 0.2.7 * fix setting of conductivity in objects.py (flaport#55) * Bump version: 0.2.7 → 0.2.8 --------- Co-authored-by: Floris Laporte <[email protected]> Co-authored-by: TTstone <[email protected]>
hajanssen · May 9, 2023 · 8e829a4 · 8e829a4
1 parent ec20823
commit 8e829a4
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.2.6
+current_version = 0.2.8
 commit = True
 tag = True
 tag_name = {new_version}

diff --git a/examples/00-quick-start.ipynb b/examples/00-quick-start.ipynb
@@ -84,7 +84,7 @@
     "\n",
     "A grid is defined by its `shape`, which is just a 3D tuple of `Number`-types (integers or floats). If the shape is given in floats, it denotes the width, height and length of the grid in meters. If the shape is given in integers, it denotes the width, height and length of the grid in terms of the `grid_spacing`. Internally, these numbers will be translated to three integers: `grid.Nx`, `grid.Ny` and `grid.Nz`.\n",
     "\n",
-    "A `grid_spacing` can be given. For stability reasons, it is recommended to choose a grid spacing that is at least 10 times smaller than the *smallest* wavelength in the grid. This means that for a grid containing a source with wavelength `1550nm` and a material with refractive index of `3.1`, the recommended minimum `grid_spacing` turns out to be `50pm`\n",
+    "A `grid_spacing` can be given. For stability reasons, it is recommended to choose a grid spacing that is at least 10 times smaller than the *smallest* wavelength in the grid. This means that for a grid containing a source with wavelength `1550nm` and a material with refractive index of `3.1`, the recommended minimum `grid_spacing` turns out to be `50nm`\n",
     "\n",
     "For the `permittivity` and `permeability` floats or arrays with the following shapes\n",
     "\n",

diff --git a/fdtd/__init__.py b/fdtd/__init__.py
@@ -1,7 +1,7 @@
 """ Python 3D FDTD Simulator """
 
 __author__ = "Floris laporte"
-__version__ = "0.2.6"
+__version__ = "0.2.8"
 
 from .grid import Grid
 from .sources import PointSource, LineSource, PlaneSource

diff --git a/fdtd/objects.py b/fdtd/objects.py
@@ -167,7 +167,7 @@ def __init__(
             name: name of the object (will become available as attribute to the grid)
         """
         super().__init__(permittivity, name)
-        self.conductivity = conductivity
+        self.conductivity = bd.array(conductivity)
 
     def _register_grid(
         self, grid: Grid, x: slice = None, y: slice = None, z: slice = None

diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = fdtd
-version = 0.2.6
+version = 0.2.8
 description = a 3D electromagnetic FDTD simulator written in Python
 author = Floris Laporte
 author_email = [email protected]