Merge branch 'develop' into release/MAPL-v3

Author: mathomp4

.circleci/config.yml

@@ -1,11 +1,11 @@
 version: 2.1
 
 # Anchors in case we need to override the defaults from the orb
-#baselibs_version: &baselibs_version v7.17.0
-#bcs_version: &bcs_version v11.4.0
+#baselibs_version: &baselibs_version v7.33.0
+#bcs_version: &bcs_version v11.6.0
 
 orbs:
-  ci: geos-esm/circleci-tools@2
+  ci: geos-esm/circleci-tools@4
 
 workflows:
   build-test:

.github/workflows/workflow.yml

@@ -22,7 +22,7 @@ jobs:
     if: "!contains(github.event.pull_request.labels.*.name, '0 diff trivial')"
     runs-on: ubuntu-24.04
     container:
-      image: gmao/ubuntu24-geos-env:v7.32.0-intelmpi_2021.13-ifort_2021.13
+      image: gmao/ubuntu24-geos-env:v7.33.0-intelmpi_2021.13-ifort_2021.13
 
     env:
       OMPI_ALLOW_RUN_AS_ROOT: 1
@@ -56,9 +56,11 @@ jobs:
           mepo clone --partial blobless
           mepo status
 
+      - name: Debug PR branch
+        run: echo "PR is coming from ${{ github.event.pull_request.head.ref }}"
+
       - name: Update other branches
-        if:
-          "!contains('refs/heads/main,refs/heads/develop', github.ref)"
+        if: ${{ github.event.pull_request.head.ref != 'main' && github.event.pull_request.head.ref != 'develop' }}
         run: |
           mepo checkout-if-exists ${GITHUB_HEAD_REF}
           mepo status
@@ -78,7 +80,7 @@ jobs:
     if: "!contains(github.event.pull_request.labels.*.name, '0 diff trivial')"
     runs-on: ubuntu-24.04
     container:
-      image: gmao/ubuntu24-geos-env-mkl:v7.32.0-openmpi_5.0.5-gcc_14.2.0
+      image: gmao/ubuntu24-geos-env-mkl:v7.33.0-openmpi_5.0.5-gcc_14.2.0
 
     env:
       OMPI_ALLOW_RUN_AS_ROOT: 1
@@ -112,9 +114,11 @@ jobs:
           mepo clone --partial blobless
           mepo status
 
+      - name: Debug PR branch
+        run: echo "PR is coming from ${{ github.event.pull_request.head.ref }}"
+
       - name: Update other branches
-        if:
-          "!contains('refs/heads/main,refs/heads/develop', github.ref)"
+        if: ${{ github.event.pull_request.head.ref != 'main' && github.event.pull_request.head.ref != 'develop' }}
         run: |
           mepo checkout-if-exists ${GITHUB_HEAD_REF}
           mepo status

CHANGELOG.md

@@ -11,10 +11,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- Added functionality for model-based QC of MODIS SCF observations using soil layer 1 temperature.
-- Added functionality to simulate landice tiles.
-- Added functionality to read nc4-formatted tile file.
-
 ### Changed
 
 ### Fixed
@@ -25,6 +21,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 -----------------------------
 
+## [v3.0.0] - 2025-05-28
+
+- 0-diff vs. v2.0.0.
+
+### Added
+
+- Added functionality to simulate landice tiles ([PR #18](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/18)).
+- Added functionality to read nc4-formatted tile file ([PR #18](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/18)).
+- Added model-based QC of (MODIS) snow cover area fraction observations using layer-1 soil temperature ([PR #96](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/96)).
+- Added default settings and command line args for coupled land-atm DAS ([PR #94](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/94)).
+
+------------------------------
+
 ## [v2.0.0] - 2025-04-15
 
 - 0-diff vs. v1.1.0.