Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reformulate Simulation.get_sources() and add 2D GaussianBeam #2333

Merged
merged 10 commits into from
Dec 15, 2022
Merged

Reformulate Simulation.get_sources() and add 2D GaussianBeam #2333

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
862bafd
reformulate Simulation.get_sources() to call Source.add_source()
hammy4815 Dec 8, 2022
ab9b5f0
GaussianBeam2DSource created
hammy4815 Dec 8, 2022
9fd27cc
fixed technical bessel comments
hammy4815 Dec 8, 2022
01360c7
added GaussianBeam2DSource to meep.i for __init__.py
hammy4815 Dec 8, 2022
f56c2a0
fixed parameters typo
hammy4815 Dec 8, 2022
c8399c1
docstrings for GaussianBeam2DSource
hammy4815 Dec 8, 2022
b8fc2f9
formatting
hammy4815 Dec 14, 2022
55f8149
formatting
hammy4815 Dec 14, 2022
a2b24c5
test case for 2D gaussianbeam
hammy4815 Dec 14, 2022
830aeea
add deprecation warning type and fix typo
hammy4815 Dec 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions python/meep.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1842,6 +1842,7 @@ PyObject *_get_array_slice_dimensions(meep::fields *f, const meep::volume &where
SourceTime,
check_positive,
GaussianBeamSource,
GaussianBeam2DSource,
)
from .visualization import (
plot2D,
Expand Down
125 changes: 5 additions & 120 deletions python/simulation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2759,128 +2759,13 @@ def set_epsilon(self, eps):
eps, self.eps_averaging, self.subpixel_tol, self.subpixel_maxeval
)

def add_source(self, src):
if self.fields is None:
self.init_sim()

if isinstance(src, IndexedSource):
self.fields.register_src_time(src.src.swigobj)
self.fields.add_srcdata(
src.srcdata,
src.src.swigobj,
src.num_pts,
src.amp_arr,
src.needs_boundary_fix,
)
return

where = Volume(
src.center,
src.size,
dims=self.dimensions,
is_cylindrical=self.is_cylindrical,
).swigobj

if isinstance(src, EigenModeSource):
if src.direction < 0:
direction = self.fields.normal_direction(where)
else:
direction = src.direction

eig_vol = Volume(
src.eig_lattice_center,
src.eig_lattice_size,
self.dimensions,
is_cylindrical=self.is_cylindrical,
).swigobj

if isinstance(src.eig_band, DiffractedPlanewave):
eig_band = 1
diffractedplanewave = bands_to_diffractedplanewave(where, src.eig_band)
elif isinstance(src.eig_band, int):
eig_band = src.eig_band

add_eig_src_args = [
src.component,
src.src.swigobj,
direction,
where,
eig_vol,
eig_band,
py_v3_to_vec(
self.dimensions, src.eig_kpoint, is_cylindrical=self.is_cylindrical
),
src.eig_match_freq,
src.eig_parity,
src.eig_resolution,
src.eig_tolerance,
src.amplitude,
]
add_eig_src = functools.partial(
self.fields.add_eigenmode_source, *add_eig_src_args
)

if isinstance(src.eig_band, DiffractedPlanewave):
add_eig_src(src.amp_func, diffractedplanewave)
else:
add_eig_src(src.amp_func)
elif isinstance(src, GaussianBeamSource):
gaussianbeam_args = [
py_v3_to_vec(
self.dimensions, src.beam_x0, is_cylindrical=self.is_cylindrical
),
py_v3_to_vec(
self.dimensions, src.beam_kdir, is_cylindrical=self.is_cylindrical
),
src.beam_w0,
src.src.swigobj.frequency().real,
self.fields.get_eps(
py_v3_to_vec(self.dimensions, src.center, self.is_cylindrical)
).real,
self.fields.get_mu(
py_v3_to_vec(self.dimensions, src.center, self.is_cylindrical)
).real,
np.array(
[src.beam_E0.x, src.beam_E0.y, src.beam_E0.z], dtype=np.complex128
),
]
gaussianbeam = mp.gaussianbeam(*gaussianbeam_args)
add_vol_src_args = [src.src.swigobj, where, gaussianbeam]
add_vol_src = functools.partial(
self.fields.add_volume_source, *add_vol_src_args
)
add_vol_src()
else:
add_vol_src_args = [src.component, src.src.swigobj, where]
add_vol_src = functools.partial(
self.fields.add_volume_source, *add_vol_src_args
)

if src.amp_func_file:
fname_dset = src.amp_func_file.rsplit(":", 1)
if len(fname_dset) != 2:
err_msg = (
"Expected a string of the form 'h5filename:dataset'. Got '{}'"
)
raise ValueError(err_msg.format(src.amp_func_file))

fname, dset = fname_dset
if not fname.endswith(".h5"):
fname += ".h5"

add_vol_src(fname, dset, src.amplitude * 1.0)
elif src.amp_func:
add_vol_src(src.amp_func, src.amplitude * 1.0)
elif src.amp_data is not None:
add_vol_src(src.amp_data, src.amplitude * 1.0)
else:
add_vol_src(src.amplitude * 1.0)

def add_sources(self):
if self.fields is None:
self.init_sim() # in case only some processes have IndexedSources
for s in self.sources:
self.add_source(s)
if self.fields is None:
self.init_sim() # in case only some processes have IndexedSources
s.add_source(
self
) # each source type can optionally override its own add_source method, else will default to mp.Source method
self.fields.require_source_components() # needed by IndexedSource objects

def _evaluate_dft_objects(self):
Expand Down
Loading