From 83f4d87ad89e5d52c9c1357f920abf6c518b4234 Mon Sep 17 00:00:00 2001 From: Jan Petykiewicz Date: Tue, 28 Jan 2025 19:54:48 -0800 Subject: [PATCH] [fdfd.waveguide*] misc fixes --- meanas/fdfd/waveguide_2d.py | 2 +- meanas/fdfd/waveguide_cyl.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meanas/fdfd/waveguide_2d.py b/meanas/fdfd/waveguide_2d.py index 1942202..5fda683 100644 --- a/meanas/fdfd/waveguide_2d.py +++ b/meanas/fdfd/waveguide_2d.py @@ -946,7 +946,7 @@ def inner_product( # TODO documentation # Find time-averaged Sz and normalize to it dxes_real = [[numpy.real(dxyz) for dxyz in dxeh] for dxeh in dxes] - if integrate: + if trapezoid: Sz_a = numpy.trapezoid(numpy.trapezoid(E1[0] * H2[1], numpy.cumsum(dxes_real[0][1])), numpy.cumsum(dxes_real[1][0])) Sz_b = numpy.trapezoid(numpy.trapezoid(E1[1] * H2[0], numpy.cumsum(dxes_real[0][0])), numpy.cumsum(dxes_real[1][1])) else: diff --git a/meanas/fdfd/waveguide_cyl.py b/meanas/fdfd/waveguide_cyl.py index 05e11e9..4e9b2f6 100644 --- a/meanas/fdfd/waveguide_cyl.py +++ b/meanas/fdfd/waveguide_cyl.py @@ -19,7 +19,7 @@ from scipy import sparse from ..fdmath import vec, unvec, dx_lists_t, vfdfield_t, vcfdfield_t from ..fdmath.operators import deriv_forward, deriv_back from ..eigensolvers import signed_eigensolve, rayleigh_quotient_iteration - +from . import waveguide_2d logger = logging.getLogger(__name__) @@ -62,9 +62,9 @@ def cylindrical_operator( Ta, Tb = dxes2T(dxes=dxes, rmin=rmin) eps_parts = numpy.split(epsilon, 3) - eps_x = sparse.diags(eps_parts[0]) - eps_y = sparse.diags(eps_parts[1]) - eps_z_inv = sparse.diags(1 / eps_parts[2]) + eps_x = sparse.diags_array(eps_parts[0]) + eps_y = sparse.diags_array(eps_parts[1]) + eps_z_inv = sparse.diags_array(1 / eps_parts[2]) omega2 = omega * omega diag = sparse.block_diag @@ -168,7 +168,7 @@ def solve_mode( (e_xy, angular_wavenumber) """ kwargs['mode_numbers'] = [mode_number] - e_xys, wavenumbers = solve_modes(*args, **kwargs) + e_xys, angular_wavenumbers = solve_modes(*args, **kwargs) return e_xys[0], angular_wavenumbers[0]