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

Auto GitFlow - main → develop #2279

Merged
merged 6 commits into from
Aug 1, 2023
Merged

Auto GitFlow - main → develop #2279

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
25ab1d3
Merge pull request #2258 from GEOS-ESM/develop
mathomp4 Jul 28, 2023
20547ea
Fixes #2274
tclune Aug 1, 2023
085647e
Changes needed in each routine.
tclune Aug 1, 2023
3a9510a
Merge pull request #2277 from GEOS-ESM/hotfix/tclune/#2274-setattribu…
mathomp4 Aug 1, 2023
5626d3c
Prepare for 2.40.1 Release
mathomp4 Aug 1, 2023
3062ccf
Merge pull request #2280 from GEOS-ESM/prepare-for-2.40.1
mathomp4 Aug 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Fixed

- Workaround for NAG which prevents reading values from ESMF Config files that have been set using `SetAttribute()`. The immediate issue appears to be due to a wrong CPP conditional on `ESMF_HAS_ACHAR_BUG', but it is not immediately clear if this is due to recent changes in ESMF or some change in NAG. Probably ESMF though. Once the ESMF core team analyzes we will potentially update this fix.

### Removed

### Deprecated
Expand Down
10 changes: 5 additions & 5 deletions base/MAPL_Config.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ function MAPL_ConfigCreate(unusable, rc) result(config)
integer, optional, intent(out) :: rc

character, parameter :: EOB = achar(00) !! end of buffer mark (null)
#ifdef ESMF_HAS_ACHAR_BUG
#if defined(ESMF_HAS_ACHAR_BUG) | defined(__NAG_COMPILER_BUILD)
character, parameter :: EOL = achar(12) !! end of line mark (cr)
#else
character, parameter :: EOL = achar(10) !! end of line mark (newline)
Expand Down Expand Up @@ -95,7 +95,7 @@ subroutine MAPL_ConfigSetAttribute_real64( config, value, label, rc )

character, parameter :: BLK = achar(32) ! blank (space)
character, parameter :: TAB = achar(09) ! TAB
#ifdef ESMF_HAS_ACHAR_BUG
#if defined(ESMF_HAS_ACHAR_BUG) | defined(__NAG_COMPILER_BUILD)
character, parameter :: EOL = achar(12) ! end of line mark (cr)
#else
character, parameter :: EOL = achar(10) ! end of line mark (newline)
Expand Down Expand Up @@ -264,7 +264,7 @@ subroutine MAPL_ConfigSetAttribute_real32( config, value, label, rc )

character, parameter :: BLK = achar(32) ! blank (space)
character, parameter :: TAB = achar(09) ! TAB
#ifdef ESMF_HAS_ACHAR_BUG
#if defined(ESMF_HAS_ACHAR_BUG) | defined(__NAG_COMPILER_BUILD)
character, parameter :: EOL = achar(12) ! end of line mark (cr)
#else
character, parameter :: EOL = achar(10) ! end of line mark (newline)
Expand Down Expand Up @@ -433,7 +433,7 @@ subroutine MAPL_ConfigSetAttribute_int32( config, value, label, rc )

character, parameter :: BLK = achar(32) ! blank (space)
character, parameter :: TAB = achar(09) ! TAB
#ifdef ESMF_HAS_ACHAR_BUG
#if defined(ESMF_HAS_ACHAR_BUG) | defined(__NAG_COMPILER_BUILD)
character, parameter :: EOL = achar(12) ! end of line mark (cr)
#else
character, parameter :: EOL = achar(10) ! end of line mark (newline)
Expand Down Expand Up @@ -678,7 +678,7 @@ subroutine MAPL_ConfigSetAttribute_string(config, value, label, rc)

character, parameter :: BLK = achar(32) ! blank (space)
character, parameter :: TAB = achar(09) ! TAB
#ifdef ESMF_HAS_ACHAR_BUG
#if defined(ESMF_HAS_ACHAR_BUG) | defined(__NAG_COMPILER_BUILD)
character, parameter :: EOL = achar(12) ! end of line mark (cr)
#else
character, parameter :: EOL = achar(10) ! end of line mark (newline)
Expand Down