Merge pull request #2277 from GEOS-ESM/hotfix/tclune/#2274-setattribu…

…te-workaround

Fixes #2274

CHANGELOG.md

@@ -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

base/MAPL_Config.F90

@@ -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)
@@ -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)
@@ -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)
@@ -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)
@@ -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)