Merge pull request #3394 from GEOS-ESM/develop

GitFlow: Merge develop into main for 2.54 Release

.circleci/config.yml

@@ -16,7 +16,7 @@ parameters:
 
 # Anchors to prevent forgetting to update a version
 os_version: &os_version ubuntu24
-baselibs_version: &baselibs_version v7.29.0
+baselibs_version: &baselibs_version v7.31.0
 bcs_version: &bcs_version v11.6.0
 tag_build_arg_name: &tag_build_arg_name maplversion
 

.github/workflows/workflow.yml

@@ -38,7 +38,7 @@ jobs:
     name: Build and Test MAPL GNU
     runs-on: ubuntu-latest
     container:
-      image: gmao/ubuntu24-geos-env-mkl:v7.29.0-openmpi_5.0.5-gcc_14.2.0
+      image: gmao/ubuntu24-geos-env-mkl:v7.31.0-openmpi_5.0.5-gcc_14.2.0
       # Per https://github.com/actions/virtual-environments/issues/1445#issuecomment-713861495
       # It seems like we might not need secrets on GitHub Actions which is good for forked
       # pull requests
@@ -89,7 +89,7 @@ jobs:
     name: Build and Test MAPL Intel
     runs-on: ubuntu-latest
     container:
-      image: gmao/ubuntu24-geos-env:v7.29.0-intelmpi_2021.13-ifort_2021.13
+      image: gmao/ubuntu24-geos-env:v7.31.0-intelmpi_2021.13-ifort_2021.13
       # Per https://github.com/actions/virtual-environments/issues/1445#issuecomment-713861495
       # It seems like we might not need secrets on GitHub Actions which is good for forked
       # pull requests

Apps/MAPL_GridCompSpecs_ACG.py

@@ -200,6 +200,7 @@ def get_mandatory_options(cls):
         'VLOCATION': ('vlocation', VLOCATION_EMIT),
         'VLOC': ('vlocation', VLOCATION_EMIT),
 # these are Options that are not output but used to write 
+        'ALIAS': ('alias', identity_emit, False, False),
         'CONDITION': ('condition', identity_emit, False, False),
         'COND': ('condition', identity_emit, False, False),
         'ALLOC': ('alloc', identity_emit, False, False),
@@ -463,6 +464,7 @@ def digest(specs, args):
         for spec in specs[category]: # spec from list
             dims = None
             ungridded = None
+            alias = None
             option_values = dict() # dict of option values
             for column in spec: # for spec emit value
                 column_value = spec[column]
@@ -480,6 +482,10 @@ def digest(specs, args):
                     dims = option_value
                 elif option == Option.UNGRIDDED:
                     ungridded = option_value
+                elif option == Option.ALIAS:
+                    alias = Option.ALIAS(column_value)
+            if alias:
+                option_values[Option.INTERNAL_NAME] = alias
 # MANDATORY
             for option in mandatory_options:
                 if option not in option_values:

CHANGELOG.md

@@ -17,6 +17,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Deprecated
 
+## [2.54.0] - 2025-02-07
+
+### Changed
+
+- Add column for ACG (ALIAS) that set the pointer variable to a different name than the `short_name`
+- Updated CI to use Baselibs 7.31.0
+  - Updates to GFE v1.18.0
+
 ## [2.53.1] - 2025-01-29
 
 ### Fixed

CMakeLists.txt

@@ -8,7 +8,7 @@ endif ()
 
 project (
   MAPL
-  VERSION 2.53.1
+  VERSION 2.54.0
   LANGUAGES Fortran CXX C)  # Note - CXX is required for ESMF
 
 # Set the possible values of build type for cmake-gui