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 function barrier to fix HG shock capturing on macOS ARM #1462

Merged
merged 6 commits into from
May 16, 2023

Conversation

efaulhaber
Copy link
Member

Closes #1457.

Other example files using IndicatorHennemannGassner were also broken on macOS ARM. These were fixed as well.
E.g., p4est_2d_dgsem/elixir_euler_blast_wave_amr.jl and tree_3d_dgsem/elixir_euler_shockcapturing_amr.jl.

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 for the quick fix!

src/solvers/dgsem_tree/indicators.jl Outdated Show resolved Hide resolved
src/solvers/dgsem_tree/indicators_1d.jl Outdated Show resolved Hide resolved
@efaulhaber
Copy link
Member Author

Note that when this is approved, the same should be done for the other indicators as well.

@efaulhaber efaulhaber requested a review from ranocha May 13, 2023 11:55
ranocha
ranocha previously approved these changes May 13, 2023
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
Copy link
Member

ranocha commented May 13, 2023

Note that when this is approved, the same should be done for the other indicators as well.

Good point. Once your approach chosen here gets the green light of @sloede, the other indicators should be adapted in the same way - but maybe in another PR

ranocha
ranocha previously approved these changes May 13, 2023
@codecov
Copy link

codecov bot commented May 13, 2023

Codecov Report

Merging #1462 (d00e3e1) into main (bc68423) will decrease coverage by 2.76%.
The diff coverage is 95.73%.

❗ Current head d00e3e1 differs from pull request most recent head 6180fd3. Consider uploading reports for the commit 6180fd3 to get more accurate results

@@            Coverage Diff             @@
##             main    #1462      +/-   ##
==========================================
- Coverage   95.71%   92.95%   -2.76%     
==========================================
  Files         358      358              
  Lines       29655    29639      -16     
==========================================
- Hits        28382    27548     -834     
- Misses       1273     2091     +818     
Flag Coverage Δ
unittests 92.95% <95.73%> (-2.76%) ⬇️

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

Impacted Files Coverage Δ
src/solvers/dgsem_tree/indicators.jl 91.34% <92.86%> (+0.19%) ⬆️
src/solvers/dgsem_tree/indicators_2d.jl 95.44% <94.29%> (+0.17%) ⬆️
src/solvers/dgsem_tree/indicators_3d.jl 96.90% <94.29%> (+0.50%) ⬆️
src/solvers/dgsem_tree/indicators_1d.jl 91.43% <100.00%> (+0.06%) ⬆️

... and 2 files with indirect coverage changes

@ranocha ranocha enabled auto-merge (squash) May 16, 2023 11:53
@ranocha ranocha added the parallelization Related to MPI, threading, tasks etc. label May 16, 2023
@ranocha ranocha disabled auto-merge May 16, 2023 13:51
@ranocha ranocha enabled auto-merge (squash) May 16, 2023 13:51
@ranocha ranocha disabled auto-merge May 16, 2023 13:52
@ranocha ranocha merged commit 5ab925a into trixi-framework:main May 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working parallelization Related to MPI, threading, tasks etc.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

"closures are not supported on this platform" when running example on M1 Mac
3 participants