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

Store capacity serial tree mesh #1748

Merged
merged 11 commits into from
Nov 28, 2023

Conversation

DanielDoehring
Copy link
Contributor

This change saves the capacity of a (serial) tree mesh in the restart file and is retrieved later on.

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.

@DanielDoehring DanielDoehring enabled auto-merge (squash) November 21, 2023 11:48
Copy link

codecov bot commented Nov 21, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (5c08cf4) 89.92% compared to head (5d142bc) 72.89%.

Additional details and impacted files
@@             Coverage Diff             @@
##             main    #1748       +/-   ##
===========================================
- Coverage   89.92%   72.89%   -17.03%     
===========================================
  Files         431      431               
  Lines       34854    34863        +9     
===========================================
- Hits        31339    25411     -5928     
- Misses       3515     9452     +5937     
Flag Coverage Δ
unittests 72.89% <100.00%> (-17.03%) ⬇️

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.

@sloede
Copy link
Member

sloede commented Nov 21, 2023

Sorry, but I don't fully get it: What's the purpose of this change? One still needs to provide n_cells_max to load_mesh_serial, so what do I save here?

@DanielDoehring
Copy link
Contributor Author

No, not at all: If you do not provide n_cells_max in the load_mesh call, it will now set the original value for capacity and not the current number of cells.

Concrete example:

The mesh loaded here

mesh = load_mesh(restart_filename)

is of the form

┌──────────────────────────────────────────────────────────────────────────────────────────────────┐
│ TreeMesh{2, Trixi.SerialTree{2}}                                                                 │
│ ════════════════════════════════                                                                 │
│ center: …………………………………………………………… [0.0, 0.0]                                                       │
│ length: …………………………………………………………… 2.0                                                              │
│ periodicity: ……………………………………………… (true, true)                                                     │
│ current #cells: ……………………………………… 341                                                              │
│ #leaf-cells: ……………………………………………… 256                                                              │
│ maximum #cells: ……………………………………… 341                                                              │
└──────────────────────────────────────────────────────────────────────────────────────────────────┘

while the mesh loaded with the proposed change has fields

┌──────────────────────────────────────────────────────────────────────────────────────────────────┐
│ TreeMesh{2, Trixi.SerialTree{2}}                                                                 │
│ ════════════════════════════════                                                                 │
│ center: …………………………………………………………… [0.0, 0.0]                                                       │
│ length: …………………………………………………………… 2.0                                                              │
│ periodicity: ……………………………………………… (true, true)                                                     │
│ current #cells: ……………………………………… 341                                                              │
│ #leaf-cells: ……………………………………………… 256                                                              │
│ maximum #cells: ……………………………………… 30000                                                            │
└──────────────────────────────────────────────────────────────────────────────────────────────────┘

since we store

n_cells_max = 30_000, # set maximum capacity of tree data structure

I prefer the proposed change very much since the current version will cause your AMR simulation to crash.

@sloede
Copy link
Member

sloede commented Nov 21, 2023

Thanks for the explanation!

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.

The proper solution to the described issue would of course be to implement/fix #486. In the meantime, this sounds like a good idea for a quick fix of the capacity/n_cells_max issue when doing restarts.

With the two comments resolved, this LGTM!

src/meshes/mesh_io.jl Outdated Show resolved Hide resolved
src/meshes/mesh_io.jl Outdated Show resolved Hide resolved
@DanielDoehring DanielDoehring enabled auto-merge (squash) November 21, 2023 15:07
@ranocha ranocha disabled auto-merge November 22, 2023 08:23
@ranocha ranocha enabled auto-merge (squash) November 22, 2023 08:23
@DanielDoehring DanielDoehring added the enhancement New feature or request label Nov 23, 2023
@ranocha ranocha disabled auto-merge November 28, 2023 09:28
@ranocha ranocha merged commit d7e1f74 into trixi-framework:main Nov 28, 2023
33 of 34 checks passed
@DanielDoehring DanielDoehring deleted the StoreCapacity branch November 28, 2023 09:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants