ElectroMagneticPython 2.1.4__tar.gz → 2.1.5__tar.gz

{ElectroMagneticPython-2.1.4 → ElectroMagneticPython-2.1.5}/EMpy/RCWA.py

@@ -68,7 +68,6 @@ def dispersion_relation_extraordinary(kx, ky, k, nO, nE, c):
     kz = S.empty_like(kx)
 
     for ii in range(0, kx.size):
-
         alpha = nE**2 - nO**2
         beta = kx[ii] / k * c[0] + ky[ii] / k * c[1]
 
@@ -234,7 +233,6 @@ class IsotropicRCWA(RCWA):
         dlt = (i == 0).astype(int)
 
         for iwl, wl in enumerate(self.wls):
-
             # free space wavevector
             k = 2 * pi / wl
 
@@ -287,7 +285,6 @@ class IsotropicRCWA(RCWA):
             MTp1.fill(0.0)
             MTp2.fill(0.0)
             for nlayer in range(nlayers - 2, 0, -1):  # internal layers
-
                 layer = multilayer[nlayer]
                 d = layer.thickness
 
@@ -315,13 +312,11 @@ class IsotropicRCWA(RCWA):
                         A = S.diag((kx / k) ** 2) - E
 
                 if S.absolute(K[2] / k) > 1e-10:
-
                     raise ValueError(
                         "First Order Helmholtz Operator not implemented, yet!"
                     )
 
                 elif ky == 0 or S.allclose(S.diag(Ky / ky * k), 1):
-
                     # lalanne
                     # H_U_reduced = S.dot(Ky, Ky) + A
                     H_U_reduced = (ky / k) ** 2 * I + A
@@ -395,7 +390,6 @@ class IsotropicRCWA(RCWA):
                     )
 
                 else:
-
                     ValueError("Second Order Helmholtz Operator not implemented, yet!")
 
             # M = S.asarray(S.bmat([-MR, MT]))
@@ -516,7 +510,6 @@ class AnisotropicRCWA(RCWA):
         dlt = (i == 0).astype(int)
 
         for iwl, wl in enumerate(self.wls):
-
             nO1 = nE1 = multilayer[0].mat.n(wl).item()
             nO3 = nE3 = multilayer[-1].mat.n(wl).item()
 
@@ -653,7 +646,6 @@ class AnisotropicRCWA(RCWA):
             M.fill(0.0)
 
             for nlayer in range(nlayers - 2, 0, -1):  # internal layers
-
                 layer = multilayer[nlayer]
                 thickness = layer.thickness
 

{ElectroMagneticPython-2.1.4 → ElectroMagneticPython-2.1.5}/EMpy/__init__.py

@@ -22,8 +22,6 @@ __all__ = [
 ]
 __author__ = "Lorenzo Bolla"
 
-from numpy.testing import Tester  # type: ignore
-
 from . import constants
 from . import devices
 from . import materials
@@ -35,5 +33,3 @@ from . import utils
 from .version import version
 
 __version__ = version
-
-test = Tester().test

{ElectroMagneticPython-2.1.4 → ElectroMagneticPython-2.1.5}/EMpy/devices.py

@@ -1297,7 +1297,6 @@ class SWG(Device):
     pf400_225 = [1.255208385485759e-007, -1.784557912270417e-003, 4.737972109281652e000]
 
     def __init__(self, w, h, T):
-
         self.w = w
         self.h = h  # not used!
         self.T = T

{ElectroMagneticPython-2.1.4 → ElectroMagneticPython-2.1.5}/EMpy/materials.py

@@ -90,7 +90,6 @@ class RefractiveIndex:
     def __init__(
         self, n0_const=None, n0_poly=None, n0_smcoeffs=None, n0_known=None, n0_func=None
     ):
-
         if n0_const is not None:
             self.get_rix = partial(self.__from_const, n0_const)
 

{ElectroMagneticPython-2.1.4 → ElectroMagneticPython-2.1.5}/EMpy/modesolvers/FD.py

@@ -88,7 +88,6 @@ class SVFDModeSolver(ModeSolver):
         return eps
 
     def build_matrix(self):
-
         from scipy.sparse import coo_matrix
 
         wl = self.wl
@@ -134,7 +133,6 @@ class SVFDModeSolver(ModeSolver):
         # three methods: Ex, Ey and scalar
 
         if method == "Ex":
