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

Make TreeMesh type general #2129

Merged
merged 34 commits into from
Nov 7, 2024

Conversation

DanielDoehring
Copy link
Contributor

No description provided.

@DanielDoehring DanielDoehring added the consistency Make Michael happy label Oct 23, 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.

@DanielDoehring
Copy link
Contributor Author

Maybe good point in time to combine this with #1194

@ranocha
Copy link
Member

ranocha commented Oct 23, 2024

Maybe good point in time to combine this with #1194

👍

Copy link

codecov bot commented Oct 23, 2024

Codecov Report

Attention: Patch coverage is 93.54839% with 4 lines in your changes missing coverage. Please review.

Project coverage is 96.36%. Comparing base (dcf1b58) to head (7582f1b).
Report is 1 commits behind head on main.

Files with missing lines Patch % Lines
src/meshes/abstract_tree.jl 66.67% 2 Missing ⚠️
src/meshes/tree_mesh.jl 88.89% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2129      +/-   ##
==========================================
- Coverage   96.36%   96.36%   -0.00%     
==========================================
  Files         480      480              
  Lines       38028    38042      +14     
==========================================
+ Hits        36645    36657      +12     
- Misses       1383     1385       +2     
Flag Coverage Δ
unittests 96.36% <93.55%> (-<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.

@DanielDoehring DanielDoehring marked this pull request as ready for review October 24, 2024 12:14
src/meshes/tree_mesh.jl Show resolved Hide resolved
@huiyuxie
Copy link
Member

huiyuxie commented Nov 1, 2024

Also in parallel_tree and serial_tree there are some Float64 NaNs - for example see

function invalidate!(t::ParallelTree, first::Int, last::Int)
@assert first > 0
@assert last <= t.capacity + 1
# Integer values are set to smallest negative value, floating point values to NaN
t.parent_ids[first:last] .= typemin(Int)
t.child_ids[:, first:last] .= typemin(Int)
t.neighbor_ids[:, first:last] .= typemin(Int)
t.levels[first:last] .= typemin(Int)
t.coordinates[:, first:last] .= NaN
t.original_cell_ids[first:last] .= typemin(Int)
t.mpi_ranks[first:last] .= typemin(Int)
return nothing
end

Basically NaN of type Float64 will not cause type instability since they will make everything NaN in numerical operations but I'm worried about something like

t.coordinates[:, first:last] .= one(typeof(t.coordinates[1, 1])

So it would be better to make NaN also change with the input type how do you think about it @ranocha?

@huiyuxie
Copy link
Member

huiyuxie commented Nov 1, 2024

👍👍👍

@huiyuxie huiyuxie requested a review from ranocha November 1, 2024 02:25
@ranocha
Copy link
Member

ranocha commented Nov 2, 2024

Also in parallel_tree and serial_tree there are some Float64 NaNs - for example see

function invalidate!(t::ParallelTree, first::Int, last::Int)
@assert first > 0
@assert last <= t.capacity + 1
# Integer values are set to smallest negative value, floating point values to NaN
t.parent_ids[first:last] .= typemin(Int)
t.child_ids[:, first:last] .= typemin(Int)
t.neighbor_ids[:, first:last] .= typemin(Int)
t.levels[first:last] .= typemin(Int)
t.coordinates[:, first:last] .= NaN
t.original_cell_ids[first:last] .= typemin(Int)
t.mpi_ranks[first:last] .= typemin(Int)
return nothing
end

Basically NaN of type Float64 will not cause type instability since they will make everything NaN in numerical operations but I'm worried about something like

t.coordinates[:, first:last] .= one(typeof(t.coordinates[1, 1])

So it would be better to make NaN also change with the input type

That should happen right now?

julia> foo!(x) = (x .= NaN; x)

julia> foo!(zeros(Float64, 10))
10-element Vector{Float64}:
 NaN
 NaN
 NaN
 NaN
 NaN
 NaN
 NaN
 NaN
 NaN
 NaN

julia> foo!(zeros(Float32, 10))
10-element Vector{Float32}:
 NaN
 NaN
 NaN
 NaN
 NaN
 NaN
 NaN
 NaN
 NaN
 NaN

julia> foo!(zeros(Float16, 10))
10-element Vector{Float16}:
 NaN
 NaN
 NaN
 NaN
 NaN
 NaN
 NaN
 NaN
 NaN
 NaN
 
julia> foo!(zeros(Float16, 10))[1]
NaN16

julia> foo!(zeros(Float32, 10))[1]
NaN32

julia> foo!(zeros(Float64, 10))[1]
NaN

@ranocha
Copy link
Member

ranocha commented Nov 4, 2024

@huiyuxie If you like, please review this PR first and request my review when you're done.

@huiyuxie
Copy link
Member

huiyuxie commented Nov 4, 2024

please review this PR first and request my review when you're done.

👌and what is your foo! function definition @ranocha ?

src/meshes/serial_tree.jl Show resolved Hide resolved
src/meshes/parallel_tree.jl Show resolved Hide resolved
@huiyuxie
Copy link
Member

huiyuxie commented Nov 4, 2024

Or we could also keep one interface for each - SerialTree{NDIMS, RealT} and SerialTree{1, RealT} (and similarly, ParallelTree{NDIMS, RealT} and ParallelTree{1, RealT} ) and change original SerialTree{NDIMS} to SerialTree{NDIMS, RealT} and SerialTree{1} to SerialTree{1, RealT} (and also for parallel tree) in precompile.

Which way would you prefer @DanielDoehring @ranocha ?

@ranocha
Copy link
Member

ranocha commented Nov 5, 2024

please review this PR first and request my review when you're done.

👌and what is your foo! function definition @ranocha ?

Sorry, fixed above

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. Looks quite good already 👍

test/test_tree_2d_mhd.jl Show resolved Hide resolved
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) November 7, 2024 19:02
@ranocha ranocha merged commit 9fa4e27 into trixi-framework:main Nov 7, 2024
35 of 36 checks passed
@DanielDoehring DanielDoehring deleted the TypeGeneralTreemesh branch November 7, 2024 22:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
consistency Make Michael happy
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants