Merge pull request #326 from GEOS-ESM/hotfix/nag-esmf-config-setattri…

…bute

Fix for ESMF Config + NAG issue.

.circleci/config.yml

@@ -1,8 +1,8 @@
 version: 2.1
 
-# Anchors to prevent forgetting to update a version
-baselibs_version: &baselibs_version v7.13.0
-bcs_version: &bcs_version v11.1.0
+# Anchors in case we need to override the defaults from the orb
+#baselibs_version: &baselibs_version v7.14.0
+#bcs_version: &bcs_version v11.1.0
 
 orbs:
   ci: geos-esm/circleci-tools@1
@@ -19,7 +19,7 @@ workflows:
             parameters:
               compiler: [gfortran, ifort]
           repo: GEOSgcm
-          baselibs_version: *baselibs_version
+          #baselibs_version: *baselibs_version
           checkout_fixture: true
           mepodevelop: true
           persist_workspace: false # Needs to be true to run fv3/gcm experiment, costs extra

CHANGELOG.md

@@ -15,6 +15,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+## [3.31.1] - 2023-08-03
+
+### Fixed
+
+- Fixed a build incompatibity with ESMF that affects `MAPL_Config::SetAttribute*()`
+
+### Changed
+
+- Update CI to use Baselibs default from CircleCI orb
+
 ## [3.31.0] - 2023-07-25
 
 ### Changed

compiler/flags/NAG_Fortran.cmake

@@ -13,6 +13,10 @@ set (EXTENDED_SOURCE "-132 -w=x95" )
 set (FIXED_SOURCE "-fixed")
 set (UNUSED_DUMMY "-w=uda")
 
+if (APPLE)
+  option (ESMF_HAS_ACHAR_BUG "ESMF Compatibility issue" ON)
+endif ()
+
 ####################################################
 
 # Common Fortran Flags