Skip to content

Commit 4e2c897

Browse files
committed
Remove fieldvector_coordinates from get_electric_field_from_potential
I do not see any scenario, in which the resulting electric field should NOT be xyz
1 parent d69dac4 commit 4e2c897

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

src/ElectricField/ElectricField.jl

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ function ElectricField(epot::ElectricPotential{T, 3, S}, point_types::PointTypes
5454
end
5555

5656

57-
function get_electric_field_from_potential(epot::ElectricPotential{T, 3, Cylindrical}, point_types::PointTypes{T}, fieldvector_coordinates=:xyz; use_nthreads::Int = Base.Threads.threadid())::ElectricField{T, 3, Cylindrical} where {T <: SSDFloat}
57+
function get_electric_field_from_potential(epot::ElectricPotential{T, 3, Cylindrical}, point_types::PointTypes{T}; use_nthreads::Int = Base.Threads.threadid())::ElectricField{T, 3, Cylindrical} where {T <: SSDFloat}
5858
p = epot.data
5959
axr::Vector{T} = collect(epot.grid.axes[1])
6060
axφ::Vector{T} = collect(epot.grid.axes[2])
@@ -157,9 +157,7 @@ function get_electric_field_from_potential(epot::ElectricPotential{T, 3, Cylindr
157157
end
158158
end
159159
end
160-
if fieldvector_coordinates == :xyz
161-
ef = convert_field_vectors_to_xyz(ef, axφ)
162-
end
160+
ef = convert_field_vectors_to_xyz(ef, axφ)
163161
return ElectricField(ef, point_types.grid)
164162
end
165163

@@ -177,6 +175,7 @@ function convert_field_vectors_to_xyz(field::Array{SArray{Tuple{3},T,1,3},3}, φ
177175
end
178176

179177

178+
180179
function interpolated_scalarfield(spot::ScalarPotential{T, 3, Cylindrical}) where {T}
181180
@inbounds knots = spot.grid.axes[1].ticks, cat(spot.grid.axes[2].ticks,T(2π),dims=1), spot.grid.axes[3].ticks
182181
ext_data = cat(spot.data, spot.data[:,1:1,:], dims=2)
@@ -216,9 +215,9 @@ function get_electric_field_from_potential(epot::ElectricPotential{T, 3, Cartesi
216215
axx::Vector{T} = collect(epot.grid.axes[1])
217216
axy::Vector{T} = collect(epot.grid.axes[2])
218217
axz::Vector{T} = collect(epot.grid.axes[3])
219-
axx_ext::Vector{T} = get_extended_ticks(epot.grid.axes[1])
220-
axy_ext::Vector{T} = get_extended_ticks(epot.grid.axes[2])
221-
axz_ext::Vector{T} = get_extended_ticks(epot.grid.axes[3])
218+
# axx_ext::Vector{T} = get_extended_ticks(epot.grid.axes[1])
219+
# axy_ext::Vector{T} = get_extended_ticks(epot.grid.axes[2])
220+
# axz_ext::Vector{T} = get_extended_ticks(epot.grid.axes[3])
222221

223222
ef::Array{SVector{3, T}} = Array{SVector{3, T}}(undef, size(epot.data))
224223

0 commit comments

Comments
 (0)