updates to use either PR1 or PR3 easily #9
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
mvertens
added
bug fix
|
@gold2718 - if you could please review this - I'll then make a ww3dev PR that will point to this tag. |
gold2718
approved these changes
Jul 14, 2023
model/src/wav_shel_inp.F90
Outdated
Comment on lines
261
to
265
| #ifndef W3_CESMCOUPLED | ||
| inquire(file=trim(fnmpre)//"ww3_shel.nml", exist=flgnml) | ||
| #else | ||
| inquire(file=trim(fnmpre)//"wav_in", exist=flgnml) | ||
| #endif |
There was a problem hiding this comment.
It would be nice if the filename was resolved in one place (into a local variable) and then used here and below. That way, the code difference between models is minimized.
-- Committee for less ifdef code
Suggested change
| #ifndef W3_CESMCOUPLED | |
| inquire(file=trim(fnmpre)//"ww3_shel.nml", exist=flgnml) | |
| #else | |
| inquire(file=trim(fnmpre)//"wav_in", exist=flgnml) | |
| #endif | |
| #ifndef W3_CESMCOUPLED | |
| nl_filename = trim(fnmpre)//"ww3_shel.nml" | |
| #else | |
| nl_filename = trim(fnmpre)//"wav_in" | |
| #endif | |
| inquire(file=trim(nl_filename), exist=flgnml) |
There was a problem hiding this comment.
@gold2718 - I agree. I had done that originally and had other problems associated with changing the namelist.
I'll implement your suggestion now.
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.
Pull Request Summary
Update to use either PR1 or PR3 easily
Description
This PR updates CMakeLists.txt to use PR1 and PR3 easily (enhancement)
Also - provides a bugfix for running PR1 in debug mode (bug)
Issue(s) addressed
Commit Message
updates and bug fixes to use either PR1 or PR3 easily
Testing
Ran the following tests:
SMS_D_Ld5.T62_wtn14nw.WW3test.betzy_intel
ERS_D_Ld5.T62_wtn14.WW3test.betzy_intel