-
Notifications
You must be signed in to change notification settings - Fork 1
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
updates to use either PR1 or PR3 easily #9
Conversation
@gold2718 - if you could please review this - I'll then make a ww3dev PR that will point to this tag. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Approved but with some reservation about more #ifdef
code than is necessary.
model/src/wav_shel_inp.F90
Outdated
#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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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
#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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@gold2718 - I agree. I had done that originally and had other problems associated with changing the namelist.
I'll implement your suggestion now.
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