GitFlow: Merge release/v2 into main for release (#4936)

* check before assign tilelons and tilelats in MAPL_Locstreamget when built by gfortran (#4901)

Co-authored-by: Matt Thompson <matthew.thompson@nasa.gov>

* v2: Prepare for 2.69.1 release (#4935)

* v2: Try and fix up CI (#4937)

---------

Co-authored-by: Weiyuan Jiang <52509753+weiyuan-jiang@users.noreply.github.com>

Author: mathomp4

.circleci/config.yml

@@ -63,25 +63,6 @@ workflows:
             - build-and-test-MAPL-as-<< matrix.build_type >>-on-<< matrix.compiler >>-using-Unix Makefiles
           baselibs_version: *baselibs_version
 
-      # Builds MAPL like UFS does (no pFlogger, fargparse, pfunit, static)
-      - ci/build:
-          name: build-UFS-MAPL-as-<< matrix.build_type >>-on-<< matrix.compiler >>
-          context:
-            - docker-hub-creds
-          matrix:
-            parameters:
-              compiler: [ifort]
-              build_type: ['Debug']
-          baselibs_version: *baselibs_version
-          repo: MAPL
-          mepodevelop: false
-          remove_flap: true
-          remove_pflogger: true
-          remove_pfunit: true
-          extra_cmake_options: "-DBUILD_WITH_FLAP=OFF -DBUILD_WITH_PFLOGGER=OFF -DBUILD_WITH_FARGPARSE=OFF -DUSE_EXTDATA2G=OFF -DBUILD_SHARED_MAPL=OFF"
-          run_unit_tests: true
-          ctest_options: "-L 'ESSENTIAL' --output-on-failure"
-
   build-and-run-GEOSgcm:
     jobs:
       # Build GEOSgcm

.github/actions/ci-build-and-test-mapl/action.yml

@@ -15,6 +15,10 @@ inputs:
   extra-cmake-args:
     description: "Extra CMake arguments"
     required: false
+  skip-tests:
+    description: "Skip running tests (useful when test frameworks are disabled)"
+    required: false
+    default: "false"
 
 runs:
   using: "composite"
@@ -55,6 +59,7 @@ runs:
         cmake --install build
 
     - name: Run MAPL Tests
+      if: inputs.skip-tests != 'true'
       shell: bash
       run: |
         cmake --build build --target build-tests --parallel 4

.github/workflows/enforce-labels.yml

@@ -10,7 +10,7 @@ concurrency:
 
 jobs:
   require-label:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
     steps:
       - uses: mheap/github-action-required-labels@v5
         env:
@@ -23,7 +23,7 @@ jobs:
           message: "This PR is being prevented from merging because you have not added one of our required labels: {{ provided }}. Please add one so that the PR can be merged."
 
   blocking-label:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
     steps:
       - uses: mheap/github-action-required-labels@v5
         env:

.github/workflows/workflow.yml

@@ -41,7 +41,7 @@ jobs:
           doc-folder: docs/Ford/ci-doc
           deploy-token: ${{ secrets.DOCS_DEPLOY_PAT }}
 
-  build_test_mapl_gnu:
+  build_test_mapl_gnu14:
     name: gfortran / ${{ matrix.cmake-build-type }} / ${{ matrix.cmake-generator }}
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
@@ -151,12 +151,34 @@ jobs:
           cmake-generator: ${{ matrix.cmake-generator }}
           fortran-compiler: ifx
 
+  build_test_mapl_ifort_no_optional:
+    name: ifort / Debug / no pFlogger+fArgParse+pFUnit
+    if: github.event.pull_request.draft == false
+    runs-on: ubuntu-latest
+    container:
+      image: gmao/ubuntu24-geos-env:v8.27.0-intelmpi_2021.13-ifort_2021.13
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 1
+          filter: blob:none
+
+      - name: Build MAPL without optional packages
+        uses: ./.github/actions/ci-build-and-test-mapl
+        with:
+          cmake-build-type: Debug
+          cmake-generator: Unix Makefiles
+          fortran-compiler: ifort
+          extra-cmake-args: -DBUILD_WITH_PFLOGGER=OFF -DBUILD_WITH_FARGPARSE=OFF -DBUILD_WITH_PFUNIT=OFF
+          skip-tests: "true"
+
   build_gcm:
     if: github.event.pull_request.draft == false
     strategy:
       fail-fast: false
       matrix:
-        compiler: [ifort, gfortran-14, gfortran-15]
+        compiler: [ifort, ifx, gfortran-14, gfortran-15]
         build-type: [Debug]
     uses: GEOS-ESM/CI-workflows/.github/workflows/geosgcm_build_tests.yml@project/geosgcm
     with:

CHANGELOG.md

@@ -17,6 +17,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Deprecated
 
+## [2.69.1] - 2026-05-19
+
+### Fixed
+
+- Check before assigning tilelons and tilelats in `MAPL_Locstreamget`
+
 ## [2.69.0] - 2026-05-15
 
 ### Fixed

CMakeLists.txt

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

base/MAPL_LocStreamMod.F90

@@ -252,23 +252,29 @@ subroutine MAPL_LocStreamGet(LocStream, NT_LOCAL, nt_global, TILETYPE, TILEKIND,
 !     to make sure this works.
     if (present(tilelons)) then
 #ifdef __GFORTRAN__
-       allocate(tmp_rptr(lbound(locstream%Ptr%Local_GeoLocation,1):ubound(locstream%Ptr%Local_GeoLocation,1)))
-       do i = lbound(locstream%Ptr%Local_GeoLocation,1), ubound(locstream%Ptr%Local_GeoLocation,1)
-         tmp_rptr(i) = locstream%Ptr%Local_GeoLocation(i)%x
-       enddo
-       tilelons => tmp_rptr
+       tilelons => null()
+       if (associated(locstream%Ptr%Local_GeoLocation)) then
+          allocate(tmp_rptr(lbound(locstream%Ptr%Local_GeoLocation,1):ubound(locstream%Ptr%Local_GeoLocation,1)))
+          do i = lbound(locstream%Ptr%Local_GeoLocation,1), ubound(locstream%Ptr%Local_GeoLocation,1)
+             tmp_rptr(i) = locstream%Ptr%Local_GeoLocation(i)%x
+          enddo
+          tilelons => tmp_rptr
+       endif
 #else
        tilelons => locstream%Ptr%Local_GeoLocation(:)%x
 #endif
     end if
 
     if (present(tilelats)) then
 #ifdef __GFORTRAN__
-       allocate(tmp_rptr(lbound(locstream%Ptr%Local_GeoLocation,1):ubound(locstream%Ptr%Local_GeoLocation,1)))
-       do i = lbound(locstream%Ptr%Local_GeoLocation,1), ubound(locstream%Ptr%Local_GeoLocation,1)
-         tmp_rptr(i) = locstream%Ptr%Local_GeoLocation(i)%y
-       enddo
-       tilelats => tmp_rptr
+       tilelats => null()
+       if (associated(locstream%Ptr%Local_GeoLocation)) then
+          allocate(tmp_rptr(lbound(locstream%Ptr%Local_GeoLocation,1):ubound(locstream%Ptr%Local_GeoLocation,1)))
+          do i = lbound(locstream%Ptr%Local_GeoLocation,1), ubound(locstream%Ptr%Local_GeoLocation,1)
+            tmp_rptr(i) = locstream%Ptr%Local_GeoLocation(i)%y
+          enddo
+          tilelats => tmp_rptr
+       endif
 #else
        tilelats => locstream%Ptr%Local_GeoLocation(:)%y
 #endif