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.

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

Merge shapes #115

Merged
merged 13 commits into from
May 11, 2023
Merged

Merge shapes #115

merged 13 commits into from
May 11, 2023

Conversation

LasNikas
Copy link
Collaborator

I've added a merge-shapes functionality to easily concatenate multiple shapes.
This makes the example files way more readable. I applied it to the oscillating_beam_2d example.

Also, this functionality is very useful when we set up a backward-facing step simulation, for example.

@LasNikas LasNikas requested a review from efaulhaber April 15, 2023 09:40
@codecov
Copy link

codecov bot commented Apr 18, 2023

Codecov Report

Merging #115 (f40a6d7) into main (daf9e49) will increase coverage by 0.15%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##             main     #115      +/-   ##
==========================================
+ Coverage   50.32%   50.47%   +0.15%     
==========================================
  Files          37       38       +1     
  Lines        2186     2193       +7     
==========================================
+ Hits         1100     1107       +7     
  Misses       1086     1086              
Flag Coverage Δ
unitandintegration 50.47% <100.00%> (+0.15%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
examples/fsi/bending_beam_2d.jl 0.00% <ø> (ø)
examples/fsi/dam_break_gate_2d.jl 0.00% <ø> (ø)
src/TrixiParticles.jl 100.00% <ø> (ø)
src/setups/merge_shapes.jl 100.00% <100.00%> (ø)

Copy link
Member

@efaulhaber efaulhaber left a comment

Choose a reason for hiding this comment

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

Good idea, but needs tests.
And please apply this to the FSI examples as well (bending beam, dam break, dam break gate, falling water column).

src/setups/merge_shapes.jl Outdated Show resolved Hide resolved
src/setups/merge_shapes.jl Outdated Show resolved Hide resolved
Copy link
Member

@efaulhaber efaulhaber left a comment

Choose a reason for hiding this comment

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

LGTM!

@efaulhaber efaulhaber enabled auto-merge (squash) May 11, 2023 10:05
@efaulhaber efaulhaber merged commit f04439a into trixi-framework:main May 11, 2023
@LasNikas LasNikas deleted the merge_shapes branch July 28, 2023 14:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants