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

scheme interface for oblique coefs #945

Merged
merged 3 commits into from
Jul 9, 2019
Merged

scheme interface for oblique coefs #945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d2b75bc
scheme interface for oblique coefs
stevengj Jul 2, 2019
28719c7
whoops
stevengj Jul 5, 2019
046f25f
whoops
stevengj Jul 9, 2019
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
2 changes: 1 addition & 1 deletion scheme/meep-ctl-swig.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ kpoint_list do_get_eigenmode_coefficients(meep::fields *f, meep::dft_flux flux,
int parity, std::complex<double> *coeffs, double *vgrp,
double eig_resolution, double eigensolver_tol,
meep::kpoint_func user_kpoint_func,
void *user_kpoint_data);
void *user_kpoint_data, int dir);

ctlio::number_list dft_flux_flux(meep::dft_flux *f);
ctlio::number_list dft_energy_electric(meep::dft_energy *f);
Expand Down
4 changes: 2 additions & 2 deletions scheme/meep.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,14 @@ kpoint_list do_get_eigenmode_coefficients(fields *f, dft_flux flux, const volume
std::complex<double> *coeffs, double *vgrp,
double eig_resolution, double eigensolver_tol,
meep::kpoint_func user_kpoint_func,
void *user_kpoint_data) {
void *user_kpoint_data, int dir) {
size_t num_kpoints = num_bands * flux.Nfreq;
meep::vec *kpoints = new meep::vec[num_kpoints];
meep::vec *kdom = new meep::vec[num_kpoints];

f->get_eigenmode_coefficients(flux, eig_vol, bands, num_bands, parity, eig_resolution,
eigensolver_tol, coeffs, vgrp, user_kpoint_func, user_kpoint_data,
kpoints, kdom);
kpoints, kdom, false, dir < 0 ? flux.normal_direction : direction(dir));

kpoint_list res = {kpoints, num_kpoints, kdom, num_kpoints};

Expand Down
3 changes: 2 additions & 1 deletion scheme/meep.scm.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1214,13 +1214,14 @@
(eig-vol (get-keyword-value args #:eig-vol (meep-dft-flux-where-get flux)))
(eig-resolution (get-keyword-value args #:eig-resolution 0))
(eig-tolerance (get-keyword-value args #:eig-tolerance 1e-12))
(direction (get-keyword-value args #:direction AUTOMATIC))
(num-bands (length bands))
(kpoint-func (get-keyword-value args #:kpoint-func '())))
(begin
(define coeffs (make-typed-array 'c64 '0 num-bands (meep-dft-flux-Nfreq-get flux) 2))
(define vgrp (make-typed-array 'f64 '0 num-bands (meep-dft-flux-Nfreq-get flux)))
(define kpoints-and-kdom (do-get-eigenmode-coefficients fields flux eig-vol bands eig-parity coeffs vgrp
eig-resolution eig-tolerance kpoint-func))
eig-resolution eig-tolerance kpoint-func direction))
(list coeffs vgrp (first kpoints-and-kdom) (second kpoints-and-kdom)))))

; ****************************************************************
Expand Down