Skip to content

Fix error message when using TVF without UpdateCB #807

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.

Sign up for GitHub

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

Merged
svchb merged 5 commits into from
May 22, 2025
Merged

Fix error message when using TVF without UpdateCB #807

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
78e65fd
fix
svchb May 14, 2025
a23779a
Merge branch 'main' into fix-error-for-TVF
svchb May 16, 2025
0afa517
Merge branch 'main' into fix-error-for-TVF
LasNikas May 19, 2025
a874e97
review
svchb May 19, 2025
a15eb59
Merge branch 'main' into fix-error-for-TVF
svchb May 22, 2025
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
4 changes: 4 additions & 0 deletions src/schemes/fluid/entropically_damped_sph/system.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,10 @@ function update_final!(system::EntropicallyDampedSPHSystem, v, u, v_ode, u_ode,
compute_curvature!(system, surface_tension, v, u, v_ode, u_ode, semi, t)
compute_stress_tensors!(system, surface_tension, v, u, v_ode, u_ode, semi, t)
update_average_pressure!(system, system.transport_velocity, v_ode, u_ode, semi)

# checks for callback dependent models
Comment thread
svchb marked this conversation as resolved.
Outdated
check_tvf_configuration(system, system.transport_velocity, v, u, v_ode, u_ode, semi, t;
Comment thread
svchb marked this conversation as resolved.
update_from_callback)
end

function update_average_pressure!(system, ::Nothing, v_ode, u_ode, semi)
Expand Down
14 changes: 4 additions & 10 deletions src/schemes/fluid/transport_velocity.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,19 +165,13 @@ function update_callback_used!(system, transport_velocity)
system.cache.update_callback_used[] = true
end

function update_final!(system::FluidSystem, v, u, v_ode, u_ode, semi, t;
update_from_callback=false)
update_final!(system, system.transport_velocity,
v, u, v_ode, u_ode, semi, t; update_from_callback)
end

function update_final!(system::FluidSystem, ::Nothing,
v, u, v_ode, u_ode, semi, t; update_from_callback=false)
function check_tvf_configuration(system::FluidSystem, ::Nothing,
v, u, v_ode, u_ode, semi, t; update_from_callback=false)
return system
end

function update_final!(system::FluidSystem, ::TransportVelocityAdami,
v, u, v_ode, u_ode, semi, t; update_from_callback=false)
function check_tvf_configuration(system::FluidSystem, ::TransportVelocityAdami,
v, u, v_ode, u_ode, semi, t; update_from_callback=false)
Comment thread
svchb marked this conversation as resolved.
if !update_from_callback && !(system.cache.update_callback_used[])
throw(ArgumentError("`UpdateCallback` is required when using `TransportVelocityAdami`"))
end
Expand Down
4 changes: 4 additions & 0 deletions src/schemes/fluid/weakly_compressible_sph/system.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,10 @@ function update_final!(system::WeaklyCompressibleSPHSystem, v, u, v_ode, u_ode,
# Surface normal of neighbor and boundary needs to have been calculated already
compute_curvature!(system, surface_tension, v, u, v_ode, u_ode, semi, t)
compute_stress_tensors!(system, surface_tension, v, u, v_ode, u_ode, semi, t)

# checks for callback dependent models
Comment thread
svchb marked this conversation as resolved.
Outdated
check_tvf_configuration(system, system.transport_velocity, v, u, v_ode, u_ode, semi, t;
update_from_callback)
end

function kernel_correct_density!(system::WeaklyCompressibleSPHSystem, v, u, v_ode, u_ode,
Expand Down
Loading