Merge pull request 'constants no longer module' (#7) from feat/create_templates into main

Reviewed-on: #7
main
Ruben Seitz 2025-06-17 21:46:50 +02:00
commit 2dfdd7c08e
5 changed files with 3 additions and 12 deletions

View File

@ -1,9 +1,9 @@
include("../src/visualization.jl")
include("../src/utils/constants.jl")
using Observables
using GLMakie
using .Visualization.Constants
using .Visualization
# GSParams AND FHNParams
@ -21,7 +21,7 @@ params = (
b=Observable(0.8)
)
params_obs = Observable{Constants.CombinedPDEParams}(CombinedPDEParams(N, dx, params.Du[], params.Dv[], params.F[], params.k[], params.ϵ[], params.a[], params.b[]))
params_obs = Observable{CombinedPDEParams}(CombinedPDEParams(N, dx, params.Du[], params.Dv[], params.F[], params.k[], params.ϵ[], params.a[], params.b[]))
lift(params.N, params.dx, params.Du, params.Dv, params.F, params.k, params.ϵ, params.a, params.b) do N, dx, Du, Dv, F, k, ϵ, a, b
params_obs[] = CombinedPDEParams(N, dx, Du, Dv, F, k, ϵ, a, b)
end

View File

@ -6,7 +6,6 @@ using DifferentialEquations
using Random
using Observables
using ..Constants
using .Laplacian
function step_fhn!(U, V, params_obs::Observable; dx=1, dt=0.01)

View File

@ -1,11 +1,9 @@
module GrayScottSolver
include("utils/constants.jl")
include("utils/laplacian.jl")
using Observables
using .Constants
using .Laplacian
function step_gray_scott!(U, V, params_obs::Observable; dx=1)

View File

@ -1,4 +1,4 @@
module Constants
abstract type PDEParams end
@ -34,6 +34,3 @@ struct CombinedPDEParams <: PDEParams
b::Float64
end
export PDEParams, FHNParams, GSParams, CombinedPDEParams
end # module Constants

View File

@ -1,12 +1,10 @@
module Visualization
include("utils/constants.jl")
include("utils/templates.jl")
include("gray_scott_solver.jl")
include("fhn_solver.jl")
using Observables, Makie, GLMakie
using .Constants
using .Templates
using .GrayScottSolver: step_gray_scott!
using .FHNSolver: step_fhn!
@ -164,7 +162,6 @@ function build_ui(U, V, param_obs_map::NamedTuple, params_obs, heat_obs)
on(btn_reset.clicks) do _
running[] = false
hm.colormap[] = :seismic
reset!(U, V, heat_obs)
end