Support vertical regridding for same grid with different alignments (Task 3 and 4 of 8)

.circleci/config.yml

@@ -33,39 +33,43 @@ workflows:
             - docker-hub-creds
           matrix:
             parameters:
-              compiler: [ifort]
+              compiler: [gfortran, ifort, ifx]
               cmake_generator: ['Unix Makefiles']
               build_type: ['Debug']
           baselibs_version: *baselibs_version
           repo: MAPL
           mepodevelop: false
           run_unit_tests: true
           ctest_options: "-L 'ESSENTIAL' --output-on-failure"
-          persist_workspace: true # Needed for MAPL tutorials
+          persist_workspace: false # Needed for MAPL tutorials
 
-      # Run MAPL Tutorials
-      - ci/run_mapl_tutorial:
-          name: run-<< matrix.tutorial_name >>-Tutorial-with-<< matrix.compiler >>-built-with-<< matrix.build_type >>
-          context:
-            - docker-hub-creds
-          matrix:
-            parameters:
-              compiler: [ifort]
-              build_type: ['Debug']
-              tutorial_name:
-                - hello_world
-                - parent_no_children
-                - parent_one_child_import_via_extdata
-                - parent_one_child_no_imports
-                - parent_two_siblings_connect_import_export
-          # We will only run the tutorials with GNU make. No need to double up as Ninja is a build test only
-          requires:
-            - build-and-test-MAPL-as-<< matrix.build_type >>-on-<< matrix.compiler >>-using-Unix Makefiles
-          baselibs_version: *baselibs_version
+      # Tutorials have been removed (for now) from MAPL3
+      # NOTE: When we restore tutorials, change persist_workspace to true above!!!
+      ###################################################################################################################
+      # # Run MAPL Tutorials                                                                                            #
+      # - ci/run_mapl_tutorial:                                                                                         #
+      #     name: run-<< matrix.tutorial_name >>-Tutorial-with-<< matrix.compiler >>-built-with-<< matrix.build_type >> #
+      #     context:                                                                                                    #
+      #       - docker-hub-creds                                                                                        #
+      #     matrix:                                                                                                     #
+      #       parameters:                                                                                               #
+      #         compiler: [ifort]                                                                                       #
+      #         build_type: ['Debug']                                                                                   #
+      #         tutorial_name:                                                                                          #
+      #           - hello_world                                                                                         #
+      #           - parent_no_children                                                                                  #
+      #           - parent_one_child_import_via_extdata                                                                 #
+      #           - parent_one_child_no_imports                                                                         #
+      #           - parent_two_siblings_connect_import_export                                                           #
+      #     # We will only run the tutorials with GNU make. No need to double up as Ninja is a build test only          #
+      #     requires:                                                                                                   #
+      #       - 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)
+      # Builds MAPL without pFlogger and fargparse and pFUnit
       - ci/build:
-          name: build-UFS-MAPL-as-<< matrix.build_type >>-on-<< matrix.compiler >>
+          name: build-MAPL-without-pFlogger-and-fArgParse-and-pFUnit-as-<< matrix.build_type >>-on-<< matrix.compiler >>
           context:
             - docker-hub-creds
           matrix:
@@ -78,11 +82,13 @@ workflows:
           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"
+          extra_cmake_options: "-DBUILD_WITH_PFLOGGER=OFF -DBUILD_WITH_FARGPARSE=OFF"
           run_unit_tests: true
           ctest_options: "-L 'ESSENTIAL' --output-on-failure"
 
-  build-and-run-GEOSgcm:
+  # MAPL3 will soon break GEOSgcm builds. We believe it can build, but not currently run
+  #build-and-run-GEOSgcm:
+  build-GEOSgcm:
     jobs:
       # Build GEOSgcm
       - ci/build:
@@ -91,60 +97,71 @@ workflows:
             - docker-hub-creds
           matrix:
             parameters:
+              # ifx 2025.1 cannot build FMS, 2025.2 can, but fails with yafyaml
+              #compiler: [gfortran, ifort, ifx]
               compiler: [gfortran, ifort]
           baselibs_version: *baselibs_version
           repo: GEOSgcm
           checkout_fixture: true
-          mepodevelop: true
+          fixture_branch: release/MAPL-v3
+          mepodevelop: false
+          # MAPL3 GEOSgcm should have the right branches in its components.yaml
+          # so we do not need to checkout MAPL3 release branches
+          checkout_mapl3_release_branch: false
           checkout_mapl_branch: true
           persist_workspace: true # Needs to be true to run fv3/gcm experiment, costs extra, retained for one day
 
-      # Run GCM (1 hour, no ExtData)
-      - ci/run_gcm:
-          name: run-GCM-on-<< matrix.compiler >>
-          context:
-            - docker-hub-creds
-          matrix:
-            parameters:
-              compiler: [gfortran, ifort]
-          requires:
-            - build-GEOSgcm-on-<< matrix.compiler >>
-          repo: GEOSgcm
-          baselibs_version: *baselibs_version
-          bcs_version: *bcs_version
+      ######################################################
+      # # Run GCM (1 hour, no ExtData)                     #
+      # - ci/run_gcm:                                      #
+      #     name: run-GCM-on-<< matrix.compiler >>         #
+      #     context:                                       #
+      #       - docker-hub-creds                           #
+      #     matrix:                                        #
+      #       parameters:                                  #
+      #         compiler: [gfortran, ifort, ifx]           #
+      #     requires:                                      #
+      #       - build-GEOSgcm-on-<< matrix.compiler >>     #
+      #     repo: GEOSgcm                                  #
+      #     baselibs_version: *baselibs_version            #
+      #     bcs_version: *bcs_version                      #
+      #                                                    #
+      # # Run Coupled GCM (1 hour, no ExtData)             #
+      # - ci/run_gcm:                                      #
+      #     name: run-coupled-GCM-on-<< matrix.compiler >> #
+      #     context:                                       #
+      #       - docker-hub-creds                           #
+      #     matrix:                                        #
+      #       parameters:                                  #
+      #         compiler: [gfortran, ifort]                #
+      #     requires:                                      #
+      #       - build-GEOSgcm-on-<< matrix.compiler >>     #
+      #     repo: GEOSgcm                                  #
+      #     baselibs_version: *baselibs_version            #
+      #     bcs_version: *bcs_version                      #
+      #     gcm_ocean_type: MOM6                           #
+      #     change_layout: false                           #
+      ######################################################
 
-      # Run Coupled GCM (1 hour, no ExtData)
-      - ci/run_gcm:
-          name: run-coupled-GCM-on-<< matrix.compiler >>
-          context:
-            - docker-hub-creds
-          matrix:
-            parameters:
-              compiler: [ifort]
-          requires:
-            - build-GEOSgcm-on-<< matrix.compiler >>
-          repo: GEOSgcm
-          baselibs_version: *baselibs_version
-          bcs_version: *bcs_version
-          gcm_ocean_type: MOM6
-          change_layout: false
-
-  build-GEOSldas:
-    jobs:
-      # Build GEOSldas
-      - ci/build:
-          name: build-GEOSldas-on-<< matrix.compiler >>
-          context:
-            - docker-hub-creds
-          matrix:
-            parameters:
-              compiler: [gfortran, ifort]
-          baselibs_version: *baselibs_version
-          repo: GEOSldas
-          mepodevelop: false
-          checkout_fixture: true
-          fixture_branch: develop
-          checkout_mapl_branch: true
+  #########################################################
+  # build-GEOSldas:                                       #
+  #   jobs:                                               #
+  #     # Build GEOSldas                                  #
+  #     - ci/build:                                       #
+  #         name: build-GEOSldas-on-<< matrix.compiler >> #
+  #         context:                                      #
+  #           - docker-hub-creds                          #
+  #         matrix:                                       #
+  #           parameters:                                 #
+  #             compiler: [gfortran, ifort]               #
+  #         baselibs_version: *baselibs_version           #
+  #         repo: GEOSldas                                #
+  #         mepodevelop: false                            #
+  #         checkout_fixture: true                        #
+  #         fixture_branch: release/MAPL-v3               #
+  #         checkout_mapl3_release_branch: false          #
+  #         checkout_mapl_branch: true                    #
+  #########################################################
 
   ######################################################################
   # build-GEOSadas:                                                    #
@@ -161,7 +178,8 @@ workflows:
   #         baselibs_version: *baselibs_version                        #
   #         repo: GEOSadas                                             #
   #         checkout_fixture: true                                     #
-  #         fixture_branch: feature/mathomp4/mapldevelop               #
+  #         fixture_branch: release/MAPL-v3                            #
+  #         checkout_mapl3_release_branch: false                       #
   #         checkout_mapl_branch: true                                 #
   #         mepodevelop: false                                         #
   #         rebuild_procs: 4                                           #

.github/workflows/changelog-enforcer.yml

@@ -7,6 +7,9 @@ jobs:
   # Enforces the update of a changelog file on every pull request
   changelog:
     runs-on: ubuntu-latest
+    # We only want to run this job if the base_ref of the PR is *NOT*
+    # release/MAPL-v3
+    if: "!startsWith(github.base_ref, 'release/MAPL-v3')"
     steps:
     - uses: dangoslen/changelog-enforcer@v3
       with:

.github/workflows/mapl3docs.yml

@@ -0,0 +1,54 @@
+name: mapl3docs
+
+on:
+  push:
+    branches:
+      - release/MAPL-v3
+  workflow_dispatch:
+
+permissions:
+  contents: write
+
+jobs:
+  build-and-deploy-mapl3-docs:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          filter: blob:none
+
+      - name: Build and Deploy Dev 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: mapl3docs-with-remote-esmf.md
+          doc-folder: docs/Ford/mapl3-doc
+          target-folder: mapl3-doc
+          deploy-token: ${{ secrets.DOCS_DEPLOY_PAT }}
+
+  ##############################################################################
+  # build-and-deploy-mapl3-dev-docs:                                           #
+  #   runs-on: ubuntu-latest                                                   #
+  #   steps:                                                                   #
+  #     - name: Checkout                                                       #
+  #       uses: actions/checkout@v4                                            #
+  #       with:                                                                #
+  #         fetch-depth: 0                                                     #
+  #         filter: blob:none                                                  #
+  #                                                                            #
+  #     - name: Build and Deploy Dev 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: mapl3docs-with-remote-esmf.public_private_protected.md #
+  #         doc-folder: docs/Ford/mapl3-dev-doc                                #
+  #         target-folder: mapl3-dev-doc                                       #
+  #         deploy-token: ${{ secrets.DOCS_DEPLOY_PAT }}                       #
+  ##############################################################################

.github/workflows/spack-ci.yml

@@ -36,3 +36,4 @@ jobs:
       use-esmf-develop: ${{ matrix.use-esmf-develop }}
       run-tests: ${{ matrix.run-tests }}
       run-mepo-develop: false
+      patch-esmf: true

.github/workflows/workflow.yml

@@ -101,7 +101,7 @@ jobs:
       fail-fast: false
       matrix:
         cmake-build-type: [Debug, Release]
-        cmake-generator: [Unix Makefiles]
+        cmake-generator: [Unix Makefiles, Ninja]
     steps:
       - name: Checkout
         uses: actions/checkout@v6
@@ -151,3 +151,5 @@ jobs:
       compiler: ${{ matrix.compiler }}
       cmake-build-type: ${{ matrix.build-type }}
       fixture-repo: GEOS-ESM/GEOSgcm
+      fixture-ref: release/MAPL-v3
+      run-mepo-develop: false

.gitignore

@@ -19,6 +19,9 @@ CMakeUserPresets.json
 # If you build with spack libraries, you can get spack log files
 spack*.log
 
+# Nightly tests have log.* files
+log.*
+
 *.swp
 *.swo
 .DS_Store
@@ -28,6 +31,11 @@ spack*.log
 
 /gFTL/
 
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
 *.mod
 
 *.log