casey fixes eme conflicts

flexcompute · Aug 16, 2024 · 0a7ecc9 · 0a7ecc9
1 parent 0478a7b
commit 0a7ecc9
Showing 1 changed file with 0 additions and 16 deletions.
diff --git a/tidy3d/components/eme/simulation.py b/tidy3d/components/eme/simulation.py
@@ -19,11 +19,7 @@
 from ..monitor import AbstractModeMonitor, ModeSolverMonitor, Monitor, MonitorType
 from ..scene import Scene
 from ..simulation import AbstractYeeGridSimulation, Simulation
-<<<<<<< HEAD
-from ..source import GaussianPulse, ModeSource
-=======
 from ..source import GaussianPulse, PointDipole
->>>>>>> develop
 from ..structure import Structure
 from ..types import Ax, Axis, FreqArray, Symmetry, annotate_type
 from ..validators import MIN_FREQUENCY, validate_freqs_min, validate_freqs_not_empty
@@ -1074,19 +1070,10 @@ def _to_fdtd_sim(self) -> Simulation:
         plane = self.eme_grid.mode_planes[0]
         freq0 = self.freqs[0]
         source_time = GaussianPulse(freq0=freq0, fwidth=0.1 * freq0)
-<<<<<<< HEAD
-        source = ModeSource(
-            center=plane.center,
-            size=plane.size,
-            source_time=source_time,
-            direction="+",
-            mode_spec=self.eme_grid.mode_specs[0]._to_mode_spec(),
-=======
         source = PointDipole(
             center=plane.center,
             source_time=source_time,
             polarization="Ez",
->>>>>>> develop
         )
         # copy over all FDTD monitors too
         monitors = [monitor for monitor in self.monitors if not isinstance(monitor, EMEMonitor)]
@@ -1104,8 +1091,6 @@ def _to_fdtd_sim(self) -> Simulation:
             sources=[source],
             monitors=monitors,
         )
-<<<<<<< HEAD
-=======
 
     def subsection(
         self,
@@ -1186,4 +1171,3 @@ def subsection(
         new_sim = new_sim.updated_copy(eme_grid_spec=eme_grid_spec)
 
         return new_sim
->>>>>>> develop