-
             # Ex
 
             An = 2 / n / (n + s)
@@ -164,7 +162,6 @@ class SVFDModeSolver(ModeSolver):
             Ap = ep * k**2 - An - As - Ae * ep / ee - Aw * ep / ew
 
         elif method == "Ey":
-
             # Ey
 
             An = (
@@ -194,7 +191,6 @@ class SVFDModeSolver(ModeSolver):
             Ap = ep * k**2 - An * ep / en - As * ep / es - Ae - Aw
 
         elif method == "scalar":
-
             # scalar
 
             An = 2 / n / (n + s)
@@ -204,7 +200,6 @@ class SVFDModeSolver(ModeSolver):
             Ap = ep * k**2 - An - As - Ae - Aw
 
         else:
-
             raise ValueError("unknown method")
 
         ii = numpy.arange(nx * ny).reshape(nx, ny)
@@ -260,7 +255,6 @@ class SVFDModeSolver(ModeSolver):
         return A
 
     def solve(self, neigs, tol):
-
         from scipy.sparse.linalg import eigen
 
         self.nmodes = neigs
@@ -388,7 +382,6 @@ class VFDModeSolver(ModeSolver):
         return epsxx, epsxy, epsyx, epsyy, epszz
 
     def build_matrix(self):
-
         from scipy.sparse import coo_matrix
 
         wl = self.wl
@@ -814,7 +807,6 @@ class VFDModeSolver(ModeSolver):
         return A
 
     def compute_other_fields(self, neffs, Hxs, Hys):
-
         from scipy.sparse import coo_matrix
 
         wl = self.wl
@@ -827,7 +819,6 @@ class VFDModeSolver(ModeSolver):
         Eys = []
         Ezs = []
         for neff, Hx, Hy in zip(neffs, Hxs, Hys):
-
             dx = numpy.diff(x)
             dy = numpy.diff(y)
 
@@ -2123,7 +2114,7 @@ class VFDModeSolver(ModeSolver):
         [Hzs, Exs, Eys, Ezs] = self.compute_other_fields(neffs, Hxs, Hys)
 
         self.modes = []
-        for (neff, Hx, Hy, Hz, Ex, Ey, Ez) in zip(neffs, Hxs, Hys, Hzs, Exs, Eys, Ezs):
+        for neff, Hx, Hy, Hz, Ex, Ey, Ez in zip(neffs, Hxs, Hys, Hzs, Exs, Eys, Ezs):
             self.modes.append(
                 FDMode(
                     self.wl, self.x, self.y, neff, Ex, Ey, Ez, Hx, Hy, Hz
@@ -2165,7 +2156,6 @@ class FDMode(Mode):
         return numpy.linspace(self.y[0], self.y[-1], n)
 
     def get_field(self, fname, x=None, y=None):
-
         if fname == "Ex":
             f = self.Ex
             centered = True
@@ -2246,7 +2236,6 @@ class FDMode(Mode):
         return self
 
     def overlap(self, m, x=None, y=None):
-
         x1 = EMpy.utils.centered1d(self.x)
         y1 = EMpy.utils.centered1d(self.y)
 
@@ -2423,7 +2412,6 @@ class FDMode(Mode):
 
 
 def stretchmesh(x, y, nlayers, factor, method="PPPP"):
-
     # OKKIO: check me!
 
     # This function can be used to continuously stretch the grid
@@ -2479,9 +2467,7 @@ def stretchmesh(x, y, nlayers, factor, method="PPPP"):
     factor *= numpy.ones(4)
 
     for idx, (n, f, m) in enumerate(zip(nlayers, factor, method.upper())):
-
         if n > 0 and f != 1:
-
             if idx == 0:
                 # north boundary
                 kv = numpy.arange(len(y) - 1 - n, len(y))

{ElectroMagneticPython-2.1.4 → ElectroMagneticPython-2.1.5}/EMpy/modesolvers/FMM.py

@@ -342,14 +342,12 @@ class FMMMode2d(Mode):
         cBzTM = numpy.zeros_like(ExTE)
 
         for mx, slice in enumerate(self.slicesx):
-
             idx = numpy.where((slice.x1 <= x) & (x < slice.x2))
             x2 = x[idx] - slice.x1
             x1 = slice.x2 - x[idx]
             dx = slice.x2 - slice.x1
 
             for n in range(nmodi):
-
                 fi = slice.modih[n].eval(y)
                 fidot = dot(slice.modih[n]).eval(y)
 
@@ -501,7 +499,6 @@ class FMMMode2d(Mode):
         return cSz
 
     def TEfrac_old(self, x_=None, y_=None):
-
         if x_ is None:
             x = self.get_x()
         else:
@@ -517,12 +514,10 @@ class FMMMode2d(Mode):
         return numpy.abs(cSTE) / (numpy.abs(cSTE) + numpy.abs(cSTM))
 
     def TEfrac(self):
-
         Sx, Sy = self.__overlap(self)
         return Sx / (Sx - Sy)
 
     def overlap_old(self, m, x_=None, y_=None):
-
         if x_ is None:
             x = self.get_x()
         else:
@@ -545,7 +540,6 @@ class FMMMode2d(Mode):
         )
 
     def __overlap_old(self, mode):
-
         nmodi = len(self.modie)
         k0 = 2.0 * numpy.pi / self.slicesx[0].wl
         kz = self.keff
@@ -554,9 +548,7 @@ class FMMMode2d(Mode):
         Sy = 0j
 
         for mx, slice in enumerate(self.slicesx):
-
             for n1 in range(nmodi):
-
                 phi_n1 = slice.modih[n1]
                 # phidot_n1 = dot(phi_n1)
 
@@ -587,7 +579,6 @@ class FMMMode2d(Mode):
                 uedot_n1 = dot(ue_n1)
 
                 for n2 in range(nmodi):
-
                     phi_n2 = mode.slicesx[mx].modih[n2]
                     phidot_n2 = dot(phi_n2)
 
@@ -637,7 +628,6 @@ class FMMMode2d(Mode):
         return (Sx, Sy)
 
     def __overlap(self, mode):
-
         nmodi = len(self.modie)
         k0 = 2.0 * numpy.pi / self.slicesx[0].wl
         kz = self.keff
@@ -646,7 +636,6 @@ class FMMMode2d(Mode):
         Sy = 0j
 
         for mx, slice in enumerate(self.slicesx):
-
             phi_n1s = []
             phidot_n1s = []
             psi_n1s = []
@@ -672,7 +661,6 @@ class FMMMode2d(Mode):
             kfh_n2s = []
 
             for n1 in range(nmodi):
-
                 phi_n1 = slice.modih[n1]
                 phi_n1s.append(phi_n1)
                 phidot_n1s.append(dot(phi_n1))
@@ -744,7 +732,6 @@ class FMMMode2d(Mode):
                 uedot_n2s.append(dot(ue_n2))
 
             for n1 in range(nmodi):
-
                 uh_n1 = uh_n1s[n1]
                 ue_n1 = ue_n1s[n1]
                 uedot_n1 = uedot_n1s[n1]
@@ -755,7 +742,6 @@ class FMMMode2d(Mode):
                 kfe_n1 = kfe_n1s[n1]
 
                 for n2 in range(nmodi):
-
                     uh_n2 = uh_n2s[n2]
                     uhdot_n2 = uhdot_n2s[n2]
                     ue_n2 = ue_n2s[n2]
@@ -784,16 +770,13 @@ class FMMMode2d(Mode):
         return (Sx, Sy)
 
     def overlap(self, mode):
-
         Sx, Sy = self.__overlap(mode)
         return Sx - Sy
 
     def norm(self):
-
         return scipy.sqrt(self.overlap(self))
 
     def normalize(self):
-
         n = self.norm()
         for ue, uh in zip(self.modie, self.modih):
             ue.sl /= n
@@ -850,7 +833,6 @@ class FMMMode2d(Mode):
         return (Ex_FDTD, Ey_FDTD, Ez_FDTD, Hx_FDTD, Hy_FDTD, Hz_FDTD)
 
     def plot(self, x_=None, y_=None):
-
         if x_ is None:
             x = self.get_x()
         else:
@@ -995,7 +977,6 @@ class FMM2d(FMM):
 
 
 def analyticalsolution(nmodi, TETM, FMMpars):
-
     betay = FMMpars["beta"]
     epsilon = FMMpars["epsilon"]
     Uy = FMMpars["Uy"]
@@ -1089,7 +1070,6 @@ def sinxsux(x):
 
 
 def FMMshootingTM(kz_, FMMpars):
-
     betay = FMMpars["beta"]
     eps = FMMpars["epsilon"]
     Uy = FMMpars["Uy"]
@@ -1138,14 +1118,12 @@ def FMMshootingTM(kz_, FMMpars):
     modo = FMMMode1dy()
 
     for m in range(0, len(kz)):
-
         k = k_[m, :]
         sinkdsuk = sinkdsuk_[m, :][0]
         coskd = coskd_[m, :][0]
         sinkdk = sinkdk_[m, :][0]
 
         for idx in range(0, n1):
-
             sr[idx] = sl[idx] * coskd[idx] + al[idx] * sinkdsuk[idx]
             ar[idx] = al[idx] * coskd[idx] - sl[idx] * sinkdk[idx]
 
@@ -1156,7 +1134,6 @@ def FMMshootingTM(kz_, FMMpars):
             # *******************
 
         for idx1 in range(Nregions - 1, n2 - 2, -1):
-
             sl[idx1] = sr[idx1] * coskd[idx1] - ar[idx1] * sinkdsuk[idx1]
             al[idx1] = ar[idx1] * coskd[idx1] + sr[idx1] * sinkdk[idx1]
 
@@ -1172,7 +1149,6 @@ def FMMshootingTM(kz_, FMMpars):
         )
 
         if len(kz) < 2:
-
             # normalize and save only if len(kz) == 1
             # otherwise, modo is ignored and only Delta is useful
 
@@ -1197,7 +1173,6 @@ def FMMshootingTM(kz_, FMMpars):
 
 
 def FMMshooting(kz_, FMMpars):
-
     betay = FMMpars["beta"]
     Uy = FMMpars["Uy"]
     by = FMMpars["boundary"]
@@ -1245,14 +1220,12 @@ def FMMshooting(kz_, FMMpars):
     modo = FMMMode1dy()
 
     for m in range(0, len(kz)):
-
         k = k_[m, :]
         sinkdsuk = sinkdsuk_[m, :][0]
         coskd = coskd_[m, :][0]
         sinkdk = sinkdk_[m, :][0]
 
         for idx in range(0, n1):
-
             sr[idx] = sl[idx] * coskd[idx] + al[idx] * sinkdsuk[idx]
             ar[idx] = al[idx] * coskd[idx] - sl[idx] * sinkdk[idx]
 
@@ -1263,7 +1236,6 @@ def FMMshooting(kz_, FMMpars):
             # *******************
 
         for idx1 in range(Nregions - 1, n2 - 2, -1):
-
             sl[idx1] = sr[idx1] * coskd[idx1] - ar[idx1] * sinkdsuk[idx1]
             al[idx1] = ar[idx1] * coskd[idx1] + sr[idx1] * sinkdk[idx1]
 
@@ -1317,7 +1289,6 @@ def FMMshooting(kz_, FMMpars):
     #                 compiler = 'gcc')
 
     if len(kz) < 2:
-
         # normalize and save only if len(kz) == 1
         # otherwise, modo is ignored and only Delta is useful
 
@@ -1343,7 +1314,6 @@ def FMMshooting(kz_, FMMpars):
 
 
 def remove_consecutives(x, y):
-
     b = numpy.r_[numpy.diff(x) == 1, 0].astype(int)
 
     ic = 0
@@ -1373,7 +1343,6 @@ def remove_consecutives(x, y):
 
 
 def findzerosnew(x, y, searchinterval):
-
     minsi = 2 * numpy.abs(x[1] - x[0])
     if searchinterval < minsi:
         searchinterval = minsi
@@ -1413,7 +1382,6 @@ def findzerosnew(x, y, searchinterval):
 
 
 def absfzzero2(t, f, xmin, xmax, ymin, ymax):
-
     xmean = numpy.mean([xmin, xmax])
     ymean = numpy.mean([ymin, ymax])
     xwidth = xmax - xmin
@@ -1426,7 +1394,6 @@ def absfzzero2(t, f, xmin, xmax, ymin, ymax):
 
 
 def fzzeroabs2(f, zmin, zmax):
-
     xmin = numpy.real(zmin)
     ymin = numpy.imag(zmin)
     xmax = numpy.real(zmax)
@@ -1459,7 +1426,6 @@ def fzzeroabs2(f, zmin, zmax):
 
 
 def scalarprod(modo1, modo2):
-
     d = numpy.diff(modo1.U)
 
     ky1 = modo1.k
@@ -1478,7 +1444,6 @@ def scalarprod(modo1, modo2):
     scprod = numpy.zeros_like(modo1.sl)
 
     for idy in range(Nlayers):
-
         if numpy.allclose(ky1[idy], ky2[idy]):
             if numpy.linalg.norm(ky1) < 1e-10:
                 scprod[idy] = sl1[idy] * sl2[idy] * (modo1.U[idy + 1] - modo1.U[idy])
@@ -1505,7 +1470,6 @@ def scalarprod(modo1, modo2):
 
 
 def sueps(modo):
-
     eps = modo.pars["epsilon"]
     modosueps = copy.deepcopy(modo)
     modosueps.sl /= eps
@@ -1517,7 +1481,6 @@ def sueps(modo):
 
 
 def FMM1d_y(Uy, ny, wl, nmodi, boundaryRL, TETM, verbosity=0):
-
     k0 = 2 * numpy.pi / wl
     betay = ny * k0
     Nstepskz = 1543
@@ -1592,7 +1555,6 @@ def FMM1d_y(Uy, ny, wl, nmodi, boundaryRL, TETM, verbosity=0):
     # inizia il ciclo sugli intervalli
     Message("Refine zeros.", 2).show(verbosity)
     for m in range(0, len(kz1)):
-
         if mk == nmodi:
             break
         if TETM == "TM":
@@ -1629,7 +1591,6 @@ def FMM1d_y(Uy, ny, wl, nmodi, boundaryRL, TETM, verbosity=0):
 
 
 def script1d(Ux, Uy, refindex, wl, boundary, nmodislices, verbosity=0):
-
     nx = refindex.shape[0]
     slices = []
     for m in range(nx):
@@ -1654,7 +1615,6 @@ def script1d(Ux, Uy, refindex, wl, boundary, nmodislices, verbosity=0):
 
 
 def dot(modo):
-
     k = modo.k
     mododot = copy.deepcopy(modo)
     mododot.sl = modo.al
@@ -1665,7 +1625,6 @@ def dot(modo):
 
 
 def genera_rotazione(slices):
-
     nmodi = len(slices[0].modih)
     k0 = 2 * numpy.pi / slices[0].wl
     Nslices = len(slices)
@@ -1722,7 +1681,6 @@ def genera_rotazione(slices):
 
 
 def ortonormalita(slices):
-
     nmodi = len(slices[0].modih)
     k0 = 2 * numpy.pi / slices[0].wl
     Nslices = len(slices)
@@ -1741,7 +1699,6 @@ def ortonormalita(slices):
     M.Rhe = numpy.zeros_like(M.ee)
 
     for idx, slice in enumerate(slices):
-
         for n in range(nmodi):
             Fhn = slice.modih[n]
             Fen = slice.modie[n]
@@ -1787,7 +1744,6 @@ def ortonormalita(slices):
 
 
 def method_of_component(kz_, slices, Rot, uscelto=None, icomp=None):
-
     kz = numpy.atleast_1d(kz_)
     abscomp = numpy.zeros(len(kz))
     #    tmp = 500 # OKKIO: perche' 500?
@@ -1815,7 +1771,6 @@ def method_of_component(kz_, slices, Rot, uscelto=None, icomp=None):
 
 
 def creaTeThSeSh(kz, slices):
-
     Nslices = len(slices)
     nmodi = len(slices[0].modie)
     d = numpy.array([s.x2 - s.x1 for s in slices])
@@ -1874,7 +1829,6 @@ def creaTeThSeSh(kz, slices):
 
 
 def Mvec(kz, slices, R):
-
     Nslices = len(slices)
     Rhh = R.Rhh
     Ree = R.Ree
@@ -1897,7 +1851,6 @@ def Mvec(kz, slices, R):
     Dim1 = numpy.arange(dim1)
 
     for idx in range(3, Nslices):
-
         idxeJA = (2 * idx - 4) * dim1
         idxeJB = (2 * idx - 6) * dim1
         idxeJC = (2 * idx - 2) * dim1
@@ -2052,7 +2005,6 @@ def Mvec(kz, slices, R):
 
 
 def check_matching(kz, slices, modo, R):
-
     Te, Th, Se, Sh, Teleft, Teright, Thleft, Thright = creaTeThSeSh(kz, slices)
     Shr = numpy.array([m.sr for m in modo.modih])
     Shl = numpy.array([m.sl for m in modo.modih])
@@ -2131,7 +2083,6 @@ def check_matching(kz, slices, modo, R):
 
 
 def creacoeffx3(kz, solution, slices, R):
-
     Nslices = len(slices)
 
     xl = slices[0].boundary.xleft
@@ -2160,7 +2111,6 @@ def creacoeffx3(kz, solution, slices, R):
     arh = numpy.zeros_like(ale)
 
     if (xl == "Electric Wall") & (xr == "Electric Wall"):
-
         sle = numpy.c_[numpy.zeros((nmodi, 1)), sle2end]
         sre[:, -1] = numpy.zeros(nmodi)
         are[:, -1] = -Se[:, -1] * sle[:, -1]
@@ -2192,7 +2142,6 @@ def creacoeffx3(kz, solution, slices, R):
             )
 
     elif (xl == "Electric Wall") & (xr == "Magnetic Wall"):
-
         sle = numpy.c_[numpy.zeros((nmodi, 1)), sle2end]
         are[:, -1] = numpy.zeros(nmodi)
         sre[:, -1] = Se[:, -1] / Te[:, -1] * sle[:, -1]
@@ -2224,7 +2173,6 @@ def creacoeffx3(kz, solution, slices, R):
             )
 
     elif (xl == "Magnetic Wall") & (xr == "Electric Wall"):
-
         sle = numpy.c_[numpy.zeros((nmodi, 1)), sle2end]
         slh = numpy.c_[numpy.zeros((nmodi, 1)), slh2end]
 
@@ -2256,7 +2204,6 @@ def creacoeffx3(kz, solution, slices, R):
             )
 
     elif (xl == "Magnetic Wall") & (xr == "Magnetic Wall"):
-
         sle = numpy.c_[numpy.zeros((nmodi, 1)), sle2end]
         slh = numpy.c_[numpy.zeros((nmodi, 1)), slh2end]
 
@@ -2296,7 +2243,6 @@ def creacoeffx3(kz, solution, slices, R):
     ke = numpy.zeros_like(kh)
 
     for n in range(nmodi):
-
         for q, slice in enumerate(slices):
             kh[n, q] = slice.modih[n].keff.item()
             ke[n, q] = slice.modie[n].keff.item()
@@ -2323,7 +2269,6 @@ def creacoeffx3(kz, solution, slices, R):
 
 
 def FMM1d_x_component(slices, nmodi, verbosity=0):
-
     Message("Matching 1dmodes on slices interfaces.", 1).show(verbosity)
 
     TolnullEig = 1e-1
@@ -2375,7 +2320,6 @@ def FMM1d_x_component(slices, nmodi, verbosity=0):
     mk = 0
     modi = []
     for m in range(len(kz1)):
-
         if mk == nmodi:
             break
 
@@ -2389,7 +2333,6 @@ def FMM1d_x_component(slices, nmodi, verbosity=0):
         )
 
         if len(valf) > 0:
-
             eigval, eigvec = numpy.linalg.eig(Mvec(z0, slices, Rot))
             mk += 1
             index0 = numpy.where(numpy.abs(eigval) < TolnullEig)[0]

{ElectroMagneticPython-2.1.4 → ElectroMagneticPython-2.1.5}/EMpy/modesolvers/geometries.py

@@ -38,7 +38,6 @@ def T2S(T):
 
 
 class SWG:
-
     #    def __init__(self, cs, solver, length, inputLHS=None, inputRHS=None):
     def __init__(self, solver, length, inputLHS=None, inputRHS=None):
         #        self.cs = cs
@@ -95,7 +94,6 @@ class SWG:
 
 
 class SimpleJoint:
-
     #    def __init__(self, cs1, cs2, solver1, solver2, inputLHS=None, inputRHS=None):
     def __init__(self, solver1, solver2, inputLHS=None, inputRHS=None):
         #        self.cs1 = cs1

{ElectroMagneticPython-2.1.4 → ElectroMagneticPython-2.1.5}/EMpy/modesolvers/interface.py

@@ -52,7 +52,6 @@ def overlap(m1, m2, x=None, y=None):
 
 
 def interface_matrix(solver1, solver2, x=None, y=None):
-
     neigs = solver1.nmodes
 
     O11 = numpy.zeros((neigs, neigs), dtype=complex)
@@ -62,7 +61,6 @@ def interface_matrix(solver1, solver2, x=None, y=None):
 
     for i in range(neigs):
         for j in range(neigs):
-
             O11[i, j] = overlap(solver1.modes[i], solver1.modes[j], x, y)
             O22[i, j] = overlap(solver2.modes[i], solver2.modes[j], x, y)
             O12[i, j] = overlap(solver1.modes[i], solver2.modes[j], x, y)

{ElectroMagneticPython-2.1.4 → ElectroMagneticPython-2.1.5}/EMpy/transfer_matrix.py

@@ -68,10 +68,10 @@ class IsotropicTransferMatrix(TransferMatrix):
         nlayers = len(multilayer)
         d = S.array([l.thickness for l in multilayer]).ravel()
 
-        Rs = S.zeros_like(self.wls)
-        Ts = S.zeros_like(self.wls)
-        Rp = S.zeros_like(self.wls)
-        Tp = S.zeros_like(self.wls)
+        Rs = S.zeros_like(self.wls, dtype=float)
+        Ts = S.zeros_like(self.wls, dtype=float)
+        Rp = S.zeros_like(self.wls, dtype=float)
+        Tp = S.zeros_like(self.wls, dtype=float)
 
         Dp = S.zeros((2, 2), dtype=complex)
         Ds = S.zeros((2, 2), dtype=complex)
@@ -86,7 +86,6 @@ class IsotropicTransferMatrix(TransferMatrix):
             ntot[:, i] = l.mat.n(self.wls, l.mat.toc.T0)
 
         for iwl, wl in enumerate(self.wls):
-
             n = ntot[iwl, :]
             theta = snell(theta_inc, n)
 
@@ -99,7 +98,6 @@ class IsotropicTransferMatrix(TransferMatrix):
             Mp = inv(Dp)
 
             for nn, dd, tt, kk in zip(n[1:-1], d[1:-1], theta[1:-1], k[1:-1, 0]):
-
                 Ds = [[1.0, 1.0], [nn * S.cos(tt), -nn * S.cos(tt)]]
                 Dp = [[S.cos(tt), S.cos(tt)], [nn, -nn]]
                 phi = kk * dd
@@ -285,7 +283,6 @@ class AnisotropicTransferMatrix(TransferMatrix):
             v = S.zeros((4, 3), dtype=complex)
 
             for i, g in enumerate(gamma):
-
                 # H = K + [
                 #     [-beta2 - g ** 2, alpha * beta, alpha * g],
                 #     [alpha * beta, -alpha2 - g ** 2, beta * g],
@@ -327,7 +324,6 @@ class AnisotropicTransferMatrix(TransferMatrix):
             epstot[:, :, :, i] = l.mat.epsilonTensor(self.wls)
 
         for iwl, wl in enumerate(self.wls):
-
             epsilon = epstot[:, :, iwl, :]
 
             kx = 2 * S.pi / wl * S.sin(theta_inc_x)
@@ -342,7 +338,6 @@ class AnisotropicTransferMatrix(TransferMatrix):
             P = S.zeros((4, 4, nlayers), dtype=complex)
 
             for i in range(nlayers):
-
                 k[:, :, i], p[:, :, i], q[:, :, i] = find_roots(
                     wl, epsilon[:, :, i], kx, ky
                 )

{ElectroMagneticPython-2.1.4 → ElectroMagneticPython-2.1.5}/EMpy/utils.py

@@ -441,7 +441,6 @@ class LiquidCrystalCell:
         nlayers=100,
         data_file=None,
     ):
-
         self.lc = lc
         self.t_tot = t_tot
         self.t_anchoring = t_anchoring
@@ -616,7 +615,6 @@ class LiquidCrystalCell:
         return z, theta, phi, u
 
     def _get_angles_from_file(self):
-
         # interpolate data file
         data = numpy.loadtxt(self.data_file)
         data_x = numpy.linspace(0, 1, data.shape[0] - 1)
@@ -628,7 +626,6 @@ class LiquidCrystalCell:
         return angles.squeeze()
 
     def _get_angles_from_bvp(self):
-
         # solve bvp
         self.__apply_tension()
         z_ = self.normalized_sample_points
@@ -860,7 +857,6 @@ class CrossSection(list):
         return self.widths().sum()
 
     def grid(self, nx_per_region, ny_per_region):
-
         xs = self.xs()
         ys = self.ys()
 
@@ -1158,7 +1154,6 @@ def find_peaks(x, y, threshold=1e-6):
 
     peaks = []
     for idx in idxs:
-
         # look around the candidate
         xtol = (x.max() - x.min()) * 1e-6
         xopt = scipy.optimize.fminbound(
@@ -1167,7 +1162,6 @@ def find_peaks(x, y, threshold=1e-6):
         yopt = scipy.interpolate.splev(xopt, tck)
 
         if yopt > threshold * y.max():
-
             # FWHM
             tckFWHM = scipy.interpolate.splrep(x, y - 0.5 * yopt)
             roots = scipy.interpolate.sproot(tckFWHM)

ElectroMagneticPython-2.1.5/EMpy/version.py

@@ -0,0 +1 @@
+version = "2.1.5"

{ElectroMagneticPython-2.1.4 → ElectroMagneticPython-2.1.5}/ElectroMagneticPython.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ElectroMagneticPython
-Version: 2.1.4
+Version: 2.1.5
 Summary: EMpy - ElectroMagnetic Python
 Home-page: http://lbolla.github.io/EMpy/
 Download-URL: https://github.com/lbolla/EMpy
@@ -15,11 +15,14 @@ Classifier: Environment :: Console
 Classifier: Intended Audience :: Science/Research
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Natural Language :: English
-Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
 Classifier: Topic :: Scientific/Engineering :: Physics
 Provides: EMpy
 License-File: LICENSE
+Requires-Dist: numpy>=1.18
+Requires-Dist: scipy>=1.7
+Requires-Dist: matplotlib>=3.1
 
 EMpy - ElectroMagnetic Python
 *****************************

{ElectroMagneticPython-2.1.4 → ElectroMagneticPython-2.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ElectroMagneticPython
-Version: 2.1.4
+Version: 2.1.5
 Summary: EMpy - ElectroMagnetic Python
 Home-page: http://lbolla.github.io/EMpy/
 Download-URL: https://github.com/lbolla/EMpy
@@ -15,11 +15,14 @@ Classifier: Environment :: Console
 Classifier: Intended Audience :: Science/Research
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Natural Language :: English
-Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
 Classifier: Topic :: Scientific/Engineering :: Physics
 Provides: EMpy
 License-File: LICENSE
+Requires-Dist: numpy>=1.18
+Requires-Dist: scipy>=1.7
+Requires-Dist: matplotlib>=3.1
 
 EMpy - ElectroMagnetic Python
 *****************************

{ElectroMagneticPython-2.1.4 → ElectroMagneticPython-2.1.5}/requirements.txt

@@ -4,33 +4,31 @@
 #
 #    pip-compile --output-file=requirements.txt setup.py
 #
-contourpy==1.0.6
+contourpy==1.2.0
     # via matplotlib
-cycler==0.11.0
+cycler==0.12.1
     # via matplotlib
-fonttools==4.38.0
+fonttools==4.49.0
     # via matplotlib
-kiwisolver==1.4.4
+kiwisolver==1.4.5
     # via matplotlib
-matplotlib==3.6.2
+matplotlib==3.8.3
     # via ElectroMagneticPython (setup.py)
-numpy==1.23.5
+numpy==1.26.4
     # via
     #   ElectroMagneticPython (setup.py)
     #   contourpy
     #   matplotlib
     #   scipy
-packaging==21.3
+packaging==23.2
     # via matplotlib
-pillow==9.3.0
+pillow==10.2.0
     # via matplotlib
-pyparsing==3.0.9
-    # via
-    #   matplotlib
-    #   packaging
-python-dateutil==2.8.2
+pyparsing==3.1.1
+    # via matplotlib
+python-dateutil==2.9.0.post0
     # via matplotlib
-scipy==1.9.3
+scipy==1.12.0
     # via ElectroMagneticPython (setup.py)
 six==1.16.0
     # via python-dateutil

{ElectroMagneticPython-2.1.4 → ElectroMagneticPython-2.1.5}/setup.py

@@ -35,7 +35,7 @@ setup(
         "Intended Audience :: Science/Research",
         "License :: OSI Approved :: BSD License",
         "Natural Language :: English",
-        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3",
         "Operating System :: OS Independent",
         "Topic :: Scientific/Engineering :: Physics",
     ],

ElectroMagneticPython-2.1.4/EMpy/version.py

@@ -1 +0,0 @@
-version = "2.1.4"