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

Added support to allow eam history tapes up to 15 for maint-2.0 #4991

Merged
merged 1 commit into from
Jun 15, 2022

Conversation

wlin7
Copy link
Contributor

@wlin7 wlin7 commented May 28, 2022

This is to mirror PR #4892 for master to increase eam history tapes
up to 15 to accomodate more extensive output configurations.

[BFB]

This is to mirror PR #4892 for master to increase eam history tapes
up to 15 to accomodate more extensive output configurations.

[BFB]
@wlin7 wlin7 added Atmosphere BFB PR leaves answers BFB labels May 28, 2022
@wlin7 wlin7 requested review from tangq and beharrop May 28, 2022 04:19
@wlin7 wlin7 changed the title Added support to allow eam history tapes up to 15 Added support to allow eam history tapes up to 15 for maint-2.0 May 28, 2022
@wlin7
Copy link
Contributor Author

wlin7 commented May 28, 2022

Hi @tangq , @beharrop , this is the same as #4892 but using a branch that is based on maint-2.0 and for maint-2.0. Please help take a quick look.

The changes should be the same as in #4892 -- note that the differences between master and maint-2.0 in namelist_definition.xml do not showed up in the review page. The other two files, cam_history.F90 and cam_history_support.F90 remain identical between master and maint-2.0.

Copy link
Contributor

@tangq tangq left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@wlin7 , how did you make this PR without showing numerous older commits?

Copy link
Contributor

@beharrop beharrop left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me. Thanks

@wlin7
Copy link
Contributor Author

wlin7 commented May 31, 2022

@tangq , because master and maint-2.0 have diverged, I used a new branch based on current maint-2.0 to have a clean PR for these changes.

@tangq
Copy link
Contributor

tangq commented May 31, 2022

I noticed that the "squash and merge" button is not grey for my account. Does this mean users who are not integrators can merge changes into the maint-2.0 branch?

@rljacob
Copy link
Member

rljacob commented May 31, 2022

That should be fixed. Thanks for pointing it out.

@wlin7 wlin7 self-assigned this Jun 14, 2022
@wlin7 wlin7 merged commit 6275091 into maint-2.0 Jun 15, 2022
@wlin7
Copy link
Contributor Author

wlin7 commented Jun 15, 2022

Merged to maint-2.0.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Atmosphere BFB PR leaves answers BFB
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants