Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
129 changes: 129 additions & 0 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
@@ -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
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- New update_type for joint 3d soil moisture and 1d snow analysis (Tb+sfmc+sfds+SCF obs).
- Added CYGNSS soil moisture reader.
- Added M21C surface met forcing.
- Add Github Actions workflow for testing and building GEOSldas_GridComp.

### Changed

- Updated subroutine read_obs_sm_ASCAT_EUMET() to work with both original and revised file name templates.
- Updated subroutine read_obs_sm_ASCAT_EUMET() to work with both original and revised file name templates.
- 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.
- Revised variable names (SHORT_NAME) and descriptions (LONG_NAME) to match M21C file specs.
- Renamed tilecoord%pfaf to %pfaf_index; added matlab tile file reader.
Expand Down