Skip to content
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

Does release-clm5.0.12 need to be moved to master? #873

Closed
billsacks opened this issue Dec 30, 2019 · 5 comments · Fixed by #883
Closed

Does release-clm5.0.12 need to be moved to master? #873

billsacks opened this issue Dec 30, 2019 · 5 comments · Fixed by #883
Assignees
Labels
type: -discussion Issue created mainly to create discussion on a topic.

Comments

@billsacks
Copy link
Member

@ekluzek - in the card for moving release changes to master (https://github.com/ESCOMP/CTSM/projects/6#card-13680676), you don't mention needing to move release-clm5.0.12 to master. But it looks like at least the fix for #550 is on the release branch but not on master, which makes me wonder if there are other changes that came into release-clm5.0.12 but not to master.

@billsacks billsacks added type: -discussion Issue created mainly to create discussion on a topic. tag: next this issue should get some attention in the next week or two labels Dec 30, 2019
@ekluzek
Copy link
Contributor

ekluzek commented Jan 10, 2020

I'm not completely sure about this one. But, I need to do some study on the issue to figure it out. I will do that and report back.

@ekluzek
Copy link
Contributor

ekluzek commented Jan 16, 2020

OK, so this does a couple of different things, some of which it turns out should come in. It adds the handling of 2010 compsets, which should come in because there are a few 2010 compsets in CAM for cesm2.1.2. It has better handling of picking of initial conditions, so that logic should come in as well. The thing I'm not sure about is that it changes initial condition files.

@billsacks
Copy link
Member Author

And the fix for #550 , which I assume should come in.

@ekluzek
Copy link
Contributor

ekluzek commented Jan 16, 2020

Yes, that would come in. I looked at the IC files and master has newer IC files than the ones on the release branch (and newer than the ones updated to in "12" as well). So I think most everything comes in other than the updated IC files. Presumably, that's what I was thinking when I excluded "12" from the list, these are new IC files that should only be used on the release branch. But, the rest of the changes do apply and should come in.

@billsacks billsacks removed the tag: next this issue should get some attention in the next week or two label Jan 27, 2020
@billsacks
Copy link
Member Author

Resolved.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type: -discussion Issue created mainly to create discussion on a topic.
Projects
None yet
Development

Successfully merging a pull request may close this issue.

2 participants