Possible fix for demo_thread#4297
Merged
mathomp4 merged 3 commits intobugfix/aoloso/demo_threadfrom Jan 9, 2026
Merged
Conversation
mathomp4
added
0 Diff
tclune
approved these changes
Jan 7, 2026
Member
Author
|
I think I see why the spack tests are failing. I've pushed a change to try and fix it. |
Member
Author
|
Crap. I pushed to Hamid's branch... Brain is not braining today. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Types of change(s)
Checklist
make tests)Description
In #4208, some compilers are not happy with the hybrid demo (see https://app.circleci.com/pipelines/github/GEOS-ESM/MAPL/13108/workflows/ef63b257-db2c-4523-9593-188449111a61/jobs/129452)
In talking with @tclune it looks like this might be due to the block construct. So, this PR undoes that.
We also add a much more exciting omp line thanks to Google Gemini (which had some good and some bad suggestions).
I'm making this a PR into @aoloso 's PR so he can take a look as the OpenMP expert on this code!
Related Issue