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

Handmerge develop into MAPL3 2023-Jun-08 #2178

Merged

Conversation

mathomp4
Copy link
Member

@mathomp4 mathomp4 commented Jun 8, 2023

Description

This is a handmerge of both develop and #1960 into release/MAPL-v3. This is needed due to the move to fArgParse from FLAP in #2068 so the changes tumble into here.

Related Issue

Closes #1756

Motivation and Context

Moves MAPL3 away from FLAP.

How Has This Been Tested?

I ran GEOSgcm.x with it and it worked...but I'll make sure.

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

@mathomp4 mathomp4 added the 0 Diff The changes in this pull request have verified to be zero-diff with the target branch. label Jun 8, 2023
@mathomp4 mathomp4 requested a review from a team as a code owner June 8, 2023 16:19
@mathomp4 mathomp4 self-assigned this Jun 8, 2023
@mathomp4 mathomp4 requested a review from a team as a code owner June 8, 2023 16:49
@mathomp4 mathomp4 merged commit 4eef614 into release/MAPL-v3 Jun 8, 2023
@mathomp4 mathomp4 deleted the merge/handmerge/develop-into-mapl3-2023Jun08 branch June 8, 2023 17:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
0 Diff The changes in this pull request have verified to be zero-diff with the target branch.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants