Merge branch 'develop' into feature/zhaobin74/support-cice6-rewind

Author: mathomp4

.circleci/config.yml

@@ -16,12 +16,12 @@ parameters:
 
 # Anchors to prevent forgetting to update a version
 os_version: &os_version ubuntu20
-baselibs_version: &baselibs_version v7.25.0
-bcs_version: &bcs_version v11.5.0
+baselibs_version: &baselibs_version v7.27.0
+bcs_version: &bcs_version v11.6.0
 tag_build_arg_name: &tag_build_arg_name maplversion
 
 orbs:
-  ci: geos-esm/circleci-tools@2
+  ci: geos-esm/circleci-tools@4
 
 workflows:
   build-and-test-MAPL:
@@ -33,7 +33,7 @@ workflows:
             - docker-hub-creds
           matrix:
             parameters:
-              compiler: [gfortran, ifort]
+              compiler: [gfortran, ifort, ifx]
               cmake_generator: ['Unix Makefiles','Ninja']
           baselibs_version: *baselibs_version
           repo: MAPL
@@ -49,7 +49,7 @@ workflows:
             - docker-hub-creds
           matrix:
             parameters:
-              compiler: [gfortran, ifort]
+              compiler: [gfortran, ifort, ifx]
           baselibs_version: *baselibs_version
           repo: MAPL
           mepodevelop: false
@@ -60,14 +60,29 @@ workflows:
           # 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"
 
+      # Builds MAPL without pFUnit support
+      - ci/build:
+          name: build-MAPL-without-pFUnit-on-<< matrix.compiler >>
+          context:
+            - docker-hub-creds
+          matrix:
+            parameters:
+              compiler: [ifort, ifx]
+          baselibs_version: *baselibs_version
+          repo: MAPL
+          mepodevelop: false
+          remove_pfunit: true
+          run_unit_tests: true
+          ctest_options: "-L 'ESSENTIAL' --output-on-failure"
+
       # Run MAPL Tutorials
       - ci/run_mapl_tutorial:
           name: run-<< matrix.tutorial_name >>-Tutorial-with-<< matrix.compiler >>
           context:
             - docker-hub-creds
           matrix:
             parameters:
-              compiler: [gfortran, ifort]
+              compiler: [gfortran, ifort, ifx]
               tutorial_name:
                 - hello_world
                 - parent_no_children
@@ -89,7 +104,7 @@ workflows:
             - docker-hub-creds
           matrix:
             parameters:
-              compiler: [gfortran, ifort]
+              compiler: [gfortran, ifort, ifx]
           baselibs_version: *baselibs_version
           repo: GEOSgcm
           checkout_fixture: true
@@ -104,7 +119,7 @@ workflows:
             - docker-hub-creds
           matrix:
             parameters:
-              compiler: [gfortran, ifort]
+              compiler: [gfortran, ifort, ifx]
           requires:
             - build-GEOSgcm-on-<< matrix.compiler >>
           repo: GEOSgcm
@@ -136,7 +151,7 @@ workflows:
             - docker-hub-creds
           matrix:
             parameters:
-              compiler: [gfortran,ifort]
+              compiler: [gfortran, ifort]
           baselibs_version: *baselibs_version
           repo: GEOSldas
           mepodevelop: false
@@ -161,7 +176,8 @@ workflows:
           fixture_branch: feature/mathomp4/mapldevelop
           checkout_mapl_branch: true
           mepodevelop: false
-          rebuild_procs: 1
+          rebuild_procs: 4
+          build_type: Release
 
   build-and-publish-docker:
     when:
@@ -171,7 +187,7 @@ workflows:
           filters:
             tags:
               only: /^v.*$/
-          name: publish-intel-docker-image
+          name: publish-ifort-docker-image
           context:
             - docker-hub-creds
             - ghcr-creds
@@ -180,8 +196,25 @@ workflows:
           container_name: mapl
           mpi_name: intelmpi
           mpi_version: "2021.13"
-          compiler_name: intel
-          compiler_version: "2024.2"
+          compiler_name: ifort
+          compiler_version: "2021.13"
+          image_name: geos-env
+          tag_build_arg_name: *tag_build_arg_name
+      - ci/publish_docker:
+          filters:
+            tags:
+              only: /^v.*$/
+          name: publish-ifx-docker-image
+          context:
+            - docker-hub-creds
+            - ghcr-creds
+          os_version: *os_version
+          baselibs_version: *baselibs_version
+          container_name: mapl
+          mpi_name: intelmpi
+          mpi_version: "2021.14"
+          compiler_name: ifx
+          compiler_version: "2025.0"
           image_name: geos-env
           tag_build_arg_name: *tag_build_arg_name
       - ci/publish_docker:
@@ -196,8 +229,8 @@ workflows:
           baselibs_version: *baselibs_version
           container_name: mapl
           mpi_name: openmpi
-          mpi_version: 5.0.2
+          mpi_version: 5.0.5
           compiler_name: gcc
-          compiler_version: 13.2.0
+          compiler_version: 14.2.0
           image_name: geos-env-mkl
           tag_build_arg_name: *tag_build_arg_name

