changed inheritance structure to make PointDipole work properly

flexcompute · Apr 25, 2022 · 81b5191 · 81b5191
1 parent be978ab
commit 81b5191
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 14 deletions.
diff --git a/tests/test_IO.py b/tests/test_IO.py
@@ -11,6 +11,7 @@
 
 @clear_tmp
 def test_simulation_load_export():
+
     path = "tests/tmp/simulation.json"
     SIM.to_file(path)
     SIM2 = Simulation.from_file(path)

diff --git a/tests/utils.py b/tests/utils.py
@@ -89,7 +89,15 @@ def prepend_tmp(path):
                 freq0=2e14,
                 fwidth=4e13,
             ),
-        )
+        ),
+        PointDipole(
+            center=(0, 0.5, 0),
+            polarization="Ex",
+            source_time=GaussianPulse(
+                freq0=2e14,
+                fwidth=4e13,
+            ),
+        ),
     ],
     monitors={
         FieldMonitor(size=(0, 0, 0), center=(0, 0, 0), freqs=[1.5e14, 2e14], name="point"),

diff --git a/tidy3d/components/source.py b/tidy3d/components/source.py
@@ -323,19 +323,9 @@ def plot(
 """ Sources either: (1) implement current distributions or (2) generate fields."""
 
 
-class CurrentSource(Source):
+class CurrentSource(Source, ABC):
     """Source implements a current distribution directly."""
 
-
-class UniformCurrentSource(CurrentSource):
-    """Source in a rectangular volume with uniform time dependence. size=(0,0,0) gives point source.
-
-    Example
-    -------
-    >>> pulse = GaussianPulse(freq0=200e12, fwidth=20e12)
-    >>> pt_source = UniformCurrentSource(size=(0,0,0), source_time=pulse, polarization='Ex')
-    """
-
     polarization: Polarization = pydantic.Field(
         ...,
         title="Polarization",
@@ -354,8 +344,24 @@ def _pol_vector(self) -> Tuple[float, float, float]:
         return None
 
 
-class PointDipole(UniformCurrentSource):
-    """Uniform current source with a zero size."""
+class UniformCurrentSource(CurrentSource):
+    """Source in a rectangular volume with uniform time dependence. size=(0,0,0) gives point source.
+
+    Example
+    -------
+    >>> pulse = GaussianPulse(freq0=200e12, fwidth=20e12)
+    >>> pt_source = UniformCurrentSource(size=(0,0,0), source_time=pulse, polarization='Ex')
+    """
+
+
+class PointDipole(CurrentSource):
+    """Uniform current source with a zero size.
+
+    Example
+    -------
+    >>> pulse = GaussianPulse(freq0=200e12, fwidth=20e12)
+    >>> pt_dipole = PointDipole(center=(1,2,3), source_time=pulse, polarization='Ex')
+    """
 
     size: Tuple[Literal[0], Literal[0], Literal[0]] = (0, 0, 0)