revert previous commit to undo bugs it introduced. (#4)(#6)

This reverts commit 3e22a26.

Author: flaport

fdtd/boundaries.py

@@ -17,7 +17,7 @@
 
 
 ## Boundary Conditions [base class]
-class Boundary:
+class _Boundary:
     """ an FDTD Boundary [base class] """
 
     def __init__(self, name: str = None):
@@ -128,7 +128,7 @@ def _handle_slice(s):
 
 
 ## Periodic Boundaries
-class PeriodicBoundary(Boundary):
+class PeriodicBoundary(_Boundary):
     """ An FDTD Periodic Boundary
 
     Note:
@@ -211,7 +211,7 @@ def update_H(self):
 ## Perfectly Matched Layer (PML)
 
 
-class PML(Boundary):
+class PML(_Boundary):
     """ A perfectly matched layer (PML)
 
     a PML is an impedence-matched area at the boundary of the grid for which

fdtd/detectors.py

@@ -15,11 +15,6 @@
 from .grid import Grid
 from .backend import backend as bd
 
-## Base detector class:
-class Detector:
-    """ an FDTD Detector [base class] """
-
-
 ## Detector
 class LineDetector:
     """ A detector along a line in the FDTD grid """

fdtd/grid.py

@@ -71,20 +71,6 @@ def curl_H(H: Tensorlike) -> Tensorlike:
     return curl
 
 
-class GridList(list):
-    """ Special list that removes item from grid when deleted from list """
-
-    def __init__(self, grid):
-        super().__init__([])
-        self.grid = grid
-
-    def __delitem__(self, i):
-        item = self[i]
-        super().__delitem__(i)
-        if hasattr(item, "name") and hasattr(self.grid, item.name):
-            delattr(self.grid, item.name)
-
-
 ## FDTD Grid Class
 class Grid:
     """ The FDTD Grid
@@ -163,16 +149,16 @@ def __init__(
         self.time_steps_passed = 0
 
         # dictionary containing the sources:
-        self.sources = GridList(self)
+        self.sources = []
 
         # dictionary containing the boundaries
-        self.boundaries = GridList(self)
+        self.boundaries = []
 
         # dictionary containing the detectors
-        self.detectors = GridList(self)
+        self.detectors = []
 
         # dictionary containing the objects in the grid
-        self.objects = GridList(self)
+        self.objects = []
 
     def _handle_distance(self, distance: Number) -> int:
         """ transform a distance to an integer number of gridpoints """
@@ -375,28 +361,6 @@ def __setitem__(self, key, attr):
             z=self._handle_single_key(z),
         )
 
-    def __delattr__(self, name):
-        attr = getattr(self, name)
-        super().__delattr__(name)
-        if not isinstance(attr, (Object, Source, Detector, Boundary)):
-            return
-        try:
-            del self.objects[self.objects.index(attr)]
-        except ValueError:
-            pass
-        try:
-            del self.sources[self.sources.index(attr)]
-        except ValueError:
-            pass
-        try:
-            del self.detectors[self.detectors.index(attr)]
-        except ValueError:
-            pass
-        try:
-            del self.boundaries[self.boundaries.index(attr)]
-        except ValueError:
-            pass
-
     def __repr__(self):
         return (
             f"{self.__class__.__name__}(shape=({self.Nx},{self.Ny},{self.Nz}), "
@@ -426,11 +390,3 @@ def __str__(self):
             for obj in self.objects:
                 s += str(obj)
         return s
-
-
-## Imports (placed here to prevent circular imports)
-# relative
-from .objects import Object
-from .sources import Source
-from .detectors import Detector
-from .boundaries import Boundary

fdtd/objects.py

@@ -22,7 +22,7 @@
 
 ## Object
 class Object:
-    """ An object to place in the grid [base class] """
+    """ An object to place in the grid """
 
     def __init__(self, permittivity: Tensorlike, name: str = None):
         """ Create an object """
@@ -63,17 +63,24 @@ def _register_grid(
             self._permittivity = self._permittivity[:, :, :, None]
         self.inverse_permittivity = (
             bd.ones((self.Nx, self.Ny, self.Nz, 3)) / self._permittivity
-            - self.grid.inverse_permittivity[self.x, self.y, self.z]
         )
 
         # set the permittivity values of the object at its border to be equal
         # to the grid permittivity. This way, the object is made symmetric.
         if self.Nx > 1:
-            self.inverse_permittivity[-1, :, :, 0] = 0
+            self.inverse_permittivity[-1, :, :, 0] = self.grid.inverse_permittivity[
+                -1, self.y, self.z, 0
+            ]
         if self.Ny > 1:
-            self.inverse_permittivity[:, -1, :, 1] = 0
+            self.inverse_permittivity[:, -1, :, 1] = self.grid.inverse_permittivity[
+                self.x, -1, self.z, 1
+            ]
         if self.Nz > 1:
-            self.inverse_permittivity[:, :, -1, 2] = 0
+            self.inverse_permittivity[:, :, -1, 2] = self.grid.inverse_permittivity[
+                self.x, self.y, -1, 2
+            ]
+
+        self.grid.inverse_permittivity[self.x, self.y, self.z] = 0
 
     def _handle_slice(self, s: ListOrSlice, max_index: int = None) -> slice:
         if isinstance(s, list):

fdtd/sources.py

@@ -17,13 +17,9 @@
 from .grid import Grid
 from .backend import backend as bd
 
-## Base source class:
-class Source:
-    """ an FDTD Source [base class] """
-
 
 ## LineSource class
-class LineSource(Source):
+class LineSource:
     """ A source along a line in the FDTD grid """
 
     def __init__(