add this back for mct CLM_USRDAT #3954
Conversation
There was a problem hiding this comment.
We may need to chat about this. But, I actually do NOT want this to come in. We never used these generically named files and when I asked you to remove them I was just asking you to remove unused code. This isn't the problem that I'm seeing. I can't find the issue I made regarding this right now, but when I do I'll point it out.
|
Ahhh, OK. You are right. Of course (as you often are). I was convinced you were wrong, but I had also tracked it down to _get_domains in grid.py which corresponds to the XML you are pointing out. So this does now totally make sense. I really don't want the domain file set though, but it looks like the block doesn't need it as far as I can see at this point. But, that just means removing that one line. And I suggest adding a comment to say you have to set it by hand in the case with xmlchange. |
config/cesm/config_grids.xml
Outdated
| <grid name="glc" compset="SGLC" >null</grid> | ||
| <grid name="glc" compset="CISM2" >gland4</grid> |
There was a problem hiding this comment.
This change (while a good fix of whitespace) is going to cause a conflict with the changes in #3943 . Can you please back this out here and I'll fix the whitespace in that PR?
There was a problem hiding this comment.
This PR has correct whitespace in it. If there is a conflict the issue should be addressed in #3943.
There was a problem hiding this comment.
I have pushed a whitespace fix to #3943 . The problem is that, even with the same whitespace fix in that PR, merging these two branches will produce a merge conflict. Since resolving merge conflicts can be error-prone, I was asking if we can preemptively solve the problem by backing out the whitespace change here and just letting it be fixed when #3943 is merged. If you give me your okay, I'm happy to make that change myself. The end result will be the same, but the merge conflict will be avoided.
This will be fixed in ESMCI#3943
Add back domain for CLM_USRDAT for mct driver.
Test suite: SMS_D_Lm1_Mmpi-serial.CLM_USRDAT.I1PtClm50SpRs.cheyenne_intel.clm-USUMB (All pass)
Test baseline:
Test namelist changes:
Test status: bit for bit
Fixes #3905
User interface changes?:
Update gh-pages html (Y/N)?: