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

Add numerical support of other real types (shallow_water) #1995

Merged
merged 12 commits into from
Jul 22, 2024

Conversation

huiyuxie
Copy link
Member

@huiyuxie huiyuxie commented Jun 28, 2024

Continue #1909.

Tasks:

  • shallow_water 1d, 2d
  • shallow_water_quasi 1d
  • unit tests for above

@huiyuxie huiyuxie self-assigned this Jun 28, 2024
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 with its PR number.

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.

@huiyuxie huiyuxie added the enhancement New feature or request label Jun 28, 2024
Copy link

codecov bot commented Jun 28, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.23%. Comparing base (91eac3c) to head (df0d34b).

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1995      +/-   ##
==========================================
- Coverage   96.23%   96.23%   -0.00%     
==========================================
  Files         462      462              
  Lines       37075    37074       -1     
==========================================
- Hits        35676    35675       -1     
  Misses       1399     1399              
Flag Coverage Δ
unittests 96.23% <100.00%> (-<0.01%) ⬇️

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.

@huiyuxie huiyuxie requested a review from ranocha July 18, 2024 06:18
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 a lot! Please find below some comments/suggestions

src/equations/shallow_water_1d.jl Outdated Show resolved Hide resolved
src/equations/shallow_water_1d.jl Outdated Show resolved Hide resolved
src/equations/shallow_water_1d.jl Show resolved Hide resolved
src/equations/shallow_water_1d.jl Outdated Show resolved Hide resolved
src/equations/shallow_water_1d.jl Outdated Show resolved Hide resolved
src/equations/shallow_water_2d.jl Outdated Show resolved Hide resolved
src/equations/shallow_water_2d.jl Outdated Show resolved Hide resolved
src/equations/shallow_water_2d.jl Outdated Show resolved Hide resolved
src/equations/shallow_water_2d.jl Outdated Show resolved Hide resolved
test/test_type.jl Show resolved Hide resolved
@huiyuxie
Copy link
Member Author

@ranocha I remember I asked you about why some functions look so complex. So I took the z as a variable that might appear in the original formula - basically, I would not modify the original function too much.

@huiyuxie
Copy link
Member Author

Anyway, I fixed all of them based on your suggestions. Thanks!

@ranocha
Copy link
Member

ranocha commented Jul 18, 2024

Thanks! Some unit tests are still missing but this looks good to me otherwise.

@huiyuxie huiyuxie requested a review from ranocha July 19, 2024 06:57
RealT
@test eltype(@inferred numflux(u_ll, u_rr, orientation, equations)) == RealT
# no matching method
# @test eltype(@inferred numflux(u_ll, u_rr, normal_direction, equations)) == RealT
Copy link
Member Author

Choose a reason for hiding this comment

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

Try to test both orientation and normal_direction but it showed

MethodError: no method matching min_max_speed_davis(::StaticArraysCore.SVector{3, Float32}, ::StaticArraysCore.SVector{3, Float32}, ::StaticArraysCore.SVector{1, Float32}, ::Trixi.ShallowWaterEquations1D{Float32})

Copy link
Member Author

Choose a reason for hiding this comment

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

Is that okay to comment like this? @ranocha

Copy link
Member

Choose a reason for hiding this comment

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

Yes, that's fine 👍

@huiyuxie
Copy link
Member Author

@ranocha Ready for final review and merge ^o^

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 merged commit 5b411f8 into trixi-framework:main Jul 22, 2024
34 of 36 checks passed
@huiyuxie huiyuxie changed the title Add numerical support of other real types (water) Add numerical support of other real types (shallow_water) Jul 24, 2024
@huiyuxie huiyuxie deleted the main-water branch August 18, 2024 23:38
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.

2 participants