Skip to content

Commit ca517d0

Browse files
committed
revised code based on the PR reviewand ran test_local
1 parent 67e7c64 commit ca517d0

File tree

1 file changed

+18
-13
lines changed

1 file changed

+18
-13
lines changed

tidy3d/plugins/near2far/near2far.py

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -517,8 +517,7 @@ def _radiation_vectors(self, theta: ArrayLikeN2F, phi: ArrayLikeN2F):
517517

518518
return N_theta, N_phi, L_theta, L_phi
519519

520-
def fields_spherical(
521-
self, r: float, theta: ArrayLikeN2F, phi: ArrayLikeN2F) -> xr.Dataset:
520+
def fields_spherical(self, r: float, theta: ArrayLikeN2F, phi: ArrayLikeN2F) -> xr.Dataset:
522521
"""Get fields at a point relative to monitor center in spherical coordinates.
523522
524523
Parameters
@@ -546,8 +545,13 @@ def fields_spherical(
546545
k = self.k
547546
eta = self.eta
548547

549-
scalar_proj_r = (-self.phasor_positive_sign * 1j * k * np.exp(
550-
self.phasor_positive_sign * 1j * k * r) / (4 * np.pi * r))
548+
scalar_proj_r = (
549+
-self.phasor_positive_sign
550+
* 1j
551+
* k
552+
* np.exp(self.phasor_positive_sign * 1j * k * r)
553+
/ (4 * np.pi * r)
554+
)
551555

552556
# assemble E felds
553557
Et_array = -scalar_proj_r * (L_phi + eta * N_theta)
@@ -571,12 +575,12 @@ def fields_spherical(
571575
Hp = xr.DataArray(data=Hp_array[None, ...], coords=coords, dims=dims)
572576

573577
field_data = xr.Dataset(
574-
{"E_r": Er, "E_theta": Et, "E_phi": Ep, "H_r": Hr, "H_theta": Ht, "H_phi": Hp})
578+
{"E_r": Er, "E_theta": Et, "E_phi": Ep, "H_r": Hr, "H_theta": Ht, "H_phi": Hp}
579+
)
575580

576581
return field_data
577582

578-
def fields_cartesian(
579-
self, x: ArrayLikeN2F, y: ArrayLikeN2F, z: ArrayLikeN2F) -> xr.Dataset:
583+
def fields_cartesian(self, x: ArrayLikeN2F, y: ArrayLikeN2F, z: ArrayLikeN2F) -> xr.Dataset:
580584
"""Get fields at a point relative to monitor center in cartesian coordinates.
581585
582586
Parameters
@@ -614,10 +618,12 @@ def fields_cartesian(
614618
r, theta, phi = self._car_2_sph(_x, _y, _z)
615619
_field_data = self.fields_spherical(r, theta, phi)
616620

617-
Er, Etheta, Ephi = [_field_data[comp].values \
618-
for comp in ["E_r", "E_theta", "E_phi"]]
619-
Hr, Htheta, Hphi = [_field_data[comp].values \
620-
for comp in ["H_r", "H_theta", "H_phi"]]
621+
Er, Etheta, Ephi = [
622+
_field_data[comp].values for comp in ["E_r", "E_theta", "E_phi"]
623+
]
624+
Hr, Htheta, Hphi = [
625+
_field_data[comp].values for comp in ["H_r", "H_theta", "H_phi"]
626+
]
621627

622628
Ex_data[i, j, k], Ey_data[i, j, k], Ez_data[i, j, k] = self._sph_2_car_field(
623629
Er, Etheta, Ephi, theta, phi
@@ -637,8 +643,7 @@ def fields_cartesian(
637643
Hy = xr.DataArray(data=Hy_data, coords=coords, dims=dims)
638644
Hz = xr.DataArray(data=Hz_data, coords=coords, dims=dims)
639645

640-
field_data = xr.Dataset(
641-
{"Ex": Ex, "Ey": Ey, "Ez": Ez, "Hx": Hx, "Hy": Hy, "Hz": Hz})
646+
field_data = xr.Dataset({"Ex": Ex, "Ey": Ey, "Ez": Ez, "Hx": Hx, "Hy": Hy, "Hz": Hz})
642647

643648
return field_data
644649

0 commit comments

Comments
 (0)