Merge BRIDGE into main in prep for release v2.0.0

.github/workflows/workflow.yml

@@ -0,0 +1,129 @@
+name: Build Tests
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+    # Do not run if the only files changed cannot affect the build
+    paths-ignore:
+      - "**.md"
+      - "**.pro"
+      - "**.sh"
+      - "**.perl"
+      - ".github/CODEOWNERS"
+      - ".circleci/config.yml"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
+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.32.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: Update other branches
+        if:
+          "!contains('refs/heads/main,refs/heads/develop', github.ref)"
+        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.32.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: Update other branches
+        if:
+          "!contains('refs/heads/main,refs/heads/develop', github.ref)"
+        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

CHANGELOG.md

@@ -21,25 +21,50 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 -----------------------------
 
+## [v2.0.0] - 2025-04-15
+
+- 0-diff vs. v1.1.0.
+
+### Added
+
+- New update_type for joint 3d soil moisture and 1d snow analysis (Tb+sfmc+sfds+SCF obs) ([PR #68](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/68)).
+- Updated subroutine read_obs_sm_ASCAT_EUMET() to work with both original and revised file name templates ([PR #69](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/69)).
+- Added CYGNSS soil moisture reader ([PR #76](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/76)).
+- Added M21C surface met forcing ([PR #77](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/77)).
+- Added Github Actions workflow for testing and building GEOSldas_GridComp ([PR #86](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/86)).
+
+### Changed
+
+- Revised variable names (SHORT_NAME) and descriptions (LONG_NAME) to match M21C file specs ([PR #72](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/72)).
+- Updated subroutines read_obs_sm_ASCAT_EUMET(), read_obs_SMAP_halforbit_Tb(), read_obs_SMOS() and read_obs_MODIS_SCF() with hardcoded time ranges for when observations are available and should be read ([PR #73](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/73)).
+- Renamed tilecoord%pfaf to %pfaf_index; added matlab tile file reader ([PR #78](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/78)).
+- Improved setup of coupled land/atm DAS (incl. changed nomenclature of met forcing files: "Nx+-" --> "bkg.lfo_*") ([PR #81](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/81)).
+
+### Removed
+
+- Removed support for SLES12 operating system at NCCS ([PR #83](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/83)).
+
+-----------------------------
+
 ## [v1.1.0] - 2024-11-05
 
 - 0-diff vs. v1.0.2 except for data assimilation in cube-sphere tile space ([PR #41](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/41)).
 
 ### Changed
 
-- More optimal distribution of tiles on processors for cubed-sphere tile space.
-- Updates to scripting to allow for Intel MPI.
+- More optimal distribution of tiles on processors for cubed-sphere tile space ([PR #41](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/41)).
+- Updates to scripting to allow for Intel MPI ([PR #57](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/57)).
 
 ### Fixed
 
-- Do not increment CO2_YEAR when it is a no-data-value. For Catchment simulations, exclude CatchCN-specific resource variables from LDAS.rc.
-- Bug fix and improved efficiency in matlab script for generation of mwRTM_param.
-- Changed EXPDIR to absolute path for POSTPROC_HIST>0 option to work.
-- Support HISTORY output of ASNOW alone from ENSAVG Gridcomp.
+- Do not increment CO2_YEAR when it is a no-data-value; for Catchment simulations, exclude CatchCN-specific resource variables from LDAS.rc ([PR #51](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/51)).
+- Bug fix and improved efficiency in matlab script for generation of mwRTM_param ([PR #46](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/46)).
+- Changed EXPDIR to absolute path for POSTPROC_HIST>0 option to work ([PR #42](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/42)).
+- Support HISTORY output of ASNOW alone from ENSAVG Gridcomp  ([PR #49](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/49)).
 
 ### Removed
 
-- Remove restart options F and G.
+- Remove restart options F and G  ([PR #40](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/40)).
 
 -----------------------------