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

Save and load user_data for p4est #1915

Merged
merged 22 commits into from
Jun 6, 2024
Merged

Save and load user_data for p4est #1915

merged 22 commits into from
Jun 6, 2024

Conversation

benegee
Copy link
Contributor

@benegee benegee commented Apr 23, 2024

This fixes restating when using AMR.
Resolves #1914

Copy link
Contributor

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.

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.

Copy link

codecov bot commented Apr 23, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.13%. Comparing base (8665300) to head (7b11b29).

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1915      +/-   ##
==========================================
+ Coverage   95.93%   96.13%   +0.19%     
==========================================
  Files         460      460              
  Lines       36952    36956       +4     
==========================================
+ Hits        35449    35524      +75     
+ Misses       1503     1432      -71     
Flag Coverage Δ
unittests 96.13% <100.00%> (+0.19%) ⬆️

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.

@ranocha ranocha requested a review from sloede April 23, 2024 18:56
@ranocha
Copy link
Member

ranocha commented Apr 23, 2024

Can we have a CI test for this?

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.

Looks more or less good to me, I only have one small suggestion.

I also second @ranocha's request for a test (if possible).

src/auxiliary/p4est.jl Outdated Show resolved Hide resolved
@benegee
Copy link
Contributor Author

benegee commented Apr 24, 2024

I am still unhappy with this fix. While new_p4est allows to just allocate user data, load_p4est requires to also provide the data. So in the end I am only saving the data to have memory allocated upon restart.

I also do not know if there was a good reason for not saving user data in the first place.

@DanielDoehring DanielDoehring added the bug Something isn't working label Apr 24, 2024
@benegee
Copy link
Contributor Author

benegee commented May 31, 2024

The solution is to use p4est_reset_data!
cburstedde/p4est#308

ranocha
ranocha previously approved these changes May 31, 2024
@DanielDoehring
Copy link
Contributor

DanielDoehring commented Jun 4, 2024

So with this, is it possible to restart a simulation and refine the initial condition?

@benegee
Copy link
Contributor Author

benegee commented Jun 4, 2024

So with this, is it possible to restart a simulation and refine the initial condition?

Just checked with this example here and it seems to work.

@DanielDoehring
Copy link
Contributor

Just checked with this example here and it seems to work.

Cool, thanks for picking this up!

@ranocha
Copy link
Member

ranocha commented Jun 4, 2024

So with this, is it possible to restart a simulation and refine the initial condition?

Just checked with this example here and it seems to work.

Do we have a test for this? Or is it covered by the tests we already have?

sloede
sloede previously approved these changes Jun 4, 2024
@sloede sloede enabled auto-merge (squash) June 4, 2024 15:05
@DanielDoehring
Copy link
Contributor

Do we have a test for this? Or is it covered by the tests we already have?

So the newly introduced test does exactly this. So in some sense we "test for crash".

DanielDoehring
DanielDoehring previously approved these changes Jun 6, 2024
@benegee benegee dismissed stale reviews from DanielDoehring and sloede via 7d312b3 June 6, 2024 09:53
@benegee
Copy link
Contributor Author

benegee commented Jun 6, 2024

Thanks for your feedback!

Following @JoshuaLampert 's comment above and #1384 (comment) I removed ode_default_options() in elixir_advection_{extended,restart,restart_amr}.jl for p4est_2d_dgsem and tree_2d_dgsem.

In the new elixir_advection_restart_amr.jl for p4est_2d_dgsem and tree_2d_dgsem I set adapt_initial_condition = true. This still tests the restarting capability in general.

@benegee benegee removed the request for review from jmark June 6, 2024 10:01
JoshuaLampert
JoshuaLampert previously approved these changes Jun 6, 2024
Copy link
Member

@JoshuaLampert JoshuaLampert left a comment

Choose a reason for hiding this comment

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

Thanks!

DanielDoehring
DanielDoehring previously approved these changes Jun 6, 2024
@ranocha
Copy link
Member

ranocha commented Jun 6, 2024

Thanks! However, some test tolerances are not satisfied right now: https://github.com/trixi-framework/Trixi.jl/actions/runs/9398803634/job/25884924262?pr=1915#step:7:2874

@benegee
Copy link
Contributor Author

benegee commented Jun 6, 2024

Thanks! However, some test tolerances are not satisfied right now: https://github.com/trixi-framework/Trixi.jl/actions/runs/9398803634/job/25884924262?pr=1915#step:7:2874

Yes! I wanted to update them, but it seems I also introduced some issue in the MPI test. I'm on it.

@benegee benegee dismissed stale reviews from DanielDoehring and JoshuaLampert via a5cd379 June 6, 2024 12:36
@benegee
Copy link
Contributor Author

benegee commented Jun 6, 2024

It seems to work now!

@sloede sloede merged commit 1f4da14 into main Jun 6, 2024
38 checks passed
@sloede sloede deleted the bg/fix-p4est-amr-restart branch June 6, 2024 17:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Restart does not work with p4est + AMR
5 participants