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

Adds code that got lost during merge #20

Merged
merged 1 commit into from
Aug 1, 2017

Conversation

gustavo-marques
Copy link
Collaborator

Some code got that I added in MOM_state_initialization.F90 was lost during the merge with dev/master. This PR fixes that.

  • adds do_not_log=just_read
  • doxygenizes new variables
  • passes all MOM-examples/ocean_only tests on Cheyenne

Some code got that I added in MOM_state_initialization.F90 was lost during the merge with dev/master. This PR fixes that.

* adds do_not_log=just_read
* doxygenizes new variables
* passes all MOM-examples/ocean_only tests on Cheyenne
@alperaltuntas alperaltuntas merged commit 1bca79b into NCAR:dev/ncar Aug 1, 2017
@gustavo-marques gustavo-marques deleted the fix_merge branch August 24, 2017 22:20
alperaltuntas pushed a commit that referenced this pull request Feb 5, 2021
* cleanup of ESMF error handling

Co-authored-by: Mariana Vertenstein <mvertens@ucar.edu>
alperaltuntas pushed a commit that referenced this pull request Apr 22, 2021
alperaltuntas pushed a commit that referenced this pull request Aug 2, 2021
merge in latest dev/gfdl changes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants