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

Conservative AMR #2028

Merged
merged 42 commits into from
Aug 19, 2024
Merged

Conversation

andrewwinters5000
Copy link
Member

@andrewwinters5000 andrewwinters5000 commented Aug 1, 2024

Now the Jacobian weighted solution Ju rather than only the solution u is interpolated and/or projected during the coarsen and refinement of the AMR procedure. This maintains conservation on 2D and 3D curvilinear meshes. Some tests may need updated now that the refine/coarsen procedures change.

Update: My hopes were too optimistic. It seems many test values need updated :(

@andrewwinters5000 andrewwinters5000 added the bug Something isn't working label Aug 1, 2024
Copy link
Contributor

github-actions bot commented Aug 1, 2024

Review checklist

This checklist is meant to assist creators of PRs (to let them know what reviewers will typically look for) and reviewers (to guide them in a structured review process). Items do not need to be checked explicitly for a PR to be eligible for merging.

Purpose and scope

  • The PR has a single goal that is clear from the PR title and/or description.
  • All code changes represent a single set of modifications that logically belong together.
  • No more than 500 lines of code are changed or there is no obvious way to split the PR into multiple PRs.

Code quality

  • The code can be understood easily.
  • Newly introduced names for variables etc. are self-descriptive and consistent with existing naming conventions.
  • There are no redundancies that can be removed by simple modularization/refactoring.
  • There are no leftover debug statements or commented code sections.
  • The code adheres to our conventions and style guide, and to the Julia guidelines.

Documentation

  • New functions and types are documented with a docstring or top-level comment.
  • Relevant publications are referenced in docstrings (see example for formatting).
  • Inline comments are used to document longer or unusual code sections.
  • Comments describe intent ("why?") and not just functionality ("what?").
  • If the PR introduces a significant change or new feature, it is documented in NEWS.md with its PR number.

Testing

  • The PR passes all tests.
  • New or modified lines of code are covered by tests.
  • New or modified tests run in less then 10 seconds.

Performance

  • There are no type instabilities or memory allocations in performance-critical parts.
  • If the PR intent is to improve performance, before/after time measurements are posted in the PR.

Verification

  • The correctness of the code was verified using appropriate tests.
  • If new equations/methods are added, a convergence test has been run and the results
    are posted in the PR.

Created with ❤️ by the Trixi.jl community.

@andrewwinters5000 andrewwinters5000 changed the title Comservative AMR Conservative AMR Aug 1, 2024
Copy link

codecov bot commented Aug 2, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.29%. Comparing base (26ab5fa) to head (b650fff).
Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2028      +/-   ##
==========================================
+ Coverage   96.27%   96.29%   +0.02%     
==========================================
  Files         462      466       +4     
  Lines       37052    37226     +174     
==========================================
+ Hits        35671    35845     +174     
  Misses       1381     1381              
Flag Coverage Δ
unittests 96.29% <100.00%> (+0.02%) ⬆️

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

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@DanielDoehring
Copy link
Contributor

Thanks a lot Andrew! One thing it would suggest is that we add (possibly only in the test directory) a test for conservation. This way we can ensure this issue does not pop up later on again.

@andrewwinters5000 andrewwinters5000 requested a review from jmark August 7, 2024 12:39
Copy link
Contributor

@DanielDoehring DanielDoehring left a comment

Choose a reason for hiding this comment

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

I have two suggestions for explanatory comments which I feel would be useful when added. The code formatter does cruel things, though.

src/callbacks_step/amr_dg2d.jl Outdated Show resolved Hide resolved
src/callbacks_step/amr_dg3d.jl Outdated Show resolved Hide resolved
@andrewwinters5000
Copy link
Member Author

I have two suggestions for explanatory comments which I feel would be useful when added. The code formatter does cruel things, though.

Thanks! I can add comments to explain why the element_id is incremented in this way.

@andrewwinters5000
Copy link
Member Author

andrewwinters5000 commented Aug 15, 2024

I think the (occasional) failing MPI test on T8codeMesh is due to an existing issue that these tests occasionally segfault. Do I remember this correctly @jmark ? Or did this issue get fixed?

DanielDoehring
DanielDoehring previously approved these changes Aug 16, 2024
@jmark
Copy link
Contributor

jmark commented Aug 16, 2024

I think the (occasional) failing MPI test on T8codeMesh is due to an existing issue that these tests occasionally segfault. Do I remember this correctly @jmark ? Or did this issue get fixed?

Yes, indeed. I could narrow it down to the interaction between t8code, MPI and Julia's garbage collector. I offer a workaround in #1980.

It boils down to explicitly finalizing the mesh object of a T8codeMesh in each elixir.

# Finalize `T8codeMesh` to make sure MPI related objects in t8code are
# released before `MPI` finalizes.
!isinteractive() && finalize(mesh)

I think it is best to push a PR just doing this. I'll do it right now. Then you can merge it in. Give me a minute.

@jmark
Copy link
Contributor

jmark commented Aug 16, 2024

Just pushed this PR #2043.

Copy link
Member

@ranocha ranocha left a comment

Choose a reason for hiding this comment

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

Thanks a lot! I just have a last round of suggestions

src/callbacks_step/amr_dg2d.jl Outdated Show resolved Hide resolved
src/callbacks_step/amr_dg2d.jl Outdated Show resolved Hide resolved
src/callbacks_step/amr_dg3d.jl Outdated Show resolved Hide resolved
src/callbacks_step/amr_dg3d.jl Outdated Show resolved Hide resolved
ranocha
ranocha previously approved these changes Aug 19, 2024
Copy link
Member

@ranocha ranocha left a comment

Choose a reason for hiding this comment

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

Thanks!

@ranocha
Copy link
Member

ranocha commented Aug 19, 2024

@andrewwinters5000 I added a NEWS.md entry since this is a kind of bigger change. Could you please check whether it looks good to you?

NEWS.md Outdated Show resolved Hide resolved
Co-authored-by: Andrew Winters <[email protected]>
Copy link
Member

@ranocha ranocha left a comment

Choose a reason for hiding this comment

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

Thanks

@ranocha ranocha enabled auto-merge (squash) August 19, 2024 10:10
@ranocha ranocha disabled auto-merge August 19, 2024 11:40
@ranocha ranocha merged commit ba82d36 into trixi-framework:main Aug 19, 2024
32 of 35 checks passed
@andrewwinters5000 andrewwinters5000 deleted the conservative-amr branch August 19, 2024 12:03
Copy link
Member

@sloede sloede left a comment

Choose a reason for hiding this comment

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

Nice work - thanks a lot for investigating and fixing this, @andrewwinters5000 ♥️

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working high-priority
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants