-
Notifications
You must be signed in to change notification settings - Fork 61
merge of noresm cdeps1.0.83_noresm_v3 to fix conflicts #368
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
base: main
Are you sure you want to change the base?
merge of noresm cdeps1.0.83_noresm_v3 to fix conflicts #368
Conversation
jedwards4b
left a comment
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.
I had a couple of minor comments, but this looks good overall. Thank you.
| new_lines.append(new_line) | ||
| else: | ||
| print(f" WARNING:not adding missing file {new_file}") | ||
| print(f" WARNING:not adding missing file {new_line}") |
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.
Should this message be changed from "missing file" to "missing line"?
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 actually should be new_line - where new_line actually represents the file that is looked for. I can try to update this more generally in the next cdeps PR coming up soon.
dlnd/lnd_comp_nuopc.F90
Outdated
| integer :: mpicom ! mpi communicator | ||
| integer :: my_task ! my task in mpi communicator mpicom | ||
| logical :: mainproc ! true if my_task == main_task | ||
| logical :: mainproc ! true of my_task == main_task |
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.
Should be 'true if' not 'true of'
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.
done
Description of changes
This PR fixes a CDEPS bug that was found using stream input ne16pg3 with 58 vertical levels using NorESM. CDEPS aborted trying to read this in.
Specific notes
This PR also does the following:
character(*) with character(len=*)logunitandmainprocin shr_strdata_type and bothlogunitandmainprocin shr_stream_streamType. This is needed since the inline interface was not always writing all log output consistently.dshr_strdata_mod.F90forshr_strdata_get_stream_pointer_1d and shr_strdata_get_stream_pointer_2d
and
If requirePointer is not provided - then if the pointer is not found, the subroutine returns without an error. If requirePointer is an argument and is true, than normally an errmsg is provided that describes why the pointer is required. Also - now if the pointer is required and is found - then the pointer is initialized to NaN.
The new setting of NaNs in the stream and state pointers resulted in the following additional changes that needed to be brought in:
Contributors other than yourself, if any: None
CDEPS Issues Fixed:
Are there dependencies on other component PRs: None
Are changes expected to change answers (bfb, different to roundoff, more substantial): bfb
Any User Interface Changes (namelist or namelist defaults changes): None