Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

. #17

Merged
merged 1 commit into from
Mar 7, 2024
Merged

. #17

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions examples/periodic_scattering/3d_periodic_scattering.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ simulation of plane wave scattering on periodic array of dielectric spheres
"""

using UnPack, LinearAlgebra, GLMakie
# using Luminescent, LuminescentVisualization
using Luminescent, LuminescentVisualization

dir = pwd()
include("$(dir)/src/main.jl")
include("$(dir)/scripts/startup.jl")
include("$dir/../LuminescentVisualization.jl/src/main.jl")
# dir = pwd()
# include("$(dir)/src/main.jl")
# include("$(dir)/scripts/startup.jl")
# include("$dir/../LuminescentVisualization.jl/src/main.jl")

dogpu = true
name = "periodic_scattering"
Expand Down
8 changes: 4 additions & 4 deletions examples/quarter_wavelength_antenna/antenna.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ simulation of quarter wavelength antenna above conductor ground plane
"""

using UnPack, LinearAlgebra, GLMakie
# using Luminescent,LuminescentVisualization
using Luminescent, LuminescentVisualization

dir = pwd()
include("$(dir)/src/main.jl")
include("$dir/../LuminescentVisualization.jl/src/main.jl")
# dir = pwd()
# include("$(dir)/src/main.jl")
# include("$dir/../LuminescentVisualization.jl/src/main.jl")

name = "quarter_wavelength_antenna"
dogpu = true
Expand Down
6 changes: 4 additions & 2 deletions scripts/setup.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
using Pkg
# ]add UnPack, BSON,DataStructures, StatsBase, Documenter,ImageTransformations,Interpolations, Zygote, Optim,ArrayPadding, Porcupine, Jello, GLMakie, Functors, Lazy,AbbreviatedStackTraces,ReverseStackTraces,CUDA,Flux
Pkg.add(url="https://github.com/paulxshen/ArrayPadding.jl")
Pkg.add(url="https://github.com/paulxshen/Porcupine.jl")
# Pkg.add(url="https://github.com/paulxshen/ArrayPadding.jl")
# Pkg.add(url="https://github.com/paulxshen/Porcupine.jl")
Pkg.add(url="https://github.com/paulxshen/Luminescent.jl")
Pkg.add(url="https://github.com/paulxshen/LuminescentVisualization.jl")
16 changes: 8 additions & 8 deletions src/maxwell_setup.jl
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@ Args
- L: vector of lengths in wavelengths of simulation domain
- polarization: only applies to 2d which can be :TMz (Ez, Hx, Hy) or :TEz (Hz, Ex, Ey)
"""
function maxwell_setup(boundaries, sources, monitors, dx, sz0, polarization=nothing;
function maxwell_setup(boundaries, sources, monitors, dx, sz, polarization=nothing;
ϵ=1, μ=1, σ=0, σm=0, F=Float32,
ϵmin=1,
Courant=F(0.8√(ϵmin / length(sz0))),# Courant number)
Courant=F(0.8√(ϵmin / length(sz))),# Courant number)
kw...)

a = ones(F, sz0)
a = ones(F, sz)
# if isa(μ,Number+)
μ *= a
σ *= a
σm *= a
ϵ *= a
d = length(sz0)
d = length(sz)
if d == 1
fk = (:Ez, :Hy)
elseif d == 2
Expand All @@ -40,7 +40,7 @@ function maxwell_setup(boundaries, sources, monitors, dx, sz0, polarization=noth
flb = Dict([k => zeros(Int, d) for k = fk])
frb = Dict([k => zeros(Int, d) for k = fk])
lc = zeros(Int, d)
sizes = Dict([k => collect(sz0) for k = fk])
sizes = Dict([k => collect(sz) for k = fk])

for b = boundaries
for i = b.dims
Expand Down Expand Up @@ -190,7 +190,7 @@ function maxwell_setup(boundaries, sources, monitors, dx, sz0, polarization=noth
end
end
geometry_staggering = Dict{Symbol,Vector{Vector{UnitRange{Int64}}}}()
geometry_sizes = NamedTuple([k => sz0 .+ sum(geometry_padding[k]) do p
geometry_sizes = NamedTuple([k => sz .+ sum(geometry_padding[k]) do p
p.l + p.r
end for k = keys(geometry_padding)])
geometry_staggering[:μ] = geometry_staggering[:σm] =
Expand All @@ -199,11 +199,11 @@ function maxwell_setup(boundaries, sources, monitors, dx, sz0, polarization=noth
geometry_staggering[:ϵ] = geometry_staggering[:σ] =
[[ax[2-l:end-1+r] for (ax, l, r) = zip(Base.oneto.(geometry_sizes[:ϵ]), flb[k], frb[k])]
for k = [:Ex, :Ey, :Ez]]
source_instances = SourceInstance.(sources, dx, (sizes,), (lc,), (fl,), (sz0,); F)
source_instances = SourceInstance.(sources, dx, (sizes,), (lc,), (fl,), (sz,); F)
monitor_instances = MonitorInstance.(monitors, dx, (lc,), (flb,), (fl,); F)

dt = dx * Courant
sz0 = Tuple(sz0)
sz = Tuple(sz)
for (k, v) = pairs(field_padding)
a = ones(F, size(fields[k]))
i = filter(eachindex(v)) do i
Expand Down