Fix OMP setup and 'setmask' #806
Merged
Conversation
This file contains 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
apcraig
approved these changes
Dec 14, 2022
|
What happened here? Oh shoot. I committed the meshgrid fixes to cesm_updates as well. Would it be ok to add both in one PR? |
|
I think it's fine. The two changes are both pretty small. Please update the documentation as needed and update the PR title and description a bit. Please also run some test suites with the new code changes. Thanks. If you prefer to have a separate PR, that's also fine. |
|
Running the test suite again. |
|
This is ready to go. Bfb with the base_suite on cheyenne with intel/gnu/pgi. |
apcraig
approved these changes
Dec 17, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
For detailed information about submitting Pull Requests (PRs) to the CICE-Consortium,
please refer to: https://github.com/CICE-Consortium/About-Us/wiki/Resource-Index#information-for-developers
PR checklist
This is just a simple fix for the OMP ORDERED issue in CESM. This also fixes the issue Change grid_type = 'setmask' to use kmt_type instead (NUOPC / CMEPS) #805 to deal with grid_type = 'setmask'.
dabail10 (D. Bailey)
Tested in the CESM aux_cice suite. Also ran the base_suite on cheyenne with intel, gnu, and pgi. Everything bfb.
https://github.com/CICE-Consortium/Test-Results/wiki/cice_by_hash_forks#d7988c940a8e2dad95f7b743c521558bba39ef2b
Simply move the flush_fileunit call. This fixes Issue OpenMP Initialization in ice_grid.F90 #800 and issue Change grid_type = 'setmask' to use kmt_type instead (NUOPC / CMEPS) #805. Adds an option for grid_format = 'meshnc'.