Fixes component naming and version to replace clm4.5 with elm #6276
Conversation
Correct component naming and version to replace clm4.5 with elm in the case description, written to README.case for each created case. see E3SM-Project#6245 Reported-by: Rob Jacob <jacob@anl.gov> [BFB]
|
Replaces clm4.5 with elm in the case description, written to README.case for each created case. |
| <desc compset="_ELM%[^_]*CNPRDCTCBC" >elm C-N-P, nutirent competition via relative demand, ctc soil cascade with black carbon deposition:</desc> | ||
| <desc compset="_ELM%[^_]*CNECACTCBC" >elm C-N, nutirent competition via equilibrium chemistry approximation, ctc soil cascade with black carbon deposition:</desc> | ||
| <desc compset="_ELM%[^_]*CNPECACTCBC">elm C-N-P, nutirent competition via equilibrium chemistry approximation, ctc soil cascade with black carbon deposition:</desc> | ||
| <desc compset="_ELM50" >elm physics:</desc> |
There was a problem hiding this comment.
Are "ELM" and "ELM50" really distinct?
There was a problem hiding this comment.
Are "ELM" and "ELM50" really distinct?
I'm not aware of anyone using the ELM50 compsets. I think this could get cleaned up in future revision.
There was a problem hiding this comment.
Actually this ELM50 block can be removed. We have no compsets with "ELM50" in them.
There was a problem hiding this comment.
Actually this ELM50 block can be removed. We have no compsets with "ELM50" in them.
@rljacob do you want this cleaned up now? There are a number of other CLM/ELM naming issues that this PR does not resolve. We were thinking of going back and doing a more complete cleanup after the v3 tag.
There was a problem hiding this comment.
I'll remove the descriptions in the push I'm about to make. Other cleanup can wait.
| <desc compset="_ELM50%[^_]*SP" >clm5.0 Satellite phenology:</desc> | ||
| <desc compset="_ELM50%[^_]*BGC" >clm5.0 bgc (cn and methane):</desc> | ||
| <desc compset="_ELM" >elm physics:</desc> | ||
| <desc compset="_ELM%[^_]*SP" >elm Satellite phenology:</desc> |
There was a problem hiding this comment.
These are additive with each one that matches in order so don't put "elm" in any of the others after "elm physics:". If you had ELM%SP, the resulting string would be "elm physics: elm Satellite phenology:" with what you have now.
There was a problem hiding this comment.
These are additive with each one that matches in order so don't put "elm" in any of the others after "elm physics:". If you had ELM%SP, the resulting string would be "elm physics: elm Satellite phenology:" with what you have now.
I think it's ok to have this redundancy. the elm physics and elm satellite phenology are very distinct features.
|
What testing did you do for these changes? |
|
Actually the CI passed which includes building/running ELM so it should be fine. |
|
This is what ELM%CNPRDCTCBCTOP generates
|
I only ran an X test to make sure it built correctly. |
That looks ok to me. Some minor redundancy with the elm cn and elm C-N-P, but not confusing. |
|
@thorntonpe can you give me write permission to your fork? I found a way to remove the redundancy. |
I'm looking for how to do that. Is it under "collaborators"? |
@rljacob Try now - I added you as a collaborator. |
Add capitalization in ELM descriptions and remove redundant use of "ELM".
|
Yes it worked. Just pushed my changes. There where 2 missing that I added: CNECACNTBC CNPECACNTBC. Please check those descriptions. I did not figure out how to avoid repeating descriptions but the basic water cycle case looks better: |
Thanks Rob. I just noticed that all except the new v3 compset line have nutrient misspelled as "nutirent". Do you want to fix that, or should I? |
|
you can fix it. |
Replaced "nutirent" with "nutrient" [BFB]
|
Spelling fix is done. |
Correct component naming and version to replace clm4.5 with elm in the case description, written to README.case for each created case. Fixes #6245 Reported-by: Rob Jacob jacob@anl.gov [BFB]
Correct component naming and version to replace clm4.5 with elm in the case description, written to README.case for each created case.
Fixes #6245
Reported-by: Rob Jacob jacob@anl.gov
[BFB]