Skip to content

Remove smoothing_kernel and length from Boundary #892

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

Draft
wants to merge 29 commits into
base: main
Choose a base branch
from
Draft

Remove smoothing_kernel and length from Boundary #892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
9657150
add sgs
svchb Apr 9, 2025
3b262cd
Merge branch 'main' of https://github.com/svchb/TrixiParticles.jlOpen
svchb Apr 10, 2025
90439e8
Merge branch 'main' of https://github.com/svchb/TrixiParticles.jlOpen
svchb Apr 10, 2025
2ba9a35
Merge branch 'trixi-framework:main' into main
svchb Apr 10, 2025
5317f0c
Revert "add sgs"
svchb Apr 10, 2025
b7daed3
Merge branch 'main' of https://github.com/svchb/TrixiParticles.jlOpen
svchb Aug 6, 2025
18b2dad
Merge branch 'main' of https://github.com/svchb/TrixiParticles.jlOpen
svchb Aug 6, 2025
fcecf1c
fix
svchb Aug 13, 2025
86dc756
format
svchb Aug 13, 2025
b5f7d04
fix tests
svchb Aug 18, 2025
6ad89e6
fix test
svchb Aug 18, 2025
1bccdd3
more fixes
svchb Aug 18, 2025
dc1706c
more fixes
svchb Aug 18, 2025
ae3fadc
format
svchb Aug 18, 2025
bd88a80
Merge branch 'main' into fix_wrong_nhs_at_bnd
svchb Aug 20, 2025
ce5ebaf
Merge branch 'fix_wrong_nhs_at_bnd' of https://github.com/svchb/Trixi…
svchb Aug 20, 2025
9c48225
fix
svchb Aug 20, 2025
2f91599
more fixes
svchb Aug 20, 2025
6de0138
more fixes
svchb Aug 21, 2025
bf7a595
more fixes
svchb Aug 21, 2025
44839a5
fix
svchb Aug 21, 2025
d14bf91
cleanup
svchb Aug 21, 2025
ca2ea8a
cleanup
svchb Aug 21, 2025
cdced50
Merge branch 'main' into fix_wrong_nhs_at_bnd
svchb Aug 21, 2025
bb60234
Merge branch 'main' into fix_wrong_nhs_at_bnd
svchb Aug 26, 2025
110912d
Update src/general/semidiscretization.jl
svchb Sep 3, 2025
788a127
Update semidiscretization.jl
svchb Sep 3, 2025
3aa2c3d
Merge branch 'main' into fix_wrong_nhs_at_bnd
svchb Sep 3, 2025
48110f4
remove smoothing_kernel and length
svchb Sep 3, 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
13 changes: 6 additions & 7 deletions examples/fluid/dam_break_2d.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,12 @@ viscosity_wall = nothing
# For a no-slip condition the corresponding wall viscosity without SGS can be set
# viscosity_wall = ViscosityAdami(nu=nu)
# viscosity_wall = ViscosityMorris(nu=nu)
boundary_model = BoundaryModelDummyParticles(tank.boundary.density, tank.boundary.mass,
state_equation=state_equation,
boundary_density_calculator,
smoothing_kernel, smoothing_length,
correction=nothing,
reference_particle_spacing=0,
viscosity=viscosity_wall)
boundary_model = BoundaryModelDummyParticles{2}(tank.boundary.density, tank.boundary.mass,
state_equation=state_equation,
boundary_density_calculator,
correction=nothing,
reference_particle_spacing=0,
viscosity=viscosity_wall)

boundary_system = BoundarySPHSystem(tank.boundary, boundary_model, adhesion_coefficient=0.0)

Expand Down
7 changes: 3 additions & 4 deletions examples/fluid/dam_break_3d.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,9 @@ fluid_system = WeaklyCompressibleSPHSystem(tank.fluid, fluid_density_calculator,
# ==========================================================================================
# ==== Boundary
boundary_density_calculator = AdamiPressureExtrapolation()
boundary_model = BoundaryModelDummyParticles(tank.boundary.density, tank.boundary.mass,
state_equation=state_equation,
boundary_density_calculator,
smoothing_kernel, smoothing_length)
boundary_model = BoundaryModelDummyParticles{3}(tank.boundary.density, tank.boundary.mass,
state_equation=state_equation,
boundary_density_calculator)

boundary_system = BoundarySPHSystem(tank.boundary, boundary_model)

Expand Down
7 changes: 3 additions & 4 deletions examples/fluid/falling_water_column_2d.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,9 @@ fluid_system = WeaklyCompressibleSPHSystem(tank.fluid, fluid_density_calculator,
# ==========================================================================================
# ==== Boundary
boundary_density_calculator = AdamiPressureExtrapolation()
boundary_model = BoundaryModelDummyParticles(tank.boundary.density, tank.boundary.mass,
state_equation=state_equation,
boundary_density_calculator,
smoothing_kernel, smoothing_length)
boundary_model = BoundaryModelDummyParticles{2}(tank.boundary.density, tank.boundary.mass,
state_equation=state_equation,
boundary_density_calculator)

boundary_system = BoundarySPHSystem(tank.boundary, boundary_model)

Expand Down
11 changes: 5 additions & 6 deletions examples/fluid/falling_water_spheres_2d.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,11 @@ sphere = WeaklyCompressibleSPHSystem(sphere2, fluid_density_calculator,
# ==== Boundary
boundary_density_calculator = AdamiPressureExtrapolation()
wall_viscosity = nu
boundary_model = BoundaryModelDummyParticles(tank.boundary.density, tank.boundary.mass,
state_equation=state_equation,
boundary_density_calculator,
fluid_smoothing_kernel, fluid_smoothing_length,
viscosity=ViscosityAdami(nu=wall_viscosity),
reference_particle_spacing=fluid_particle_spacing)
boundary_model = BoundaryModelDummyParticles{2}(tank.boundary.density, tank.boundary.mass,
state_equation=state_equation,
boundary_density_calculator,
viscosity=ViscosityAdami(nu=wall_viscosity),
reference_particle_spacing=fluid_particle_spacing)

boundary_system = BoundarySPHSystem(tank.boundary, boundary_model,
adhesion_coefficient=1.0)
Expand Down
9 changes: 4 additions & 5 deletions examples/fluid/hydrostatic_water_column_2d.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,10 @@ boundary_density_calculator = AdamiPressureExtrapolation()

# This is to set wall viscosity with `trixi_include`
viscosity_wall = nothing
boundary_model = BoundaryModelDummyParticles(tank.boundary.density, tank.boundary.mass,
state_equation=state_equation,
boundary_density_calculator,
smoothing_kernel, smoothing_length,
viscosity=viscosity_wall)
boundary_model = BoundaryModelDummyParticles{2}(tank.boundary.density, tank.boundary.mass,
state_equation=state_equation,
boundary_density_calculator,
viscosity=viscosity_wall)
boundary_system = BoundarySPHSystem(tank.boundary, boundary_model, movement=nothing)

# ==========================================================================================
Expand Down
18 changes: 8 additions & 10 deletions examples/fluid/lid_driven_cavity_2d.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,18 +85,16 @@ is_moving(t) = true

lid_movement = BoundaryMovement(lid_movement_function, is_moving)

boundary_model_cavity = BoundaryModelDummyParticles(cavity.boundary.density,
cavity.boundary.mass,
boundary_model_cavity = BoundaryModelDummyParticle{2}(cavity.boundary.density,
cavity.boundary.mass,
AdamiPressureExtrapolation(),
viscosity=viscosity,
state_equation=state_equation)

boundary_model_lid = BoundaryModelDummyParticles{2}(lid.density, lid.mass,
AdamiPressureExtrapolation(),
viscosity=viscosity,
state_equation=state_equation,
smoothing_kernel, smoothing_length)

boundary_model_lid = BoundaryModelDummyParticles(lid.density, lid.mass,
AdamiPressureExtrapolation(),
viscosity=viscosity,
state_equation=state_equation,
smoothing_kernel, smoothing_length)
state_equation=state_equation)

boundary_system_cavity = BoundarySPHSystem(cavity.boundary, boundary_model_cavity)

Expand Down
7 changes: 3 additions & 4 deletions examples/fluid/moving_wall_2d.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,9 @@ fluid_system = WeaklyCompressibleSPHSystem(tank.fluid, fluid_density_calculator,
# ==========================================================================================
# ==== Boundary
boundary_density_calculator = AdamiPressureExtrapolation()
boundary_model = BoundaryModelDummyParticles(tank.boundary.density, tank.boundary.mass,
state_equation=state_equation,
boundary_density_calculator,
smoothing_kernel, smoothing_length)
boundary_model = BoundaryModelDummyParticles{2}(tank.boundary.density, tank.boundary.mass,
state_equation=state_equation,
boundary_density_calculator)

boundary_system = BoundarySPHSystem(tank.boundary, boundary_model,
movement=boundary_movement)
Expand Down
7 changes: 3 additions & 4 deletions examples/fluid/periodic_array_of_cylinders_2d.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,9 @@ fluid_system = EntropicallyDampedSPHSystem(fluid, smoothing_kernel, smoothing_le

# ==========================================================================================
# ==== Boundary
boundary_model = BoundaryModelDummyParticles(boundary.density, boundary.mass,
AdamiPressureExtrapolation(),
viscosity=ViscosityAdami(; nu),
smoothing_kernel, smoothing_length)
boundary_model = BoundaryModelDummyParticles{2}(boundary.density, boundary.mass,
AdamiPressureExtrapolation(),
viscosity=ViscosityAdami(; nu))

boundary_system = BoundarySPHSystem(boundary, boundary_model)

Expand Down
9 changes: 4 additions & 5 deletions examples/fluid/periodic_channel_2d.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,10 @@ viscosity_wall = nothing
# Activate to switch to no-slip walls
#viscosity_wall = ViscosityAdami(nu=0.0025 * smoothing_length * sound_speed / 8)

boundary_model = BoundaryModelDummyParticles(tank.boundary.density, tank.boundary.mass,
state_equation=state_equation,
boundary_density_calculator,
smoothing_kernel, smoothing_length,
viscosity=viscosity_wall)
boundary_model = BoundaryModelDummyParticles{2}(tank.boundary.density, tank.boundary.mass,
state_equation=state_equation,
boundary_density_calculator,
viscosity=viscosity_wall)

boundary_system = BoundarySPHSystem(tank.boundary, boundary_model)

Expand Down
9 changes: 4 additions & 5 deletions examples/fluid/pipe_flow_2d.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,11 +135,10 @@ open_boundary_out = OpenBoundarySPHSystem(outflow; fluid_system,
# ==========================================================================================
# ==== Boundary
viscosity_boundary = ViscosityAdami(nu=1e-4)
boundary_model = BoundaryModelDummyParticles(pipe.boundary.density, pipe.boundary.mass,
AdamiPressureExtrapolation(),
state_equation=state_equation,
viscosity=viscosity_boundary,
smoothing_kernel, smoothing_length)
boundary_model = BoundaryModelDummyParticles{2}(pipe.boundary.density, pipe.boundary.mass,
AdamiPressureExtrapolation(),
state_equation=state_equation,
viscosity=viscosity_boundary)

boundary_system = BoundarySPHSystem(pipe.boundary, boundary_model)

Expand Down
24 changes: 11 additions & 13 deletions examples/fsi/dam_break_gate_2d.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,15 +114,14 @@ fluid_system = WeaklyCompressibleSPHSystem(tank.fluid, fluid_density_calculator,
# ==========================================================================================
# ==== Boundary
boundary_density_calculator = AdamiPressureExtrapolation()
boundary_model_tank = BoundaryModelDummyParticles(tank.boundary.density, tank.boundary.mass,
state_equation=state_equation,
boundary_density_calculator,
smoothing_kernel, smoothing_length)
boundary_model_tank = BoundaryModelDummyParticles{2}(tank.boundary.density,
tank.boundary.mass,
state_equation=state_equation,
boundary_density_calculator)

boundary_model_gate = BoundaryModelDummyParticles(gate.density, gate.mass,
state_equation=state_equation,
boundary_density_calculator,
smoothing_kernel, smoothing_length)
boundary_model_gate = BoundaryModelDummyParticles{2}(gate.density, gate.mass,
state_equation=state_equation,
boundary_density_calculator)

boundary_system_tank = BoundarySPHSystem(tank.boundary, boundary_model_tank)
boundary_system_gate = BoundarySPHSystem(gate, boundary_model_gate, movement=gate_movement)
Expand All @@ -136,11 +135,10 @@ solid_smoothing_kernel = WendlandC2Kernel{2}()
hydrodynamic_densites = fluid_density * ones(size(solid.density))
hydrodynamic_masses = hydrodynamic_densites * solid_particle_spacing^2

boundary_model_solid = BoundaryModelDummyParticles(hydrodynamic_densites,
hydrodynamic_masses,
state_equation=state_equation,
AdamiPressureExtrapolation(),
smoothing_kernel, smoothing_length)
boundary_model_solid = BoundaryModelDummyParticles{2}(hydrodynamic_densites,
hydrodynamic_masses,
state_equation=state_equation,
boundary_density_calculator)

solid_system = TotalLagrangianSPHSystem(solid,
solid_smoothing_kernel, solid_smoothing_length,
Expand Down
7 changes: 3 additions & 4 deletions examples/fsi/dam_break_plate_2d.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,9 @@ fluid_system = WeaklyCompressibleSPHSystem(tank.fluid, fluid_density_calculator,
# ==========================================================================================
# ==== Boundary
boundary_density_calculator = AdamiPressureExtrapolation()
boundary_model = BoundaryModelDummyParticles(tank.boundary.density, tank.boundary.mass,
state_equation=state_equation,
boundary_density_calculator,
smoothing_kernel, smoothing_length)
boundary_model = BoundaryModelDummyParticles{2}(tank.boundary.density, tank.boundary.mass,
state_equation=state_equation,
boundary_density_calculator)

boundary_system = BoundarySPHSystem(tank.boundary, boundary_model)

Expand Down
15 changes: 5 additions & 10 deletions examples/fsi/falling_spheres_2d.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,9 @@ fluid_system = WeaklyCompressibleSPHSystem(tank.fluid, fluid_density_calculator,
# ==========================================================================================
# ==== Boundary
boundary_density_calculator = BernoulliPressureExtrapolation()
boundary_model = BoundaryModelDummyParticles(tank.boundary.density, tank.boundary.mass,
state_equation=state_equation,
boundary_density_calculator,
fluid_smoothing_kernel, fluid_smoothing_length)
boundary_model = BoundaryModelDummyParticles{2}(tank.boundary.density, tank.boundary.mass,
state_equation=state_equation,
boundary_density_calculator)

boundary_system = BoundarySPHSystem(tank.boundary, boundary_model)

Expand All @@ -90,19 +89,15 @@ hydrodynamic_masses_1 = hydrodynamic_densites_1 * solid_particle_spacing^ndims(f
solid_boundary_model_1 = BoundaryModelDummyParticles(hydrodynamic_densites_1,
hydrodynamic_masses_1,
state_equation=state_equation,
boundary_density_calculator,
fluid_smoothing_kernel,
fluid_smoothing_length)
boundary_density_calculator)

hydrodynamic_densites_2 = fluid_density * ones(size(sphere2.density))
hydrodynamic_masses_2 = hydrodynamic_densites_2 * solid_particle_spacing^ndims(fluid_system)

solid_boundary_model_2 = BoundaryModelDummyParticles(hydrodynamic_densites_2,
hydrodynamic_masses_2,
state_equation=state_equation,
boundary_density_calculator,
fluid_smoothing_kernel,
fluid_smoothing_length)
boundary_density_calculator)

solid_system_1 = TotalLagrangianSPHSystem(sphere1,
solid_smoothing_kernel, solid_smoothing_length,
Expand Down
Loading
Loading