.github/stale.yml

@@ -0,0 +1,51 @@
+# Based on examples from the stale action site:
+# https://github.com/actions/stale
+
+name: 'Close stale issues and PR'
+on:
+  schedule:
+    - cron: '30 1 * * *'
+
+permissions:
+  contents: read
+  issues: write
+  pull-requests: write
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v9
+        with:
+          days-before-issue-stale: 60
+          stale-issue-message: >
+            This issue has been automatically marked as stale because it
+            has not had activity in the last 60 days. If there are no
+            updates within 7 days, it will be closed.  You can add the
+            ":hourglass: Long Term" label to prevent the stale action
+            from closing this issue.
+          days-before-issue-close: 7
+          close-issue-message: >
+            This issue was closed because it has been stalled for 7 days with no activity.
+            You can reopen this issue if you are still working on it.
+          stale-issue-label: ':snowflake: Stale'
+          exempt-issue-labels: ':hourglass: Long Term,:exclamation: High Priority'
+
+          days-before-pr-stale: 60
+          stale-pr-message: >
+            This PR has been automatically marked as stale because it
+            has not had activity in the last 60 days. If there are no
+            updates within 7 days, it will be closed.  You can add the
+            ":hourglass: Long Term" label to prevent the stale action
+            from closing this issue.
+          days-before-pr-close: 30
+          close-pr-message: >
+            This PR was closed because it has been stalled for 30 days with no activity.
+            You can reopen this PR if you are still working on it.
+          stale-pr-label: ':snowflake: Stale'
+          exempt-pr-labels: ':hourglass: Long Term,:exclamation: High Priority'
+
+          labels-to-remove-when-unstale: ':snowflake: Stale'
+          remove-stale-when-updated: true
+
+

.github/workflows/cron-stale.yml

@@ -14,16 +14,20 @@ jobs:
         with:
           path: ${{ github.event.repository.name }}-${{ github.event.release.tag_name }}
 
-      - name: Checkout mepo
-        uses: actions/checkout@v4
+      - name: Setup Python
+        uses: actions/setup-python@v5
         with:
-          repository: GEOS-ESM/mepo
-          path: mepo
+          python-version: '3.11'
+
+      - name: Pip install mepo
+        run: |
+          python -m pip install --upgrade pip
+          pip install mepo
 
       - name: Run mepo
         run : |
           cd ${GITHUB_WORKSPACE}/${{ github.event.repository.name }}-${{ github.event.release.tag_name }}
-          ${GITHUB_WORKSPACE}/mepo/mepo clone
+          mepo clone
 
       - name: Create tarball
         run: |

.github/workflows/release-tarball.yml

@@ -35,7 +35,7 @@ jobs:
     name: Build and Test MAPL GNU
     runs-on: ubuntu-latest
     container:
-      image: gmao/ubuntu20-geos-env-mkl:v7.25.0-openmpi_5.0.2-gcc_13.2.0
+      image: gmao/ubuntu20-geos-env-mkl:v7.27.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
@@ -86,7 +86,7 @@ jobs:
     name: Build and Test MAPL Intel
     runs-on: ubuntu-latest
     container:
-      image: gmao/ubuntu20-geos-env:v7.25.0-intelmpi_2021.13-intel_2024.2
+      image: gmao/ubuntu20-geos-env:v7.27.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

.github/workflows/workflow.yml

@@ -26,6 +26,7 @@ module regrid_util_support_mod
       integer :: deflate, shave
       integer :: quantize_algorithm
       integer :: quantize_level
+      integer :: zstandard_level
       logical :: use_weights
    contains
       procedure :: create_grid
@@ -98,6 +99,7 @@ subroutine process_command_line(this,rc)
     this%deflate=0
     this%quantize_algorithm=0
     this%quantize_level=0
+    this%zstandard_level=0
     this%use_weights = .false.
     nargs = command_argument_count()
     do i=1,nargs
@@ -161,6 +163,9 @@ subroutine process_command_line(this,rc)
       case('-quantize_level')
          call get_command_argument(i+1,astr)
          read(astr,*)this%quantize_level
+      case('-zstandard_level')
+         call get_command_argument(i+1,astr)
+         read(astr,*)this%zstandard_level
       case('-file_weights')
          this%use_weights = .true.
       case('--help')
@@ -432,7 +437,7 @@ subroutine main()
 
          call ESMF_ClockSet(clock,currtime=time,_RC)
          if (.not. writer_created) then
-            call newWriter%create_from_bundle(bundle,clock,n_steps=tsteps,time_interval=tint,nbits_to_keep=support%shave,deflate=support%deflate,vertical_data=vertical_data,quantize_algorithm=support%quantize_algorithm,quantize_level=support%quantize_level,_RC)
+            call newWriter%create_from_bundle(bundle,clock,n_steps=tsteps,time_interval=tint,nbits_to_keep=support%shave,deflate=support%deflate,vertical_data=vertical_data,quantize_algorithm=support%quantize_algorithm,quantize_level=support%quantize_level,zstandard_level=support%zstandard_level,_RC)
             writer_created=.true.
          end if