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

Fix flux for quasi-1D SWE #1731

Merged
merged 4 commits into from
Nov 11, 2023

Conversation

jlchan
Copy link
Contributor

@jlchan jlchan commented Nov 11, 2023

Remove the non-conservative pressure term in the quasi-1D SWE flux. This fixes a bug in flux_lax_friedrichs.

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 Nov 11, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (6158ba4) 89.28% compared to head (c0f859f) 92.00%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1731      +/-   ##
==========================================
+ Coverage   89.28%   92.00%   +2.72%     
==========================================
  Files         431      432       +1     
  Lines       34641    34687      +46     
==========================================
+ Hits        30928    31911     +983     
+ Misses       3713     2776     -937     
Flag Coverage Δ
unittests 92.00% <100.00%> (+2.72%) ⬆️

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

Files Coverage Δ
...gsem/elixir_shallowwater_quasi_1d_discontinuous.jl 100.00% <100.00%> (ø)
src/equations/shallow_water_quasi_1d.jl 93.40% <100.00%> (+7.29%) ⬆️

... and 42 files with indirect coverage changes

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

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.

LGTM technically, but someone from the SWE crew should have a look at the flux implementation

@jlchan
Copy link
Contributor Author

jlchan commented Nov 11, 2023

Failing parabolic tests should be fixed by #1728.

@ranocha ranocha added the bug Something isn't working label Nov 11, 2023
@ranocha
Copy link
Member

ranocha commented Nov 11, 2023

Thanks! I plan to backport your fix first in #1732, then update this PR, merge it, release a new version v0.5.x of Trixi.jl with all tests passing except the neural network stuff, and finally merge #1705 (in a regular merge, not a squash merge) to release v0.6.0 of Trixi.jl.

@ranocha ranocha enabled auto-merge (squash) November 11, 2023 18:16
@ranocha ranocha disabled auto-merge November 11, 2023 20:10
@ranocha ranocha merged commit 5345609 into trixi-framework:main Nov 11, 2023
30 of 32 checks passed
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.

3 participants