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

Update BGC version #274

Merged

Conversation

xylar
Copy link
Collaborator

@xylar xylar commented Jun 7, 2019

The only change is the addition of python 3 support during the build.

Brings in E3SM-Project/Ocean-BGC#1 and E3SM-Project/Ocean-BGC#2.

The only change is the addition of python 3 support during the
build.
@xylar
Copy link
Collaborator Author

xylar commented Jun 7, 2019

Testing

I have made sure the code builds on Grizzly with ifort. I haven't done any run tests yet. @mark-petersen, when you're back maybe you can help with that. @maltrud, let me know what tests you might recommend to make sure BGC remains unchanged.

@maltrud
Copy link
Contributor

maltrud commented Jun 7, 2019

@xylar i'm not sure why the BGC_TAG has changed? it should be 2b8aadd.

@xylar
Copy link
Collaborator Author

xylar commented Jun 7, 2019

@maltrud, that was the whole point of the pull requests I just merged to E3SM/Ocean-BGC This makes ocean/develop update to include those commits. Happy for another solution to the python 3 incompatibility if you have one...

@maltrud
Copy link
Contributor

maltrud commented Jun 7, 2019

@xylar sorry i'm apparently more confused than usual. you made some python changes to makedep.py, right? those are fine i assume. but there's also a change to get_BGC.sh which has nothing to do with python--the tag for the BGC module has been changed which it shouldn't.

@xylar
Copy link
Collaborator Author

xylar commented Jun 7, 2019

@maltrud, the tag in get_BGC points to a commit in E3SM-Project/Ocean-BGC. It used to point to the latest commit in that repo (2b8aadd). But now I just committed fixes to makedep.py in that repo and the latest commit has changed. I need get_BGC to pull in those changes as part of the MPAS-Model build. If it points to 2b8aadd, it pulls in the old version of makedep.py that doesn't support python 3. Thus, I am saying the commit I now need it to access (after the 2 PRs have been merged) is the one in I updated to in this PR.

Maybe this link will help:
https://github.com/E3SM-Project/Ocean-BGC/commits/master

@maltrud
Copy link
Contributor

maltrud commented Jun 7, 2019

@xylar ok i get it. i thought i was the only one who could make changes to E3SM-Project/Ocean-BGC. all is good. no wonder i couldn't find the tag in my local BGC repo--should've gone to github....

Copy link
Contributor

@mark-petersen mark-petersen left a comment

Choose a reason for hiding this comment

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

Compiled on IC with gnu and intel. That was with a fresh directory, so it had to obtain new BGC commit. Passed nightly test suite, but none of those include a BGC test.

@maltrud, could you run a 5-day BGC test with this in E3SM? I don't foresee any problems since it is only a python 2 to 3 upgrade. It would be easiest for me to merge this into MPAS, then give you an E3SM branch to test.

@maltrud
Copy link
Contributor

maltrud commented Jun 12, 2019

@mark-petersen sure i'll do a test if you make an e3sm branch.

@mark-petersen mark-petersen merged commit 6b1f556 into MPAS-Dev:ocean/develop Jun 14, 2019
mark-petersen added a commit that referenced this pull request Jun 14, 2019
The only change is the addition of python 3 support during the
build.

Brings in E3SM-Project/Ocean-BGC#1 and
E3SM-Project/Ocean-BGC#2.
@xylar xylar deleted the ocean/update_BGC_python3 branch June 21, 2019 09:27
jonbob added a commit to E3SM-Project/E3SM that referenced this pull request Jun 24, 2019
…3006)

Update mpas-source to current ocean-BGC submodule

This PR updates the ocean-BGC submodule to python 3 compliance
(MPAS-Dev/MPAS-Model#274).

[BFB]
ashwathsv pushed a commit to ashwathsv/MPAS-Model that referenced this pull request Jul 21, 2020
…elop

The only change is the addition of python 3 support during the
build.

Brings in E3SM-Project/Ocean-BGC#1 and
E3SM-Project/Ocean-BGC#2.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants