Merge develop into main in preparation for release v4.0.0

.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.33.0
-#bcs_version: &bcs_version v11.6.0
+#baselibs_version: &baselibs_version v8.32.0
+#bcs_version: &bcs_version v12.6.0
 
 orbs:
-  ci: geos-esm/circleci-tools@4
+  ci: geos-esm/circleci-tools@5
 
 workflows:
   build-test:
@@ -17,11 +17,9 @@ workflows:
             - docker-hub-creds
           matrix:
             parameters:
-              compiler: [ifort, gfortran]
+              compiler: [ifort, gfortran, ifx]
           #baselibs_version: *baselibs_version
           repo: GEOSldas
           checkout_fixture: true
           mepodevelop: false
-          # This is needed due to the LDAS BRIDGE workflow
-          checkout_if_exists: false
           persist_workspace: false # Needs to be true to run fv3/gcm experiment, costs extra

.github/workflows/push-to-develop.yml

@@ -8,14 +8,15 @@ on:
 jobs:
   pull_request:
     name: Create Pull Request
+    if: github.repository_owner == 'GEOS-ESM'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
         with:
           fetch-depth: 0
       - name: Run the action
-        uses: devops-infra/action-pull-request@v0.5.5
+        uses: devops-infra/action-pull-request@v1
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           source_branch: develop

.github/workflows/validate_yaml_files.yml

@@ -15,7 +15,7 @@ jobs:
   validate-YAML:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
       - id: yaml-lint
         name: yaml-lint
         uses: ibiqlik/action-yamllint@v3
@@ -24,7 +24,7 @@ jobs:
           format: colored
           config_file: .yamllint.yml
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         if: always()
         with:
           name: yamllint-logfile

.github/workflows/workflow.yml

@@ -11,123 +11,36 @@ on:
       - "**.perl"
       - ".github/CODEOWNERS"
       - ".circleci/config.yml"
+  workflow_dispatch:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/develop' }}
 
 jobs:
-  build_ldas_ifort:
-    name: Build GEOSldas with ifort
-    if: "!contains(github.event.pull_request.labels.*.name, '0 diff trivial')"
-    runs-on: ubuntu-24.04
-    container:
-      image: gmao/ubuntu24-geos-env:v7.33.0-intelmpi_2021.13-ifort_2021.13
-
-    env:
-      OMPI_ALLOW_RUN_AS_ROOT: 1
-      OMPI_ALLOW_RUN_AS_ROOT_CONFIRM: 1
-      OMPI_MCA_btl_vader_single_copy_mechanism: none
-
-    steps:
-      # https://github.com/orgs/community/discussions/25678#discussioncomment-5242449
-      - name: Delete huge unnecessary tools folder
-        run: rm -rf /opt/hostedtoolcache
-
-      - name: Checkout LDAS
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-          filter: blob:none
-          repository: GEOS-ESM/GEOSldas
-
-      - name: Set all directories as git safe
-        run: |
-          git config --global --add safe.directory '*'
-
-      - name: Versions etc.
-        run: |
-          ifort --version
-          mpirun --version
-          echo $BASEDIR
-
-      - name: Mepo clone external repos
-        run: |
-          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: ${{ github.event.pull_request.head.ref != 'main' && github.event.pull_request.head.ref != 'develop' }}
-        run: |
-          mepo checkout-if-exists ${GITHUB_HEAD_REF}
-          mepo status
-
-      - name: CMake
-        run: |
-          cmake -B build -S . --install-prefix=${pwd}/install -DCMAKE_Fortran_COMPILER=ifort -DCMAKE_BUILD_TYPE=Debug -DMPIEXEC_PREFLAGS='--oversubscribe' -DUSE_F2PY=OFF
-
-      - name: Build
-        run: |
-          cmake --build build -j 4
-          cmake --install build
-
-
-  build_ldas_gfortran:
-    name: Build GEOSldas with gfortran
-    if: "!contains(github.event.pull_request.labels.*.name, '0 diff trivial')"
-    runs-on: ubuntu-24.04
-    container:
-      image: gmao/ubuntu24-geos-env-mkl:v7.33.0-openmpi_5.0.5-gcc_14.2.0
-
-    env:
-      OMPI_ALLOW_RUN_AS_ROOT: 1
-      OMPI_ALLOW_RUN_AS_ROOT_CONFIRM: 1
-      OMPI_MCA_btl_vader_single_copy_mechanism: none
-
-    steps:
-      # https://github.com/orgs/community/discussions/25678#discussioncomment-5242449
-      - name: Delete huge unnecessary tools folder
-        run: rm -rf /opt/hostedtoolcache
-
-      - name: Checkout LDAS
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-          filter: blob:none
-          repository: GEOS-ESM/GEOSldas
-
-      - name: Set all directories as git safe
-        run: |
-          git config --global --add safe.directory '*'
-
-      - name: Versions etc.
-        run: |
-          gfortran --version
-          mpirun --version
-          echo $BASEDIR
-
-      - name: Mepo clone external repos
-        run: |
-          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: ${{ github.event.pull_request.head.ref != 'main' && github.event.pull_request.head.ref != 'develop' }}
-        run: |
-          mepo checkout-if-exists ${GITHUB_HEAD_REF}
-          mepo status
-
-      - name: CMake
-        run: |
-          cmake -B build -S . --install-prefix=${pwd}/install -DCMAKE_Fortran_COMPILER=gfortran -DCMAKE_BUILD_TYPE=Debug -DMPIEXEC_PREFLAGS='--oversubscribe' -DUSE_F2PY=OFF
-
-      - name: Build
-        run: |
-          cmake --build build -j 4
-          cmake --install build
+  build_ldas:
+    strategy:
+      fail-fast: false
+      matrix:
+        compiler: [ifort, gfortran-15, ifx]
+        build-type: [Debug]
+    uses: GEOS-ESM/CI-workflows/.github/workflows/geosgcm_build_tests.yml@project/geosgcm
+    with:
+      compiler: ${{ matrix.compiler }}
+      cmake-build-type: ${{ matrix.build-type }}
+      fixture-repo: GEOS-ESM/GEOSldas
+      run-mepo-develop: false
+
+  # We cannot currently test with spack because spack does not build the
+  # HDF4 Fortran interface, which is required for the GEOSldas.
+  #######################################################################################
+  # spack_build:                                                                        #
+  #   uses: GEOS-ESM/CI-workflows/.github/workflows/spack_gcc_build.yml@project/geosgcm #
+  #   secrets:                                                                          #
+  #     BUILDCACHE_USERNAME: ${{ secrets.BUILDCACHE_USERNAME }}                         #
+  #     BUILDCACHE_TOKEN: ${{ secrets.BUILDCACHE_TOKEN }}                               #
+  #   with:                                                                             #
+  #     fixture-repo: GEOS-ESM/GEOSldas                                                 #
+  #     run-mepo-develop: false                                                         #
+  #     load-fms: true                                                                  #
+  #######################################################################################

