From 152af2dfb57a37e8896d5f4a5dd267369b7ff762 Mon Sep 17 00:00:00 2001 From: Niki Laptop <2212719@stud.hs-mannheim.de> Date: Tue, 17 Jun 2025 21:22:37 +0200 Subject: [PATCH] constants no longer module --- scripts/main.jl | 4 ++-- src/fhn_solver.jl | 1 - src/gray_scott_solver.jl | 2 -- src/utils/constants.jl | 5 +---- src/visualization.jl | 3 --- 5 files changed, 3 insertions(+), 12 deletions(-) diff --git a/scripts/main.jl b/scripts/main.jl index 45738d4..d6d82c6 100644 --- a/scripts/main.jl +++ b/scripts/main.jl @@ -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 diff --git a/src/fhn_solver.jl b/src/fhn_solver.jl index c493932..00e50b7 100644 --- a/src/fhn_solver.jl +++ b/src/fhn_solver.jl @@ -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) diff --git a/src/gray_scott_solver.jl b/src/gray_scott_solver.jl index 418015a..a2d52b2 100644 --- a/src/gray_scott_solver.jl +++ b/src/gray_scott_solver.jl @@ -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) diff --git a/src/utils/constants.jl b/src/utils/constants.jl index d3e37a0..4220124 100644 --- a/src/utils/constants.jl +++ b/src/utils/constants.jl @@ -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 diff --git a/src/visualization.jl b/src/visualization.jl index a920b27..e0d4ce2 100644 --- a/src/visualization.jl +++ b/src/visualization.jl @@ -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