New const_get_index logic without cam_ccpp_cap dependency (in atmos_phys) #314
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
cacraigucar
reviewed
Oct 16, 2024
cacraigucar
approved these changes
Oct 17, 2024
nusbaume
requested changes
Oct 17, 2024
cime_config/cam_autogen.py
Outdated
| if not os.path.isdir(atm_phys_to_be_ccppized_dir): | ||
| # CAM-SIMA will likely not run without this, so raise an error | ||
| emsg = "ERROR: Unable to find CCPP physics to_be_ccppized directory:\n" | ||
| emsg += f" {atm_phys_util_dir}\n Have you run 'git-fleximod'?" |
There was a problem hiding this comment.
I think this should be atm_phys_to_be_ccppized_dir here:
Suggested change
| emsg += f" {atm_phys_util_dir}\n Have you run 'git-fleximod'?" | |
| emsg += f" {atm_phys_to_be_ccppized_dir}\n Have you run 'git-fleximod'?" |
|
|
||
| if (errcode /= 0) then | ||
| call endrun(subname//"Error "//to_str(errcode)//": "// & |
There was a problem hiding this comment.
I might use stringify here instead of to_str (my hope is to eventually use stringify for all string conversions):
Suggested change
| call endrun(subname//"Error "//to_str(errcode)//": "// & | |
| use string_utils, only: stringify | |
| ... | |
| call endrun(subname//"Error "//stringify((/errcode/))//": "// & |
nusbaume
approved these changes
Oct 17, 2024
| @@ -319,7 +319,7 @@ subroutine const_get_index(name, cindex, abort, warning, caller) | |||
| call ccpp_const_get_idx(const_props, name, cindex, errmsg, errcode) | |||
|
|
|||
| if (errcode /= 0) then | |||
| call endrun(subname//"Error "//to_str(errcode)//": "// & | |||
| call endrun(subname//"Error "//stringify(errcode)//": "// & | |||
There was a problem hiding this comment.
I think stringify expects an array here, so:
Suggested change
| call endrun(subname//"Error "//stringify(errcode)//": "// & | |
| call endrun(subname//"Error "//stringify((/errcode/))//": "// & |
|
Thanks @nusbaume! Apologies for the oversight. Updated and waiting for tests to run then I'll merge to development. |
|
All build tests passed - had to wait in the queue for longer than I expected. Merging now! Thanks everyone for the reviews and feedback. |
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.
Companion atmospheric_physics PR: ESCOMP/atmospheric_physics#135
This avoids a circular dependency if schemes require const_get_index, which presently depends on cam_ccpp_cap, which depends on individual schemes.