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

Remove ESMF_HAS_ACHAR_BUG CMake and cpp macro, update to ESMA_cmake v3.37.0 #2524

Merged
merged 4 commits into from
Jan 18, 2024

Conversation

mathomp4
Copy link
Member

@mathomp4 mathomp4 commented Jan 9, 2024

Description

This PR removes the ESMF_HAS_ACHAR_BUG CMake option and CPP macro that was used as a workaround for a NAG + ESMF bug. Testing by @metdyn and myself shows that this is no longer needed with ESMF 8.6.0.

It also updates to ESMA_cmake v3.37.0 which sets the ESMF_HAS_ACHAR_BUG to default OFF for now and will be removed in a later release.

Related Issue

Motivation and Context

Let's NAG run ExtDataDriver.x!

How Has This Been Tested?

NAG only seems to run the tests correctly without this, so we turn it off. If we don't run NAG, we never use this, so it doesn't affect other compilers.

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 Trivial The changes in this pull request are trivially zero-diff (documentation, build failure, &c.) label Jan 9, 2024
@mathomp4 mathomp4 self-assigned this Jan 9, 2024
@mathomp4 mathomp4 changed the title Remove ESMF_HAS_ACHAR_BUG CMake and cpp macro Remove ESMF_HAS_ACHAR_BUG CMake and cpp macro, update to ESMA_cmake v3.37.0 Jan 9, 2024
@mathomp4 mathomp4 marked this pull request as ready for review January 9, 2024 21:49
@mathomp4 mathomp4 requested review from a team as code owners January 9, 2024 21:49
@tclune tclune merged commit eea9a68 into develop Jan 18, 2024
25 of 27 checks passed
@tclune tclune deleted the feature/mathomp4/unset-achar-nag branch January 18, 2024 17:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
0 Diff Trivial The changes in this pull request are trivially zero-diff (documentation, build failure, &c.)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants