Skip to content
Snippets Groups Projects
Verified Commit 39be176a authored by Florian Atteneder's avatar Florian Atteneder
Browse files

cleanup

parent 6edb84fc
No related branches found
No related tags found
No related merge requests found
Showing
with 0 additions and 243 deletions
git commit hash: 8fb20557df42feb0a9f3cd70bc1caaa8687fc0db
====================================================================================================
git commit hash: 8fb20557df42feb0a9f3cd70bc1caaa8687fc0db
====================================================================================================
git commit hash: 8fb20557df42feb0a9f3cd70bc1caaa8687fc0db
====================================================================================================
git commit hash: 8fb20557df42feb0a9f3cd70bc1caaa8687fc0db
====================================================================================================
git commit hash: 8fb20557df42feb0a9f3cd70bc1caaa8687fc0db
====================================================================================================
git commit hash: 8fb20557df42feb0a9f3cd70bc1caaa8687fc0db
====================================================================================================
git commit hash: 8fb20557df42feb0a9f3cd70bc1caaa8687fc0db
====================================================================================================
git commit hash: 8fb20557df42feb0a9f3cd70bc1caaa8687fc0db
====================================================================================================
git commit hash: 8fb20557df42feb0a9f3cd70bc1caaa8687fc0db
====================================================================================================
git commit hash: 8fb20557df42feb0a9f3cd70bc1caaa8687fc0db
====================================================================================================
git commit hash: 8fb20557df42feb0a9f3cd70bc1caaa8687fc0db
====================================================================================================
git commit hash: 8fb20557df42feb0a9f3cd70bc1caaa8687fc0db
====================================================================================================
git commit hash: 3e714b9150cf680716edd70a60bb5da3bdbe987b
====================================================================================================
diff --git a/src/SRHD/callbacks.jl b/src/SRHD/callbacks.jl
index 9791e20..eabdc62 100644
--- a/src/SRHD/callbacks.jl
+++ b/src/SRHD/callbacks.jl
@@ -8,8 +8,10 @@ function make_callback(env, P::Project, isperiodic)
cbfn_hrsc(u, t) = callback_hrsc(u, t, env, P, isperiodic, P.hrsc, env.mesh)
cb_hrsc = FunctionCallback(cbfn_hrsc,
CallbackTiming(every_iteration=1,every_dt=0))
- callbackset = CallbackSet(cb_equation, cb_tci, cb_hrsc)
- return callbackset
+ callbackset = CallbackSet(cb_equation, cb_tci)
+ return callbackset, CallbackSet(cb_hrsc)
+ # callbackset = CallbackSet(cb_equation, cb_tci, cb_hrsc)
+ # return callbackset, nothing
end
@@ -129,6 +131,7 @@ end
function callback_hrsc(state_u, state_t, env, P, isperiodic, hrsc::HRSC.SmoothedArtificialViscosity, mesh)
+ wrap_dynamic_variables!(env.cache, state_u)
@unpack cache = env
@unpack mu, mu_m1 = get_cell_variables(cache)
@unpack smoothed_mu = get_static_variables(cache)
diff --git a/src/SRHD/setup.jl b/src/SRHD/setup.jl
index 8a9a092..cb6e5ba 100644
--- a/src/SRHD/setup.jl
+++ b/src/SRHD/setup.jl
@@ -41,9 +41,10 @@ function Project(env::Environment, prms, mesh::Mesh1d)
initialdata!(env, P, prms["SRHD"])
# setup callbacks
- projectcb = make_callback(env, P, isperiodic(mesh))
+ cbs, cbs_substep = make_callback(env, P, isperiodic(mesh))
- append!(env.callbacks, CallbackSet(projectcb.callbacks...))
+ append!(env.callbacks, cbs)
+ append!(env.callbacks_substep, cbs_substep)
return P, (bdryconds, ldg_bdryconds, av_bdryconds)
end
diff --git a/src/callbacks.jl b/src/callbacks.jl
index 7e84b99..f1c99d8 100644
--- a/src/callbacks.jl
+++ b/src/callbacks.jl
@@ -207,6 +207,7 @@ Base.push!(cbs::CallbackSet, cb::AbstractCallback) = push!(cbs.callbacks, cb)
Base.push!(cbs::CallbackSet, ::Nothing) = nothing
Base.append!(cbs::CallbackSet, cbs2::AbstractVector{<:AbstractCallback}) = append!(cbs.callbacks, cbs2)
Base.append!(cbs::CallbackSet, cbs2::CallbackSet) = append!(cbs.callbacks, cbs2.callbacks)
+Base.append!(cbs::CallbackSet, ::Nothing) = nothing
function Base.show(io::IO, cbs::CallbackSet)
git commit hash: c63c4a07a5f6bfd1882b697ae5b5aa4f96313fe5
====================================================================================================
git commit hash: 3e714b9150cf680716edd70a60bb5da3bdbe987b
====================================================================================================
diff --git a/src/SRHD/callbacks.jl b/src/SRHD/callbacks.jl
index 9791e20..eabdc62 100644
--- a/src/SRHD/callbacks.jl
+++ b/src/SRHD/callbacks.jl
@@ -8,8 +8,10 @@ function make_callback(env, P::Project, isperiodic)
cbfn_hrsc(u, t) = callback_hrsc(u, t, env, P, isperiodic, P.hrsc, env.mesh)
cb_hrsc = FunctionCallback(cbfn_hrsc,
CallbackTiming(every_iteration=1,every_dt=0))
- callbackset = CallbackSet(cb_equation, cb_tci, cb_hrsc)
- return callbackset
+ callbackset = CallbackSet(cb_equation, cb_tci)
+ return callbackset, CallbackSet(cb_hrsc)
+ # callbackset = CallbackSet(cb_equation, cb_tci, cb_hrsc)
+ # return callbackset, nothing
end
@@ -129,6 +131,7 @@ end
function callback_hrsc(state_u, state_t, env, P, isperiodic, hrsc::HRSC.SmoothedArtificialViscosity, mesh)
+ wrap_dynamic_variables!(env.cache, state_u)
@unpack cache = env
@unpack mu, mu_m1 = get_cell_variables(cache)
@unpack smoothed_mu = get_static_variables(cache)
diff --git a/src/SRHD/setup.jl b/src/SRHD/setup.jl
index 8a9a092..cb6e5ba 100644
--- a/src/SRHD/setup.jl
+++ b/src/SRHD/setup.jl
@@ -41,9 +41,10 @@ function Project(env::Environment, prms, mesh::Mesh1d)
initialdata!(env, P, prms["SRHD"])
# setup callbacks
- projectcb = make_callback(env, P, isperiodic(mesh))
+ cbs, cbs_substep = make_callback(env, P, isperiodic(mesh))
- append!(env.callbacks, CallbackSet(projectcb.callbacks...))
+ append!(env.callbacks, cbs)
+ append!(env.callbacks_substep, cbs_substep)
return P, (bdryconds, ldg_bdryconds, av_bdryconds)
end
diff --git a/src/callbacks.jl b/src/callbacks.jl
index 7e84b99..f1c99d8 100644
--- a/src/callbacks.jl
+++ b/src/callbacks.jl
@@ -207,6 +207,7 @@ Base.push!(cbs::CallbackSet, cb::AbstractCallback) = push!(cbs.callbacks, cb)
Base.push!(cbs::CallbackSet, ::Nothing) = nothing
Base.append!(cbs::CallbackSet, cbs2::AbstractVector{<:AbstractCallback}) = append!(cbs.callbacks, cbs2)
Base.append!(cbs::CallbackSet, cbs2::CallbackSet) = append!(cbs.callbacks, cbs2.callbacks)
+Base.append!(cbs::CallbackSet, ::Nothing) = nothing
function Base.show(io::IO, cbs::CallbackSet)
git commit hash: c63c4a07a5f6bfd1882b697ae5b5aa4f96313fe5
====================================================================================================
git commit hash: 3e714b9150cf680716edd70a60bb5da3bdbe987b
====================================================================================================
diff --git a/src/SRHD/callbacks.jl b/src/SRHD/callbacks.jl
index 9791e20..eabdc62 100644
--- a/src/SRHD/callbacks.jl
+++ b/src/SRHD/callbacks.jl
@@ -8,8 +8,10 @@ function make_callback(env, P::Project, isperiodic)
cbfn_hrsc(u, t) = callback_hrsc(u, t, env, P, isperiodic, P.hrsc, env.mesh)
cb_hrsc = FunctionCallback(cbfn_hrsc,
CallbackTiming(every_iteration=1,every_dt=0))
- callbackset = CallbackSet(cb_equation, cb_tci, cb_hrsc)
- return callbackset
+ callbackset = CallbackSet(cb_equation, cb_tci)
+ return callbackset, CallbackSet(cb_hrsc)
+ # callbackset = CallbackSet(cb_equation, cb_tci, cb_hrsc)
+ # return callbackset, nothing
end
@@ -129,6 +131,7 @@ end
function callback_hrsc(state_u, state_t, env, P, isperiodic, hrsc::HRSC.SmoothedArtificialViscosity, mesh)
+ wrap_dynamic_variables!(env.cache, state_u)
@unpack cache = env
@unpack mu, mu_m1 = get_cell_variables(cache)
@unpack smoothed_mu = get_static_variables(cache)
diff --git a/src/SRHD/setup.jl b/src/SRHD/setup.jl
index 8a9a092..cb6e5ba 100644
--- a/src/SRHD/setup.jl
+++ b/src/SRHD/setup.jl
@@ -41,9 +41,10 @@ function Project(env::Environment, prms, mesh::Mesh1d)
initialdata!(env, P, prms["SRHD"])
# setup callbacks
- projectcb = make_callback(env, P, isperiodic(mesh))
+ cbs, cbs_substep = make_callback(env, P, isperiodic(mesh))
- append!(env.callbacks, CallbackSet(projectcb.callbacks...))
+ append!(env.callbacks, cbs)
+ append!(env.callbacks_substep, cbs_substep)
return P, (bdryconds, ldg_bdryconds, av_bdryconds)
end
diff --git a/src/callbacks.jl b/src/callbacks.jl
index 7e84b99..f1c99d8 100644
--- a/src/callbacks.jl
+++ b/src/callbacks.jl
@@ -207,6 +207,7 @@ Base.push!(cbs::CallbackSet, cb::AbstractCallback) = push!(cbs.callbacks, cb)
Base.push!(cbs::CallbackSet, ::Nothing) = nothing
Base.append!(cbs::CallbackSet, cbs2::AbstractVector{<:AbstractCallback}) = append!(cbs.callbacks, cbs2)
Base.append!(cbs::CallbackSet, cbs2::CallbackSet) = append!(cbs.callbacks, cbs2.callbacks)
+Base.append!(cbs::CallbackSet, ::Nothing) = nothing
function Base.show(io::IO, cbs::CallbackSet)
git commit hash: c63c4a07a5f6bfd1882b697ae5b5aa4f96313fe5
====================================================================================================
git commit hash: 631f41865b14b0e76fa74e0d0dc0a3b692a933fc
====================================================================================================
diff --git a/src/SRHD/initialdata.jl b/src/SRHD/initialdata.jl
index c8c14a0..4ed4a32 100644
--- a/src/SRHD/initialdata.jl
+++ b/src/SRHD/initialdata.jl
@@ -194,7 +194,7 @@ function initialdata_equation_of_state(
@unpack x = get_static_variables(mesh.cache)
(xmin, xmax), = mesh.extends
- @toggled_assert isapprox(xmin, -1.5) && isapprox(xmax, 1.5)
+ # @toggled_assert isapprox(xmin, -1.5) && isapprox(xmax, 1.5)
@toggled_assert eos.K ≈ 100
@toggled_assert eos.Gamma ≈ 5/3
X, a, Γ, K = 0.3, 0.5, eos.Gamma, eos.K
git commit hash: 631f41865b14b0e76fa74e0d0dc0a3b692a933fc
====================================================================================================
diff --git a/src/SRHD/initialdata.jl b/src/SRHD/initialdata.jl
index c8c14a0..4ed4a32 100644
--- a/src/SRHD/initialdata.jl
+++ b/src/SRHD/initialdata.jl
@@ -194,7 +194,7 @@ function initialdata_equation_of_state(
@unpack x = get_static_variables(mesh.cache)
(xmin, xmax), = mesh.extends
- @toggled_assert isapprox(xmin, -1.5) && isapprox(xmax, 1.5)
+ # @toggled_assert isapprox(xmin, -1.5) && isapprox(xmax, 1.5)
@toggled_assert eos.K ≈ 100
@toggled_assert eos.Gamma ≈ 5/3
X, a, Γ, K = 0.3, 0.5, eos.Gamma, eos.K
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment