Skip to content

Commit

Permalink
Improve Test Coverage (#674)
Browse files Browse the repository at this point in the history 
* refactoring and improve coverage

* add test

* cleanup

* format

* Update test/schemes/boundary/dummy_particles/dummy_particles.jl

Co-authored-by: Erik Faulhaber <[email protected]>

* Update test/schemes/boundary/dummy_particles/dummy_particles.jl

Co-authored-by: Erik Faulhaber <[email protected]>

* Update test/schemes/boundary/dummy_particles/dummy_particles.jl

Co-authored-by: Erik Faulhaber <[email protected]>

* fix

---------

Co-authored-by: Erik Faulhaber <[email protected]>
  • Loading branch information
@svchb @efaulhaber
svchb and efaulhaber authored Dec 11, 2024
1 parent c93ab39 commit f051b55
Show file tree
Hide file tree
Showing 2 changed files with 173 additions and 112 deletions.
12 changes: 12 additions & 0 deletions test/callbacks/postprocess.jl
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,16 @@
@testset verbose=true "PostprocessCallback" begin
@testset verbose=true "errors" begin
error_str1 = "`funcs` cannot be empty"
@test_throws ArgumentError(error_str1) PostprocessCallback(interval=10,
write_file_interval=0)

error_str2 = "setting both `interval` and `dt` is not supported"
@test_throws ArgumentError(error_str2) PostprocessCallback(interval=10,
write_file_interval=0,
dt=0.1,
another_function=(v, u, t, system) -> 1)
end

@testset verbose=true "show" begin
function example_function(v, u, t, system)
return 0
Expand Down
273 changes: 161 additions & 112 deletions test/schemes/boundary/dummy_particles/dummy_particles.jl
View file
Original file line number Diff line number Diff line change
@@ -1,142 +1,191 @@
@testset verbose=true "Dummy Particles" begin
@testset "show" begin
boundary_model = BoundaryModelDummyParticles([1000.0], [1.0],
boundary_model = BoundaryModelDummyParticles([1000.0],
[1.0],
SummationDensity(),
SchoenbergCubicSplineKernel{2}(), 0.1)
SchoenbergCubicSplineKernel{2}(),
0.1)

show_compact = "BoundaryModelDummyParticles(SummationDensity, Nothing)"
@test repr(boundary_model) == show_compact
expected_repr = "BoundaryModelDummyParticles(SummationDensity, Nothing)"
@test repr(boundary_model) == expected_repr
end

@testset "Viscosity Adami: Wall Velocity" begin
@testset "Viscosity Adami/Bernoulli: Wall Velocity" begin
particle_spacing = 0.1

# Boundary particles in fluid compact support
boundary_1 = RectangularShape(particle_spacing, (10, 1), (0.0, 0.2), density=257.0)
boundary_2 = RectangularShape(particle_spacing, (10, 1), (0.0, 0.1), density=257.0)
boundary_1 = RectangularShape(particle_spacing,
(10, 1),
(0.0, 0.2),
density=257.0)
boundary_2 = RectangularShape(particle_spacing,
(10, 1),
(0.0, 0.1),
density=257.0)

# Boundary particles out of fluid compact support
boundary_3 = RectangularShape(particle_spacing, (10, 1), (0, 0), density=257.0)
boundary_3 = RectangularShape(particle_spacing,
(10, 1),
(0.0, 0.0),
density=257.0)

boundary = union(boundary_1, boundary_2, boundary_3)

particles_in_compact_support = length(boundary_1.mass) + length(boundary_2.mass)

fluid = RectangularShape(particle_spacing, (16, 5), (-0.3, 0.3), density=257.0,
# Define fluid particles
fluid = RectangularShape(particle_spacing,
(16, 5),
(-0.3, 0.3),
density=257.0,
loop_order=:x_first)

# Simulation parameters
smoothing_kernel = SchoenbergCubicSplineKernel{2}()
smoothing_length = 1.2 * particle_spacing
viscosity = ViscosityAdami(nu=1e-6)
state_equation = StateEquationCole(sound_speed=10, reference_density=257,
state_equation = StateEquationCole(sound_speed=10.0,
reference_density=257.0,
exponent=7)

boundary_model = BoundaryModelDummyParticles(boundary.density, boundary.mass,
state_equation=state_equation,
AdamiPressureExtrapolation(),
smoothing_kernel, smoothing_length,
viscosity=viscosity)

boundary_system = BoundarySPHSystem(boundary, boundary_model)

fluid_system = WeaklyCompressibleSPHSystem(fluid, SummationDensity(),
state_equation,
smoothing_kernel, smoothing_length)

neighborhood_search = TrixiParticles.TrivialNeighborhoodSearch{2}(search_radius=1.0,
eachpoint=TrixiParticles.eachparticle(fluid_system))

velocities = [[0; -1], [1; 1], [-1; 0], [0.7; 0.2], [0.3; 0.8]]

@testset "Wall Velocity $v_fluid" for v_fluid in velocities
viscosity = boundary_system.boundary_model.viscosity
volume = boundary_system.boundary_model.cache.volume

TrixiParticles.reset_cache!(boundary_system.boundary_model.cache,
boundary_system.boundary_model.viscosity)
TrixiParticles.boundary_pressure_extrapolation!(boundary_model,
boundary_system,
fluid_system,
boundary.coordinates,
fluid.coordinates, v_fluid,
v_fluid .*
ones(size(fluid.coordinates)),
neighborhood_search)

for particle in TrixiParticles.eachparticle(boundary_system)
if volume[particle] > eps()
TrixiParticles.compute_wall_velocity!(viscosity, boundary_system,
boundary.coordinates, particle)
# Define pressure extrapolation methods to test
pressure_extrapolations = [
AdamiPressureExtrapolation(),
BernoulliPressureExtrapolation()
]

for pressure_extrapolation in pressure_extrapolations
@testset "Pressure Extrapolation: $(typeof(pressure_extrapolation))" begin
# Create boundary and fluid systems
boundary_model = BoundaryModelDummyParticles(boundary.density,
boundary.mass,
state_equation=state_equation,
pressure_extrapolation,
smoothing_kernel,
smoothing_length,
viscosity=viscosity)
boundary_system = BoundarySPHSystem(boundary, boundary_model)
fluid_system = WeaklyCompressibleSPHSystem(fluid,
SummationDensity(),
state_equation,
smoothing_kernel,
smoothing_length)

neighborhood_search = TrixiParticles.TrivialNeighborhoodSearch{2}(search_radius=1.0,
eachpoint=TrixiParticles.eachparticle(fluid_system))

velocities = [
[0.0; -1.0],
[1.0; 1.0],
[-1.0; 0.0],
[0.7; 0.2],
[0.3; 0.8]
]

@testset "Wall Velocity $v_fluid" for v_fluid in velocities
viscosity = boundary_system.boundary_model.viscosity
volume = boundary_system.boundary_model.cache.volume

# Reset cache and perform pressure extrapolation
TrixiParticles.reset_cache!(boundary_system.boundary_model.cache,
boundary_system.boundary_model.viscosity)
TrixiParticles.boundary_pressure_extrapolation!(boundary_model,
boundary_system,
fluid_system,
boundary.coordinates,
fluid.coordinates,
v_fluid,
v_fluid .*
ones(size(fluid.coordinates)),
neighborhood_search)

# Compute wall velocities
for particle in TrixiParticles.eachparticle(boundary_system)
if volume[particle] > eps()
TrixiParticles.compute_wall_velocity!(viscosity,
boundary_system,
boundary.coordinates,
particle)
end
end

# Expected wall velocities
v_wall = zeros(size(boundary.coordinates))
v_wall[:, 1:particles_in_compact_support] .= -v_fluid

@test isapprox(boundary_system.boundary_model.cache.wall_velocity,
v_wall)
end
end

v_wall = zeros(size(boundary.coordinates))
v_wall[:, 1:particles_in_compact_support] .= -v_fluid

@test isapprox(boundary_system.boundary_model.cache.wall_velocity, v_wall)
end

scale_v = [1, 0.5, 0.7, 1.8, 67.5]
@testset "Wall Velocity Staggerd: Factor $scale" for scale in scale_v
viscosity = boundary_system.boundary_model.viscosity
volume = boundary_system.boundary_model.cache.volume

# For a constant velocity profile (each fluid particle has the same velocity)
# the wall velocity is `v_wall = -v_fluid` (see eq. 22 in Adami_2012).
# Thus, generate a staggered velocity profile to test the smoothed velocity field
# for a variable velocity profile.
v_fluid = zeros(size(fluid.coordinates))
for i in TrixiParticles.eachparticle(fluid_system)
if mod(i, 2) == 1
v_fluid[:, i] .= scale
end
end

TrixiParticles.reset_cache!(boundary_system.boundary_model.cache,
boundary_system.boundary_model.viscosity)
TrixiParticles.boundary_pressure_extrapolation!(boundary_model, boundary_system,
fluid_system,
boundary.coordinates,
fluid.coordinates, v_fluid,
v_fluid,
neighborhood_search)

for particle in TrixiParticles.eachparticle(boundary_system)
if volume[particle] > eps()
TrixiParticles.compute_wall_velocity!(viscosity, boundary_system,
boundary.coordinates, particle)
scale_factors = [1.0, 0.5, 0.7, 1.8, 67.5]

# For a constant velocity profile (each fluid particle has the same velocity),
# the wall velocity is `v_wall = -v_fluid` (see eq. 22 in Adami_2012).
# With a staggered velocity profile, we can test the smoothed velocity field
# for a variable velocity profile.
@testset "Wall Velocity Staggered: Factor $scale" for scale in scale_factors
viscosity = boundary_system.boundary_model.viscosity
volume = boundary_system.boundary_model.cache.volume

# Create a staggered velocity profile
v_fluid = zeros(size(fluid.coordinates))
for i in TrixiParticles.eachparticle(fluid_system)
if mod(i, 2) == 1
v_fluid[:, i] .= scale
end
end

# Reset cache and perform pressure extrapolation
TrixiParticles.reset_cache!(boundary_system.boundary_model.cache,
boundary_system.boundary_model.viscosity)
TrixiParticles.boundary_pressure_extrapolation!(boundary_model,
boundary_system,
fluid_system,
boundary.coordinates,
fluid.coordinates,
v_fluid,
v_fluid,
neighborhood_search)

# Compute wall velocities
for particle in TrixiParticles.eachparticle(boundary_system)
if volume[particle] > eps()
TrixiParticles.compute_wall_velocity!(viscosity,
boundary_system,
boundary.coordinates,
particle)
end
end

# Expected wall velocities
v_wall = zeros(size(boundary.coordinates))

# First boundary row
for i in 1:length(boundary_1.mass)
if mod(i, 2) == 1
# Particles with a diagonal distance to a fluid particle with v_fluid > 0.0
v_wall[:, i] .= -0.42040669416720744 * scale
else
# Particles with an orthogonal distance to a fluid particle with v_fluid > 0.0
v_wall[:, i] .= -0.5795933058327924 * scale
end
end

# Second boundary row
for i in (length(boundary_1.mass) + 1):particles_in_compact_support
if mod(i, 2) == 1
# Particles with a diagonal distance to a fluid particle with v_fluid > 0.0
v_wall[:, i] .= -0.12101100073462243 * scale
else
# Particles with an orthogonal distance to a fluid particle with v_fluid > 0.0
v_wall[:, i] .= -0.8789889992653775 * scale
end
end

@test isapprox(boundary_system.boundary_model.cache.wall_velocity,
v_wall)
end
end

v_wall = zeros(size(boundary.coordinates))

# First boundary row
for i in 1:length(boundary_1.mass)
if mod(i, 2) == 1

# Particles with a diagonal distance to a fluid particle with `v_fluid > 0.0`
v_wall[:, i] .= -0.42040669416720744 * scale
else

# Particles with a orthogonal distance to a fluid particle with `v_fluid > 0.0`
v_wall[:, i] .= -0.5795933058327924 * scale
end
end

# Second boundary row
for i in (length(boundary_1.mass) + 1):particles_in_compact_support
if true == mod(i, 2)

# Particles with a diagonal distance to a fluid particle with `v_fluid > 0.0`
v_wall[:, i] .= -0.12101100073462243 * scale
else

# Particles with a orthogonal distance to a fluid particle with `v_fluid > 0.0`
v_wall[:, i] .= -0.8789889992653775 * scale
end
end

@test isapprox(boundary_system.boundary_model.cache.wall_velocity, v_wall)
end
end
end
Expand Down

0 comments on commit f051b55

Please sign in to comment.