Skip to content

Commit 7e6baf6

Browse files
HoBeZweHoBeZwe
committed
update formatter
1 parent f694723 commit 7e6baf6

File tree

13 files changed

+55
-92
lines changed

13 files changed

+55
-92
lines changed

‎src/UniformField/excitation.jl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ end
1919
direction=SVector{3,typeof(amplitude)}(1.0, 0.0, 0.0)
2020
)
2121
"""
22-
UniformField(; embedding=Medium(ε0, μ0), amplitude=1.0, direction=SVector{3,typeof(amplitude)}(1.0, 0.0, 0.0)) =
23-
UniformField(embedding, amplitude, direction)
22+
UniformField(; embedding=Medium(ε0, μ0), amplitude=1.0, direction=SVector{3,typeof(amplitude)}(1.0, 0.0, 0.0)) = UniformField(
23+
embedding, amplitude, direction
24+
)
2425

2526
function orientation(ex::UniformField)
2627
return ex.direction

‎src/dipoles/excitation.jl

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,9 @@ end
4949
orientation = SVector{3,typeof(frequency)}(0.0, 0.0, 1.0),
5050
)
5151
"""
52-
HertzianDipole(;
53-
embedding = Medium(ε0, μ0),
54-
frequency = error("missing argument `frequency`"),
55-
amplitude = 1.0,
56-
position = error("missing argument `position`"),
57-
orientation = SVector{3,typeof(frequency)}(0.0, 0.0, 1.0),
58-
) = HertzianDipole(embedding, frequency, amplitude, position, orientation)
52+
HertzianDipole(; embedding=Medium(ε0, μ0), frequency=error("missing argument `frequency`"), amplitude=1.0, position=error("missing argument `position`"), orientation=SVector{3,typeof(frequency)}(0.0, 0.0, 1.0)) = HertzianDipole(
53+
embedding, frequency, amplitude, position, orientation
54+
)
5955

6056

6157
"""
@@ -67,13 +63,9 @@ HertzianDipole(;
6763
orientation = SVector{3,typeof(frequency)}(0.0, 0.0, 1.0),
6864
)
6965
"""
70-
FitzgeraldDipole(;
71-
embedding = Medium(ε0, μ0),
72-
frequency = error("missing argument `frequency`"),
73-
amplitude = 1.0,
74-
position = error("missing argument `position`"),
75-
orientation = SVector{3,typeof(frequency)}(0.0, 0.0, 1.0),
76-
) = FitzgeraldDipole(embedding, frequency, amplitude, position, orientation)
66+
FitzgeraldDipole(; embedding=Medium(ε0, μ0), frequency=error("missing argument `frequency`"), amplitude=1.0, position=error("missing argument `position`"), orientation=SVector{3,typeof(frequency)}(0.0, 0.0, 1.0)) = FitzgeraldDipole(
67+
embedding, frequency, amplitude, position, orientation
68+
)
7769

7870

7971

‎src/dipoles/incident.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ function field(excitation::Dipole, point, quantity::ElectricField; parameter::Pa
3434

3535
Il = excitation.amplitude
3636
k = wavenumber(excitation)
37-
ε = excitation.embedding.ε
38-
μ = excitation.embedding.μ
37+
ε = excitation.embedding.ε
38+
μ = excitation.embedding.μ
3939

4040
r0 = excitation.position
4141
p = excitation.orientation
@@ -86,8 +86,8 @@ function field(excitation::HertzianDipole, point, quantity::FarField; parameter:
8686

8787
Il = excitation.amplitude
8888
k = wavenumber(excitation)
89-
ε = excitation.embedding.ε
90-
μ = excitation.embedding.μ
89+
ε = excitation.embedding.ε
90+
μ = excitation.embedding.μ
9191

9292
r0 = excitation.position
9393
p = excitation.orientation

‎src/dipoles/scattered.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ function scatteredfield(sphere::PECSphere, excitation::Dipole, point, quantity::
5252

5353
eps = parameter.relativeAccuracy
5454

55-
Er = Complex{T}(0.0) # initialize
55+
Er = Complex{T}(0.0) # initialize
5656
Eϑ = Complex{T}(0.0) # initialize
5757
δEr = T(Inf)
58-
n = 0
58+
n = 0
5959

6060
r = point_sph[1]
6161

@@ -185,7 +185,7 @@ function scatteredfield(sphere::PECSphere, excitation::HertzianDipole, point, qu
185185

186186
Eϑ = Complex{T}(0.0) # initialize
187187
δE = T(Inf)
188-
n = 0
188+
n = 0
189189

190190
kz0 = k * z0
191191
ka = k * sphere.radius
@@ -243,7 +243,7 @@ function scatteredfield(sphere::PECSphere, excitation::FitzgeraldDipole, point,
243243

244244
Eϕ = Complex{T}(0.0) # initialize
245245
δE = T(Inf)
246-
n = 0
246+
n = 0
247247

248248
kz0 = k * z0
249249
ka = k * sphere.radius

‎src/planeWave/excitation.jl

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,7 @@ end
3131
polarization = SVector{3,typeof(frequency)}(1.0, 0.0, 0.0),
3232
)
3333
"""
34-
planeWave(;
35-
embedding = Medium(ε0, μ0),
36-
frequency = error("missing argument `frequency`"),
37-
amplitude = 1.0,
38-
direction = SVector{3,typeof(frequency)}(0.0, 0.0, 1.0),
39-
polarization = SVector{3,typeof(frequency)}(1.0, 0.0, 0.0),
40-
) = PlaneWave(embedding, frequency, amplitude, direction, polarization)
34+
planeWave(; embedding=Medium(ε0, μ0), frequency=error("missing argument `frequency`"), amplitude=1.0, direction=SVector{3,typeof(frequency)}(0.0, 0.0, 1.0), polarization=SVector{3,typeof(frequency)}(1.0, 0.0, 0.0)) = PlaneWave(
35+
embedding, frequency, amplitude, direction, polarization
36+
)
4137

‎src/ringCurrent/excitation.jl

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,9 @@ end
5252
orientation = SVector{3,typeof(frequency)}(0.0, 0.0, 1.0),
5353
)
5454
"""
55-
electricRingCurrent(;
56-
embedding = Medium(ε0, μ0),
57-
frequency = error("missing argument `frequency`"),
58-
amplitude = 1.0,
59-
radius = error("missing argument `radius`"),
60-
center = error("missing argument `center`"),
61-
orientation = SVector{3,typeof(frequency)}(0.0, 0.0, 1.0),
62-
) = ElectricRingCurrent(embedding, frequency, amplitude, radius, center, orientation)
55+
electricRingCurrent(; embedding=Medium(ε0, μ0), frequency=error("missing argument `frequency`"), amplitude=1.0, radius=error("missing argument `radius`"), center=error("missing argument `center`"), orientation=SVector{3,typeof(frequency)}(0.0, 0.0, 1.0)) = ElectricRingCurrent(
56+
embedding, frequency, amplitude, radius, center, orientation
57+
)
6358

6459

6560
"""
@@ -72,14 +67,9 @@ electricRingCurrent(;
7267
orientation = SVector{3,typeof(frequency)}(0.0, 0.0, 1.0),
7368
)
7469
"""
75-
magneticRingCurrent(;
76-
embedding = Medium(ε0, μ0),
77-
frequency = error("missing argument `frequency`"),
78-
amplitude = 1.0,
79-
radius = error("missing argument `radius`"),
80-
center = error("missing argument `center`"),
81-
orientation = SVector{3,typeof(frequency)}(0.0, 0.0, 1.0),
82-
) = MagneticRingCurrent(embedding, frequency, amplitude, radius, center, orientation)
70+
magneticRingCurrent(; embedding=Medium(ε0, μ0), frequency=error("missing argument `frequency`"), amplitude=1.0, radius=error("missing argument `radius`"), center=error("missing argument `center`"), orientation=SVector{3,typeof(frequency)}(0.0, 0.0, 1.0)) = MagneticRingCurrent(
71+
embedding, frequency, amplitude, radius, center, orientation
72+
)
8373

8474

8575

‎src/ringCurrent/incident.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ function field(excitation::RingCurrent, point, quantity::ElectricField; paramete
5151

5252
Eϕ = Complex{T}(0.0) # initialize
5353
δE = T(Inf)
54-
n = -1
54+
n = -1
5555

5656
r = point_sph[1]
5757

@@ -121,10 +121,10 @@ function field(excitation::RingCurrent, point, quantity::MagneticField; paramete
121121

122122
eps = parameter.relativeAccuracy
123123

124-
Hr = Complex{T}(0.0) # initialize
124+
Hr = Complex{T}(0.0) # initialize
125125
Hϑ = Complex{T}(0.0) # initialize
126126
δHr = T(Inf)
127-
n = -1
127+
n = -1
128128

129129
r = point_sph[1]
130130

@@ -212,7 +212,7 @@ function field(excitation::RingCurrent, point, quantity::FarField; parameter::Pa
212212

213213
Eϕ = Complex{T}(0.0) # initialize
214214
δE = T(Inf)
215-
n = -1
215+
n = -1
216216

217217
r = point_sph[1]
218218

‎src/ringCurrent/scattered.jl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ function scatteredfield(sphere::PECSphere, excitation::RingCurrent, point, quant
4646
k = wavenumber(excitation)
4747
I0 = excitation.amplitude
4848
R = sqrt(norm(excitation.center)^2 + excitation.radius^2) # distance loop-origin
49-
θ = atan(excitation.radius / norm(excitation.center)) # angle between z-axis and connection loop-origin
49+
θ = atan(excitation.radius / norm(excitation.center)) # angle between z-axis and connection loop-origin
5050

5151
T = typeof(k)
5252

@@ -112,16 +112,16 @@ function scatteredfield(sphere::PECSphere, excitation::RingCurrent, point, quant
112112
k = wavenumber(excitation)
113113
I0 = excitation.amplitude
114114
R = sqrt(norm(excitation.center)^2 + excitation.radius^2) # distance loop-origin
115-
θ = atan(excitation.radius / norm(excitation.center)) # angle between z-axis and connection loop-origin
115+
θ = atan(excitation.radius / norm(excitation.center)) # angle between z-axis and connection loop-origin
116116

117117
T = typeof(k)
118118

119119
eps = parameter.relativeAccuracy
120120

121-
Hr = Complex{T}(0.0) # initialize
121+
Hr = Complex{T}(0.0) # initialize
122122
Hϑ = Complex{T}(0.0) # initialize
123123
δHr = T(Inf)
124-
n = 0
124+
n = 0
125125

126126
r = point_sph[1]
127127

@@ -185,7 +185,7 @@ function scatteredfield(
185185
k = wavenumber(excitation)
186186
I0 = excitation.amplitude
187187
R = sqrt(norm(excitation.center)^2 + excitation.radius^2) # distance loop-origin
188-
θ = atan(excitation.radius / norm(excitation.center)) # angle between z-axis and connection loop-origin
188+
θ = atan(excitation.radius / norm(excitation.center)) # angle between z-axis and connection loop-origin
189189

190190
T = typeof(k)
191191

@@ -196,7 +196,7 @@ function scatteredfield(
196196

197197
Eϕ = Complex{T}(0.0) # initialize
198198
δE = T(Inf)
199-
n = 0
199+
n = 0
200200

201201
kR = k * R
202202
ka = k * sphere.radius
@@ -247,15 +247,15 @@ function scatteredfield(
247247
k = wavenumber(excitation)
248248
I0 = excitation.amplitude
249249
R = sqrt(norm(excitation.center)^2 + excitation.radius^2) # distance loop-origin
250-
θ = atan(excitation.radius / norm(excitation.center)) # angle between z-axis and connection loop-origin
250+
θ = atan(excitation.radius / norm(excitation.center)) # angle between z-axis and connection loop-origin
251251

252252
T = typeof(k)
253253

254254
eps = parameter.relativeAccuracy
255255

256256
Eϑ = Complex{T}(0.0) # initialize
257257
δE = T(Inf)
258-
n = 0
258+
n = 0
259259

260260
kR = k * R
261261
ka = k * sphere.radius

‎src/sphere.jl

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@ end
3636
3737
Constructor for the dielectric sphere.
3838
"""
39-
DielectricSphere(; radius=error("missing argument `radius`"), filling=error("missing argument `filling`")) =
40-
DielectricSphere(radius, filling)
39+
DielectricSphere(; radius=error("missing argument `radius`"), filling=error("missing argument `filling`")) = DielectricSphere(
40+
radius, filling
41+
)
4142

4243

4344

@@ -71,12 +72,9 @@ For details, see for example T. B. Jones, Ed., “Models for layered spherical p
7172
in Electromechanics of Particles, Cambridge: Cambridge University Press, 1995,
7273
pp. 227–235. doi: 10.1017/CBO9780511574498.012.
7374
"""
74-
DielectricSphereThinImpedanceLayer(;
75-
radius=error("missing argument `radius`"),
76-
thickness=error("missing argument `thickness` of the coating"),
77-
thinlayer=error("missing argument `thinlayer`"),
78-
filling=error("missing argument `filling`"),
79-
) = DielectricSphereThinImpedanceLayer(radius, thickness, thinlayer, filling)
75+
DielectricSphereThinImpedanceLayer(; radius=error("missing argument `radius`"), thickness=error("missing argument `thickness` of the coating"), thinlayer=error("missing argument `thinlayer`"), filling=error("missing argument `filling`")) = DielectricSphereThinImpedanceLayer(
76+
radius, thickness, thinlayer, filling
77+
)
8078

8179

8280

‎src/sphericalModes/excitation.jl

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,9 @@ end
3636
orientation = SVector{3,typeof(frequency)}(0.0, 0.0, 1.0),
3737
)
3838
"""
39-
SphericalModeTE(;
40-
embedding = Medium(ε0, μ0),
41-
frequency = error("missing argument `frequency`"),
42-
amplitude = 1.0,
43-
m = 0,
44-
n = 1,
45-
c = 1,
46-
center = SVector{3,typeof(frequency)}(0.0, 0.0, 0.0),
47-
orientation = SVector{3,typeof(frequency)}(0.0, 0.0, 1.0),
48-
) = SphericalModeTE(embedding, frequency, amplitude, m, n, c, center, orientation)
39+
SphericalModeTE(; embedding=Medium(ε0, μ0), frequency=error("missing argument `frequency`"), amplitude=1.0, m=0, n=1, c=1, center=SVector{3,typeof(frequency)}(0.0, 0.0, 0.0), orientation=SVector{3,typeof(frequency)}(0.0, 0.0, 1.0)) = SphericalModeTE(
40+
embedding, frequency, amplitude, m, n, c, center, orientation
41+
)
4942

5043

5144
"""
@@ -60,16 +53,9 @@ SphericalModeTE(;
6053
orientation = SVector{3,typeof(frequency)}(0.0, 0.0, 1.0),
6154
)
6255
"""
63-
SphericalModeTM(;
64-
embedding = Medium(ε0, μ0),
65-
frequency = error("missing argument `frequency`"),
66-
amplitude = 1.0,
67-
m = 0,
68-
n = 1,
69-
c = 1,
70-
center = SVector{3,typeof(frequency)}(0.0, 0.0, 0.0),
71-
orientation = SVector{3,typeof(frequency)}(0.0, 0.0, 1.0),
72-
) = SphericalModeTM(embedding, frequency, amplitude, m, n, c, center, orientation)
56+
SphericalModeTM(; embedding=Medium(ε0, μ0), frequency=error("missing argument `frequency`"), amplitude=1.0, m=0, n=1, c=1, center=SVector{3,typeof(frequency)}(0.0, 0.0, 0.0), orientation=SVector{3,typeof(frequency)}(0.0, 0.0, 1.0)) = SphericalModeTM(
57+
embedding, frequency, amplitude, m, n, c, center, orientation
58+
)
7359

7460

7561

‎test/planeWave_dielectric.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
h = Vector(assemble(𝒉, RT))
4747

4848
Z_PMCHWT = [
49-
-(Kk2_rt + Kk1_rt) (Tk2 + Tk1)./η2
50-
(((1 / η2)^2 .* Tk2 + (1 / η1)^2 .* Tk1).*η2) (Kk2_rt+Kk1_rt)
49+
-(Kk2_rt + Kk1_rt) (Tk2 + Tk1) ./ η2
50+
(((1 / η2)^2 .* Tk2 + (1 / η1)^2 .* Tk1) .* η2) (Kk2_rt+Kk1_rt)
5151
]
5252

5353
eh = [-e; -h .* η2]

‎test/runtests.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ BEAST.cross(::BEAST.NormalVector, p::Excitation) = CrossTraceMW(p)
3434
# ----- variables used in all tests
3535
spRadius = 1.0 # radius of sphere
3636

37-
Γ = meshsphere(spRadius, 0.45)
37+
Γ = meshsphere(spRadius, 0.45)
3838
RT = raviartthomas(Γ)
3939

4040
𝜇 = SphericalScattering.μ0
@@ -47,7 +47,7 @@ points_cartNF, points_sphNF = getDefaultPoints(5.0)
4747
points_cartNF_inside, ~ = getDefaultPoints(0.5)
4848

4949
# ----- testsets
50-
@testset "Testing SphericalScattering functionality" begin
50+
@testset verbose = true "Testing SphericalScattering functionality" begin
5151

5252
@testset "Medium and Sphere" begin
5353
include("sphere.jl")

‎test/uniformField.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ end
174174
# So potential points (i.e., grows) into ẑ direction
175175
potential_direction = dir
176176

177-
ex = UniformField(; amplitude=E₀, direction=-potential_direction, embedding=md_s)
177+
ex = UniformField(; amplitude=E₀, direction=(-potential_direction), embedding=md_s)
178178

179179
Φsca_ana_3l(pts) = scatteredfield(sp, ex, ScalarPotential(pts))
180180
Φtot_ana_3l(pts) = field(sp, ex, ScalarPotential(pts))

0 commit comments

Comments
 (0)