modify to new scheme

Author: momchil-flex

tidy3d/components/mode/solver.py

@@ -739,8 +739,8 @@ def solver_tensorial(
         inv_eps_zz = sp.spdiags(1 / eps[2, 2, :], [0], N, N)
 
         # Compute all blocks of the matrix for diagonalization
-        axax = -dxf.dot(inv_eps_zz).dot(cxb).dot(eps_zx) - cyb.dot(mu_yz).dot(inv_mu_zz).dot(dyf)
-        axay = -dxf.dot(inv_eps_zz).dot(cyb).dot(eps_zy) + cyb.dot(mu_yz).dot(inv_mu_zz).dot(dxf)
+        axax = -dxf.dot(inv_eps_zz).dot(eps_zx).dot(cxb) - cyb.dot(mu_yz).dot(inv_mu_zz).dot(dyf)
+        axay = -dxf.dot(inv_eps_zz).dot(eps_zy).dot(cyb) + cyb.dot(mu_yz).dot(inv_mu_zz).dot(dxf)
         axbx = (
             -dxf.dot(inv_eps_zz).dot(dyb)
             + cxf.dot(mu_yx).dot(inv_mu_zz).dot(cyb)
@@ -750,8 +750,8 @@ def solver_tensorial(
             dxf.dot(inv_eps_zz).dot(dxb) + mu_yy - cyb.dot(mu_yz).dot(inv_mu_zz).dot(cyf).dot(mu_zy)
         )
 
-        ayax = -dyf.dot(inv_eps_zz).dot(cxb).dot(eps_zx) + cxb.dot(mu_xz).dot(inv_mu_zz).dot(dyf)
-        ayay = -dyf.dot(inv_eps_zz).dot(cyb).dot(eps_zy) - cxb.dot(mu_xz).dot(inv_mu_zz).dot(dxf)
+        ayax = -dyf.dot(inv_eps_zz).dot(eps_zx).dot(cxb) + cxb.dot(mu_xz).dot(inv_mu_zz).dot(dyf)
+        ayay = -dyf.dot(inv_eps_zz).dot(eps_zy).dot(cyb) - cxb.dot(mu_xz).dot(inv_mu_zz).dot(dxf)
         aybx = (
             -dyf.dot(inv_eps_zz).dot(dyb)
             - mu_xx
@@ -767,26 +767,26 @@ def solver_tensorial(
         bxby = -dxb.dot(inv_mu_zz).dot(cyf).dot(mu_zy) + cyf.dot(eps_yz).dot(inv_eps_zz).dot(dxb)
         bxax = (
             -dxb.dot(inv_mu_zz).dot(dyf)
-            + cxb.dot(eps_yx).dot(cyf)
-            - cyf.dot(eps_yz).dot(inv_eps_zz).dot(cxb).dot(eps_zx)
+            + cyf.dot(eps_yx).dot(cxb)
+            - cyf.dot(eps_yz).dot(inv_eps_zz).dot(eps_zx).dot(cxb)
         )
         bxay = (
             dxb.dot(inv_mu_zz).dot(dxf)
             + eps_yy
-            - cyf.dot(eps_yz).dot(inv_eps_zz).dot(cyb).dot(eps_zy)
+            - cyf.dot(eps_yz).dot(inv_eps_zz).dot(eps_zy).dot(cyb)
         )
 
         bybx = -dyb.dot(inv_mu_zz).dot(cxf).dot(mu_zx) + cxf.dot(eps_xz).dot(inv_eps_zz).dot(dyb)
         byby = -dyb.dot(inv_mu_zz).dot(cyf).dot(mu_zy) - cxf.dot(eps_xz).dot(inv_eps_zz).dot(dxb)
         byax = (
             -dyb.dot(inv_mu_zz).dot(dyf)
             - eps_xx
-            + cxf.dot(eps_xz).dot(inv_eps_zz).dot(cxb).dot(eps_zx)
+            + cxf.dot(eps_xz).dot(inv_eps_zz).dot(eps_zx).dot(cxb)
         )
         byay = (
             dyb.dot(inv_mu_zz).dot(dxf)
-            - cyb.dot(eps_xy).dot(cxf)
-            + cxf.dot(eps_xz).dot(inv_eps_zz).dot(cyb).dot(eps_zy)
+            - cxf.dot(eps_xy).dot(cyb)
+            + cxf.dot(eps_xz).dot(inv_eps_zz).dot(eps_zy).dot(cyb)
         )
 
         mat = sp.bmat(

tidy3d/components/simulation.py

@@ -1580,9 +1580,10 @@ def make_eps_data(coords: Coords):
             return xr.DataArray(eps_array, coords=coords, dims=("x", "y", "z"))
 
         # combine all data into dictionary
-        if coord_key[0] == "E":
-            # off-diagonal components are sampled at respective locations (eg. `eps_xy` at `Ex`)
-            coords = grid[coord_key[0:2]]
+        if coord_key[0] == "E" and len(coord_key) > 2:
+            # off-diagonal components are sampled at grid boundaries
+            coords = grid["boundaries"]
+            coords = Coords(x=coords.x[:-1], y=coords.y[:-1], z=coords.z[:-1])
         else:
             coords = grid[coord_key]
         return make_eps_data(coords)