CHANGELOG.md

@@ -21,6 +21,51 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 -----------------------------
 
+## [v4.0.0] - 2026-09-09
+
+- Generally not 0-diff vs. v3.2.0 (owing to revised QC of Tb, sfds, sfmc; also requires newer, non-0-diff GEOSgcm_GridComp).
+
+### Added
+
+- Added support for river routing, incl. ensemble simulations ([PR #145](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/145), [PR #174](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/174), [PR #176](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/176)).
+- Added support for lake tiles (single ensemble member only) ([PR #181](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/181)).
+- Added support for running ISSM (Ice-Sheet and Sea-level System Model; single ensemble member only) ([PR #161](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/161), [PR #176](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/176)). 
+- Added assimilation of surface soil moisture observations from H-SAF ASCAT H121 CDR v8 and H139 ICDR netcdf products (MetOp-A/B/C) ([PR #186](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/186)).
+- Added optional NetCDF4 output of ObsFcstAna; changed namelist variable "out_ObsFcstAna" from logical to integer ([PR #163](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/163), [PR #185](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/185)).
+- Added Matlab and python readers for binary Tb scaling parameters files ([PR #179](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/179), [PR #191](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/191)).
+- Added python reader for binary catparam files ([PR #191](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/191)).
+- Added SMOS Tb preprocessing scripts ([PR #189](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/189)).
+
+
+### Changed
+
+- Added peatland QC for observations of "sfds" and "sfmc" ([PR #186](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/186)).
+- Added QC of SMAP L1C_TB using max value for Tb_error ([PR #190](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/190)).
+- Revised and cleaned up RESTART options ([PR #160](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/160), [PR #166](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/166)):
+  - Clarified scope and constraints of RESTART=1 and RESTART=2.
+  - Added RESTART=3 (formerly RESTART=G, which had been removed).
+  - Cleaned up RESTART=M.
+- Renamed './cat' output directory to './diag'; created link from './cat' to './diag' for backward compatibility ([PR #198](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/198)).
+- Updated Landice ("glc") HISTORY Collection to match that of M21C, plus key ISSM outputs ([PR #181](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/181)).
+- Replaced legacy HDF4 Fortran interface with a C bridge and `ISO_C_BINDING` module ([PR #194](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/194), [PR #201](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/201)).
+- Updated CI ([PR #181](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/181)).
+
+
+### Fixed
+
+- Fixed python version of `read_obs_param()` ([PR #185](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/185)).
+- Fixed crashes in debug mode ([PR #173](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/173)).
+- Fixed string matching for EASE tile file to accommodate new "EASE*-Pfafstetter" tile file for runoff routing purposes ([PR #160](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/160)).
+- Fixed GEOSlandpert build when MKL is unavailable by enabling MKL-specific code paths only when MKL is detected ([PR #162](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/162)).
+- Fixed NAG Fortran compiler issues ([PR #170](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/170)).
+- Fixed missing deallocate and nullify statements ([PR #180](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/180)).
+
+### Removed
+
+- Removed 2d "lfs" collection from HISTORY.rc template ([PR #156](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/156)).
+
+-----------------------------
+
 ## [v3.2.0] - 2025-11-26
 
 - 0-diff vs. v3.1.0 (except for lat/lon fields in "1d" nc4 output, which have roundoff differences between files directly generated with MAPL [new default] and files generated with tile_bin2nc4 [discontinued]).
@@ -164,4 +209,3 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Inaugural version.  0-diff vs. GEOSldas v18.0.0.
 
 -----------------------------
-

CMakeLists.txt

@@ -3,15 +3,15 @@ esma_set_this ()
 set (alldirs
   GEOSmetforce_GridComp
   GEOSlandpert_GridComp
-  GEOSens_GridComp
+  GEOSensavg_GridComp
   GEOSlandassim_GridComp
   )
 
 esma_add_library(${this}
   SRCS GEOS_LdasGridComp.F90
   SUBCOMPONENTS ${alldirs}
   SUBDIRS LDAS_Shared
-  DEPENDENCIES GEOSland_GridComp GEOSlandice_GridComp makebcs MAPL
+  DEPENDENCIES GEOSland_GridComp GEOSlake_GridComp GEOSlandice_GridComp GEOSroute_GridComp makebcs MAPL
   INCLUDES ${INC_ESMF})
 
 esma_add_subdirectory(GEOSldas_App)