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 computation of max_abs_speeds for the SWE #1898

Merged
merged 4 commits into from
Apr 5, 2024

Conversation

patrickersing
Copy link
Contributor

The wave speed in max_abs_speeds for the SWE computes the wave celerity as c = equations.gravity * sqrt(h) instead of c = sqrt(equations.gravity * h). This PR fixes the computation and adjusts the test values accordingly.
In some elixirs the cfl had to be set back to cfl = 1.0, because they became unstable when using the new wave speed.

@patrickersing patrickersing added the bug Something isn't working label Apr 4, 2024
Copy link
Contributor

github-actions bot commented Apr 4, 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.

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 4, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.30%. Comparing base (0f60ebc) to head (1a89afe).

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #1898   +/-   ##
=======================================
  Coverage   96.30%   96.30%           
=======================================
  Files         448      448           
  Lines       36006    36006           
=======================================
  Hits        34672    34672           
  Misses       1334     1334           
Flag Coverage Δ
unittests 96.30% <100.00%> (ø)

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.

@patrickersing
Copy link
Contributor Author

The modified wave speed affects the downstream tests for Trixi2Vtk.jl using elixir_shallowwater_ec.jl on UnstructuredMesh2D. I think we just need to update the respective reference files in Trixi2Vtk_reference_files.

image

@andrewwinters5000
Copy link
Member

The modified wave speed affects the downstream tests for Trixi2Vtk.jl using elixir_shallowwater_ec.jl on UnstructuredMesh2D. I think we just need to update the respective reference files in Trixi2Vtk_reference_files.

Yes, that is indeed the case. We will need a new reference file.

@DanielDoehring
Copy link
Contributor

DanielDoehring commented Apr 4, 2024

Good spot!

I am a bit embarrassed that I did not spot this when adding more refined wave speed estimates, as it is for the 1D case only 10 lines below :O

https://github.com/trixi-framework/Trixi.jl/blame/main/src/equations/shallow_water_1d.jl

@andrewwinters5000
Copy link
Member

I am even more embarrassed because I introduced this bug in my initial implementation of the 2D shallow water equations. I have no idea how/why I wrote the function this way. The 1D bug just propagated my initial mistake.

Copy link
Member

@andrewwinters5000 andrewwinters5000 left a comment

Choose a reason for hiding this comment

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

LGTM!

@ranocha
Copy link
Member

ranocha commented Apr 5, 2024

The modified wave speed affects the downstream tests for Trixi2Vtk.jl using elixir_shallowwater_ec.jl on UnstructuredMesh2D. I think we just need to update the respective reference files in Trixi2Vtk_reference_files.

Yes, that is indeed the case. We will need a new reference file.

Could you please prepare a PR for that? I would like to see green CI before merging this PR.

@patrickersing
Copy link
Contributor Author

Do we also need to create new releases for the changes to take effect across packages?

@ranocha
Copy link
Member

ranocha commented Apr 5, 2024

Yes. I just started the registration process for Trixi2Vtk.jl. It should be released in half an hour or so. Please update this PR later so that the new version is used in CI. Afterwards, we can merge this PR and release a new version of Trixi.jl so that CI for Trixi2Vtk.jl works again.

@andrewwinters5000
Copy link
Member

Yes. I just started the registration process for Trixi2Vtk.jl.

The new version merged, so I merged main into this PR to trigger the CI again.

@patrickersing patrickersing marked this pull request as ready for review April 5, 2024 09:41
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) April 5, 2024 10:14
@ranocha ranocha merged commit 97aabb7 into trixi-framework:main Apr 5, 2024
37 checks passed
@patrickersing patrickersing deleted the fix_swe_wavespeed branch April 5, 2024 10:29
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.

4 participants