Hand-merge v2.47.1

.circleci/config.yml

@@ -17,7 +17,7 @@ parameters:
 # Anchors to prevent forgetting to update a version
 os_version: &os_version ubuntu20
 baselibs_version: &baselibs_version v7.23.0
-bcs_version: &bcs_version v11.3.0
+bcs_version: &bcs_version v11.5.0
 tag_build_arg_name: &tag_build_arg_name maplversion
 
 orbs:
@@ -33,7 +33,7 @@ workflows:
             - docker-hub-creds
           matrix:
             parameters:
-              compiler: [gfortran,ifort]
+              compiler: [gfortran, ifort]
               cmake_generator: ['Unix Makefiles','Ninja']
           baselibs_version: *baselibs_version
           repo: MAPL
@@ -49,15 +49,16 @@ workflows:
             - docker-hub-creds
           matrix:
             parameters:
-              compiler: [ifort]
+              compiler: [gfortran, ifort]
           baselibs_version: *baselibs_version
           repo: MAPL
           mepodevelop: false
           remove_flap: true
           remove_pflogger: 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"
+          # ExtData1G tests were removed from ESSENTIAL, so we run them separately here as UFS might still use 1G?
+          ctest_options: "-L 'ESSENTIAL|EXTDATA1G_SMALL_TESTS' --output-on-failure"
 
       # Run MAPL Tutorials
       - ci/run_mapl_tutorial:
@@ -161,7 +162,6 @@ workflows:
           checkout_mapl_branch: true
           mepodevelop: false
           rebuild_procs: 1
-          extra_cmake_options: "-DBUILD_WITH_FLAP=ON"
 
   build-and-publish-docker:
     when:
@@ -196,8 +196,8 @@ workflows:
           baselibs_version: *baselibs_version
           container_name: mapl
           mpi_name: openmpi
-          mpi_version: 5.0.0
+          mpi_version: 5.0.2
           compiler_name: gcc
-          compiler_version: 12.1.0
+          compiler_version: 13.2.0
           image_name: geos-env-mkl
           tag_build_arg_name: *tag_build_arg_name

.github/actions/deploy-ford-docs/action.yml

@@ -61,12 +61,14 @@ runs:
       shell: bash
 
     - name: Build Documentation
-      run: ford ${{ inputs.ford-input }}
+      run: |
+        cd docs/Ford
+        ford ${{ inputs.ford-input }}
       shell: bash
 
     - name: Deploy Pages
       uses: JamesIves/github-pages-deploy-action@v4
-      if: github.event_name == 'push' && github.repository == 'GEOS-ESM/MAPL' && ( startsWith( github.ref, 'refs/tags/v' ) || github.ref == 'refs/heads/main' )
+      if: github.event_name == 'push' && github.repository == 'GEOS-ESM/MAPL' && ( startsWith( github.ref, 'refs/tags/v' ) || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/release/MAPL-v3' )
       with:
         folder: ${{ inputs.doc-folder }}
         token: ${{ inputs.token }}

.github/workflows/docs.yml

@@ -21,7 +21,11 @@ jobs:
       - name: Build and Deploy Docs
         uses: ./.github/actions/deploy-ford-docs
         with:
-          ford-input: docs/Ford/docs-with-remote-esmf.md
+          # Due to a bug in ford, for now we do *not* want to use
+          # the full path to the ford input file. Rather, the
+          # action will cd into docs/Ford and then run ford
+          # relative path to the ford input file.
+          ford-input: docs-with-remote-esmf.md
           doc-folder: docs/Ford/doc
           token: ${{ secrets.GITHUB_TOKEN }}
 
@@ -34,7 +38,11 @@ jobs:
       - name: Build and Deploy Dev Docs
         uses: ./.github/actions/deploy-ford-docs
         with:
-          ford-input: docs/Ford/docs-with-remote-esmf.public_private_protected.md
+          # Due to a bug in ford, for now we do *not* want to use
+          # the full path to the ford input file. Rather, the
+          # action will cd into docs/Ford and then run ford
+          # relative path to the ford input file.
+          ford-input: docs-with-remote-esmf.public_private_protected.md
           doc-folder: docs/Ford/dev-doc
           token: ${{ secrets.GITHUB_TOKEN }}
           target-folder: dev-doc

.github/workflows/workflow.yml

@@ -13,11 +13,29 @@ on:
       - ".editorconfig"
 
 jobs:
+  check-ford-docs:
+    name: Build Ford Docs
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Build and Deploy Docs
+        uses: ./.github/actions/deploy-ford-docs
+        with:
+          # Due to a bug in ford, for now we do *not* want to use
+          # the full path to the ford input file. Rather, the
+          # action will cd into docs/Ford and then run ford
+          # relative path to the ford input file.
+          ford-input: ford-ci.md
+          doc-folder: docs/Ford/ci-doc
+          token: ${{ secrets.GITHUB_TOKEN }}
+
   build_test_mapl:
     name: Build and Test MAPL GNU
     runs-on: ubuntu-latest
     container:
-      image: gmao/ubuntu20-geos-env-mkl:v7.23.0-openmpi_5.0.0-gcc_12.1.0
+      image: gmao/ubuntu20-geos-env-mkl:v7.24.0-openmpi_5.0.2-gcc_13.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
@@ -68,7 +86,7 @@ jobs:
     name: Build and Test MAPL Intel
     runs-on: ubuntu-latest
     container:
-      image: gmao/ubuntu20-geos-env:v7.23.0-intelmpi_2021.6.0-intel_2022.1.0
+      image: gmao/ubuntu20-geos-env:v7.24.0-intelmpi_2021.6.0-intel_2022.1.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

.gitignore

@@ -10,8 +10,13 @@
 CMakeUserPresets.json
 
 # Ignore possible symlinked build and install directories
-build-*
-install-*
+# Note: we can't use a / at the end because they might be
+# symlink to a directory
+build*
+install*
+
+# If you build with spack libraries, you can get spack log files
+spack*.log
 
 *.swp
 *.swo