Skip to content
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

Fix Monaghan-Kajtar BC #264

Merged
merged 6 commits into from
Nov 14, 2023
Merged

Fix Monaghan-Kajtar BC #264

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
359fcd1
Fix Monaghan-Kajtar BC
efaulhaber Nov 2, 2023
ab3d041
Reformat
efaulhaber Nov 2, 2023
83d5b2c
Add comment
efaulhaber Nov 2, 2023
60a3a9b
Revert NHS of rectangular tank example
efaulhaber Nov 2, 2023
6580c28
Revert change in rectangular tank example
efaulhaber Nov 2, 2023
98cb0d9
Merge branch 'main' into fix-monaghan-bc
efaulhaber Nov 14, 2023
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
8 changes: 7 additions & 1 deletion src/general/semidiscretization.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,17 @@ end
return compact_support(system, system.boundary_model, neighbor)
end

@inline function compact_support(system, model, neighbor)
@inline function compact_support(system, model::BoundaryModelMonaghanKajtar, neighbor)
# Use the compact support of the fluid for solid-fluid interaction
return compact_support(neighbor, system)
end

@inline function compact_support(system, model::BoundaryModelMonaghanKajtar,
neighbor::BoundarySPHSystem)
# This NHS is never used
return 0.0
end

@inline function compact_support(system, model::BoundaryModelDummyParticles, neighbor)
# TODO: Monaghan-Kajtar BC are using the fluid's compact support for solid-fluid
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove this TODO ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, this is still relevant.

# interaction. Dummy particle BC use the model's compact support, which is also used
Expand Down