Skip to content

Commit 25b3d00

Browse files
author
LasNikas
committed
add for fluid and boundary
1 parent fec360a commit 25b3d00

File tree

4 files changed

+8
-10
lines changed

4 files changed

+8
-10
lines changed

examples/fluid/hydrostatic_water_column_2d.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ semi = Semidiscretization(fluid_system, boundary_system,
7373
ode = semidiscretize(semi, tspan)
7474

7575
info_callback = InfoCallback(interval=50)
76-
saving_callback = SolutionSavingCallback(dt=0.02, prefix="", dv=TrixiParticles.acceleration)
76+
saving_callback = SolutionSavingCallback(dt=0.02, prefix="")
7777

7878
# This is to easily add a new callback with `trixi_include`
7979
extra_callback = nothing

src/general/custom_quantities.jl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,3 @@ end
123123
function avg_density(system, v_ode, u_ode, semi, t)
124124
return NaN
125125
end
126-
127-
function acceleration(system, dv_ode, du_ode, v_ode, u_ode, semi, t)
128-
return wrap_v(dv_ode, system, semi)
129-
end

src/schemes/boundary/system.jl

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -456,19 +456,20 @@ function system_correction(system::BoundarySPHSystem{<:BoundaryModelDummyParticl
456456
end
457457

458458
function system_data(system::BoundarySPHSystem, dv_ode, du_ode, v_ode, u_ode, semi)
459+
dv = [current_acceleration(system, particle) for particle in eachparticle(system)]
459460
v = wrap_v(v_ode, system, semi)
460461
u = wrap_u(u_ode, system, semi)
461462

462463
coordinates = current_coordinates(u, system)
463-
velocity = 0 # TODO this is broken
464+
velocity = [current_velocity(v, system, particle) for particle in eachparticle(system)]
464465
density = current_density(v, system)
465466
pressure = current_pressure(v, system)
466467

467-
return (; coordinates, velocity, density, pressure)
468+
return (; coordinates, velocity, density, pressure, acceleration=dv)
468469
end
469470

470471
function available_data(::BoundarySPHSystem)
471-
return (:coordinates, :velocity, :density, :pressure)
472+
return (:coordinates, :velocity, :density, :pressure, :acceleration)
472473
end
473474

474475
function system_data(system::BoundaryDEMSystem, dv_ode, du_ode, v_ode, u_ode, semi)

src/schemes/fluid/fluid.jl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ end
177177
function system_data(system::FluidSystem, dv_ode, du_ode, v_ode, u_ode, semi)
178178
(; mass) = system
179179

180+
dv = wrap_v(dv_ode, system, semi)
180181
v = wrap_v(v_ode, system, semi)
181182
u = wrap_u(u_ode, system, semi)
182183

@@ -185,11 +186,11 @@ function system_data(system::FluidSystem, dv_ode, du_ode, v_ode, u_ode, semi)
185186
density = current_density(v, system)
186187
pressure = current_pressure(v, system)
187188

188-
return (; coordinates, velocity, mass, density, pressure)
189+
return (; coordinates, velocity, mass, density, pressure, acceleration=dv)
189190
end
190191

191192
function available_data(::FluidSystem)
192-
return (:coordinates, :velocity, :mass, :density, :pressure)
193+
return (:coordinates, :velocity, :mass, :density, :pressure, :acceleration)
193194
end
194195

195196
include("pressure_acceleration.jl")

0 commit comments

Comments
 (0)