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.

Sign up for GitHub

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

Jump to bottom

Fixes #405. Synced with CVS "yuri-s2s3-unstable-SLES12" tag. Change w… #414

Merged
merged 1 commit into from
Jun 10, 2020
Merged

Fixes #405. Synced with CVS "yuri-s2s3-unstable-SLES12" tag. Change w… #414

merged 1 commit into from
Jun 10, 2020

Conversation

atrayano
Copy link
Contributor

…as needed to support "dual ocean"

Description

Fixes #405. Brought the code for "yuri-s2s3-unstable-SLES12" CVS tag

Related Issue

#405

Motivation and Context

How Has This Been Tested?

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Trivial change (affects only documentation or cleanup)

Checklist:

  • I have tested this change with a run of GEOSgcm (if non-trivial)
  • I have added one of the required labels (0 diff, 0 diff trivial, 0 diff structural, non 0-diff)
  • I have updated the CHANGELOG.md accordingly following the style of Keep a Changelog

@atrayano atrayano added the 0 Diff The changes in this pull request have verified to be zero-diff with the target branch. label Jun 10, 2020
@atrayano atrayano requested review from tclune and bena-nasa June 10, 2020 14:01
@atrayano atrayano requested a review from a team as a code owner June 10, 2020 14:01
@atrayano atrayano merged commit 9c787e5 into master Jun 10, 2020
@yvikhlya yvikhlya mentioned this pull request Jun 10, 2020
Merged
@mathomp4 mathomp4 deleted the hotfix/atrayano/fixes#405_record_alarms branch June 11, 2020 16:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tclune tclune tclune approved these changes

@bena-nasa bena-nasa Awaiting requested review from bena-nasa

Assignees
No one assigned
Labels
0 Diff The changes in this pull request have verified to be zero-diff with the target branch.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Bring MAPL_RecordAlarmsIsRinging from CVS
2 participants
@atrayano @tclune