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

Update NC-fluxes for the SWE-Wet/Dry #53

Merged

Conversation

patrickersing
Copy link
Contributor

@patrickersing patrickersing commented Aug 16, 2024

In trixi-framework/Trixi.jl#2038, the definition of flux_nonconservative_wintermeyer_etal has been changed and the method flux_nonconservative_ersing_etal is removed from Trixi.jl.

Therefore in this PR flux_nonconservative_ersing_etal is now exported by TrixiShallowWater.jl and some test values had to be updated. Since flux_nonconservative_ersing_etal moves to TrixiShallowWater.jl the lower compat bound for Trixi.jl is also updated.

Needs to be merged after trixi-framework/Trixi.jl#2038

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.

The changes to code look good and it all should work. Because the CI will not run until Trixi v0.8.7 is released did you run the tests locally that everything passes?

@patrickersing
Copy link
Contributor Author

The changes to code look good and it all should work. Because the CI will not run until Trixi v0.8.7 is released did you run the tests locally that everything passes?

Yes, I checked that the tests pass locally.
Since we need to merge the PR from Trixi.jl first, I would also wait for the CI to pass before merging to see that everything really works as expected.

@ranocha
Copy link
Member

ranocha commented Aug 19, 2024

I'll re-open this to trigger CI again using the new release of Trixi.jl

@ranocha ranocha closed this Aug 19, 2024
@ranocha ranocha reopened this Aug 19, 2024
Copy link

codecov bot commented Aug 19, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 99.27%. Comparing base (38def64) to head (62ae365).
Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main      #53      +/-   ##
==========================================
- Coverage   99.27%   99.27%   -0.01%     
==========================================
  Files          61       61              
  Lines        2638     2630       -8     
==========================================
- Hits         2619     2611       -8     
  Misses         19       19              

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

@ranocha
Copy link
Member

ranocha commented Aug 19, 2024

Thanks! Looks like it works. It would be great to get a new release including this somewhat soon so that Trixi.jl downstream CI passes again.

@andrewwinters5000 andrewwinters5000 merged commit 846f4a1 into trixi-framework:main Aug 19, 2024
20 of 35 checks passed
@patrickersing patrickersing deleted the update_nc_fluxes branch August 19, 2024 14:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants