From 77e7781705817d560ed0cd4984398f3bce4ecf7a Mon Sep 17 00:00:00 2001 From: Jan Petykiewicz Date: Thu, 11 Jun 2020 19:27:35 -0700 Subject: [PATCH] fix imports --- meanas/fdfd/waveguide_2d.py | 5 ++--- meanas/fdfd/waveguide_cyl.py | 13 +++++-------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/meanas/fdfd/waveguide_2d.py b/meanas/fdfd/waveguide_2d.py index 21bb404..15f9ccc 100644 --- a/meanas/fdfd/waveguide_2d.py +++ b/meanas/fdfd/waveguide_2d.py @@ -154,7 +154,6 @@ import scipy.sparse as sparse from ..fdmath.operators import deriv_forward, deriv_back, curl_forward, curl_back, cross from ..fdmath import vec, unvec, dx_lists_t, fdfield_t, vfdfield_t from ..eigensolvers import signed_eigensolve, rayleigh_quotient_iteration -from . import operators __author__ = 'Jan Petykiewicz' @@ -275,8 +274,8 @@ def operator_h(omega: complex, if numpy.any(numpy.equal(mu, None)): mu = numpy.ones_like(epsilon) - Dfx, Dfy = operators.deriv_forward(dxes[0]) - Dbx, Dby = operators.deriv_back(dxes[1]) + Dfx, Dfy = deriv_forward(dxes[0]) + Dbx, Dby = deriv_back(dxes[1]) eps_parts = numpy.split(epsilon, 3) eps_yx = sparse.diags(numpy.hstack((eps_parts[1], eps_parts[0]))) diff --git a/meanas/fdfd/waveguide_cyl.py b/meanas/fdfd/waveguide_cyl.py index 8ac55bd..cfc09c1 100644 --- a/meanas/fdfd/waveguide_cyl.py +++ b/meanas/fdfd/waveguide_cyl.py @@ -14,11 +14,8 @@ from numpy.linalg import norm import scipy.sparse as sparse from ..fdmath import vec, unvec, dx_lists_t, fdfield_t, vfdfield_t +from ..fdmath.operators import deriv_forward, deriv_back from ..eigensolvers import signed_eigensolve, rayleigh_quotient_iteration -from . import operators - - -__author__ = 'Jan Petykiewicz' def cylindrical_operator(omega: complex, @@ -50,8 +47,8 @@ def cylindrical_operator(omega: complex, Sparse matrix representation of the operator """ - Dfx, Dfy = operators.deriv_forward(dxes[0]) - Dbx, Dby = operators.deriv_back(dxes[1]) + Dfx, Dfy = deriv_forward(dxes[0]) + Dbx, Dby = deriv_back(dxes[1]) rx = r0 + numpy.cumsum(dxes[0][0]) ry = r0 + dxes[0][0]/2.0 + numpy.cumsum(dxes[1][0]) @@ -109,7 +106,7 @@ def solve_mode(mode_number: int, ''' dxes_real = [[numpy.real(dx) for dx in dxi] for dxi in dxes] - A_r = waveguide.cylindrical_operator(numpy.real(omega), dxes_real, numpy.real(epsilon), r0) + A_r = cylindrical_operator(numpy.real(omega), dxes_real, numpy.real(epsilon), r0) eigvals, eigvecs = signed_eigensolve(A_r, mode_number + 3) e_xy = eigvecs[:, -(mode_number+1)] @@ -117,7 +114,7 @@ def solve_mode(mode_number: int, Now solve for the eigenvector of the full operator, using the real operator's eigenvector as an initial guess for Rayleigh quotient iteration. ''' - A = waveguide.cylindrical_operator(omega, dxes, epsilon, r0) + A = cylindrical_operator(omega, dxes, epsilon, r0) eigval, e_xy = rayleigh_quotient_iteration(A, e_xy) # Calculate the wave-vector (force the real part to be positive)