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

Adds methods to mask_immersed_field! for BinaryOperations #3683

Merged
merged 11 commits into from
Aug 15, 2024
Merged

Adds methods to mask_immersed_field! for BinaryOperations #3683

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
70efed9
mask binary operations
jagoosw Aug 6, 2024
5f39200
figure clarity
jagoosw Aug 6, 2024
1bdf010
bump patch
jagoosw Aug 6, 2024
f4e2b81
makes `+` and `-` correct when one field is a number
jagoosw Aug 6, 2024
89c5410
removed nested function calls
jagoosw Aug 7, 2024
771c143
Update src/ImmersedBoundaries/mask_immersed_field.jl
jagoosw Aug 7, 2024
9ec35c4
Merge branch 'main' into jsw/mask-binary-operations
jagoosw Aug 7, 2024
654319a
Merge branch 'main' into jsw/mask-binary-operations
jagoosw Aug 9, 2024
9dd5f3c
reduce support to +/- only
jagoosw Aug 13, 2024
cea4cfd
Merge branch 'main' into jsw/mask-binary-operations
jagoosw Aug 13, 2024
a408840
Merge branch 'main' into jsw/mask-binary-operations
jagoosw Aug 15, 2024
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
12 changes: 9 additions & 3 deletions src/ImmersedBoundaries/mask_immersed_field.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,15 @@ mask_immersed_field!(field::Field, value=zero(eltype(field.grid))) =

mask_immersed_field!(::Number, args...) = nothing

function mask_immersed_field!(bop::BinaryOperation, value=zero(eltype(bop)))
mask_immersed_field!(bop.a, value)
mask_immersed_field!(bop.b, value)
function mask_immersed_field!(bop::BinaryOperation{<:Any, <:Any, <:Any, typeof(+)}, value=zero(eltype(bop)))
mask_immersed_field!(bop.a, ifelse(bop.b isa Number, -bop.b, value))
mask_immersed_field!(bop.b, ifelse(bop.a isa Number, -bop.a, value))
return nothing
end

function mask_immersed_field!(bop::BinaryOperation{<:Any, <:Any, <:Any, typeof(-)}, value=zero(eltype(bop)))
mask_immersed_field!(bop.a, ifelse(bop.b isa Number, bop.b, value))
mask_immersed_field!(bop.b, ifelse(bop.a isa Number, bop.a, value))
return nothing
end

Expand Down