Skip to content

Commit 5d6e618

Browse files
gmao-rreichlegmao-rreichle
authored
Merge BRIDGE into main in prep for release v2.0.0 (#92)
Merge BRIDGE into main in prep for release v2.0.0
2 parents 4417567 + 569fa59 commit 5d6e618

27 files changed

+4652
-878
lines changed

‎.github/workflows/workflow.yml

Lines changed: 129 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,129 @@
1+
name: Build Tests
2+
3+
on:
4+
pull_request:
5+
types: [opened, synchronize, reopened]
6+
# Do not run if the only files changed cannot affect the build
7+
paths-ignore:
8+
- "**.md"
9+
- "**.pro"
10+
- "**.sh"
11+
- "**.perl"
12+
- ".github/CODEOWNERS"
13+
- ".circleci/config.yml"
14+
15+
concurrency:
16+
group: ${{ github.workflow }}-${{ github.ref }}
17+
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
18+
19+
jobs:
20+
build_ldas_ifort:
21+
name: Build GEOSldas with ifort
22+
if: "!contains(github.event.pull_request.labels.*.name, '0 diff trivial')"
23+
runs-on: ubuntu-24.04
24+
container:
25+
image: gmao/ubuntu24-geos-env:v7.32.0-intelmpi_2021.13-ifort_2021.13
26+
27+
env:
28+
OMPI_ALLOW_RUN_AS_ROOT: 1
29+
OMPI_ALLOW_RUN_AS_ROOT_CONFIRM: 1
30+
OMPI_MCA_btl_vader_single_copy_mechanism: none
31+
32+
steps:
33+
# https://github.com/orgs/community/discussions/25678#discussioncomment-5242449
34+
- name: Delete huge unnecessary tools folder
35+
run: rm -rf /opt/hostedtoolcache
36+
37+
- name: Checkout LDAS
38+
uses: actions/checkout@v4
39+
with:
40+
fetch-depth: 1
41+
filter: blob:none
42+
repository: GEOS-ESM/GEOSldas
43+
44+
- name: Set all directories as git safe
45+
run: |
46+
git config --global --add safe.directory '*'
47+
48+
- name: Versions etc.
49+
run: |
50+
ifort --version
51+
mpirun --version
52+
echo $BASEDIR
53+
54+
- name: Mepo clone external repos
55+
run: |
56+
mepo clone --partial blobless
57+
mepo status
58+
59+
- name: Update other branches
60+
if:
61+
"!contains('refs/heads/main,refs/heads/develop', github.ref)"
62+
run: |
63+
mepo checkout-if-exists ${GITHUB_HEAD_REF}
64+
mepo status
65+
66+
- name: CMake
67+
run: |
68+
cmake -B build -S . --install-prefix=${pwd}/install -DCMAKE_Fortran_COMPILER=ifort -DCMAKE_BUILD_TYPE=Debug -DMPIEXEC_PREFLAGS='--oversubscribe' -DUSE_F2PY=OFF
69+
70+
- name: Build
71+
run: |
72+
cmake --build build -j 4
73+
cmake --install build
74+
75+
76+
build_ldas_gfortran:
77+
name: Build GEOSldas with gfortran
78+
if: "!contains(github.event.pull_request.labels.*.name, '0 diff trivial')"
79+
runs-on: ubuntu-24.04
80+
container:
81+
image: gmao/ubuntu24-geos-env-mkl:v7.32.0-openmpi_5.0.5-gcc_14.2.0
82+
83+
env:
84+
OMPI_ALLOW_RUN_AS_ROOT: 1
85+
OMPI_ALLOW_RUN_AS_ROOT_CONFIRM: 1
86+
OMPI_MCA_btl_vader_single_copy_mechanism: none
87+
88+
steps:
89+
# https://github.com/orgs/community/discussions/25678#discussioncomment-5242449
90+
- name: Delete huge unnecessary tools folder
91+
run: rm -rf /opt/hostedtoolcache
92+
93+
- name: Checkout LDAS
94+
uses: actions/checkout@v4
95+
with:
96+
fetch-depth: 1
97+
filter: blob:none
98+
repository: GEOS-ESM/GEOSldas
99+
100+
- name: Set all directories as git safe
101+
run: |
102+
git config --global --add safe.directory '*'
103+
104+
- name: Versions etc.
105+
run: |
106+
gfortran --version
107+
mpirun --version
108+
echo $BASEDIR
109+
110+
- name: Mepo clone external repos
111+
run: |
112+
mepo clone --partial blobless
113+
mepo status
114+
115+
- name: Update other branches
116+
if:
117+
"!contains('refs/heads/main,refs/heads/develop', github.ref)"
118+
run: |
119+
mepo checkout-if-exists ${GITHUB_HEAD_REF}
120+
mepo status
121+
122+
- name: CMake
123+
run: |
124+
cmake -B build -S . --install-prefix=${pwd}/install -DCMAKE_Fortran_COMPILER=gfortran -DCMAKE_BUILD_TYPE=Debug -DMPIEXEC_PREFLAGS='--oversubscribe' -DUSE_F2PY=OFF
125+
126+
- name: Build
127+
run: |
128+
cmake --build build -j 4
129+
cmake --install build

‎CHANGELOG.md

Lines changed: 32 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,25 +21,50 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2121

2222
-----------------------------
2323

24+
## [v2.0.0] - 2025-04-15
25+
26+
- 0-diff vs. v1.1.0.
27+
28+
### Added
29+
30+
- 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)).
31+
- 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)).
32+
- Added CYGNSS soil moisture reader ([PR #76](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/76)).
33+
- Added M21C surface met forcing ([PR #77](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/77)).
34+
- Added Github Actions workflow for testing and building GEOSldas_GridComp ([PR #86](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/86)).
35+
36+
### Changed
37+
38+
- 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)).
39+
- 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)).
40+
- Renamed tilecoord%pfaf to %pfaf_index; added matlab tile file reader ([PR #78](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/78)).
41+
- 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)).
42+
43+
### Removed
44+
45+
- Removed support for SLES12 operating system at NCCS ([PR #83](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/83)).
46+
47+
-----------------------------
48+
2449
## [v1.1.0] - 2024-11-05
2550

2651
- 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)).
2752

2853
### Changed
2954

30-
- More optimal distribution of tiles on processors for cubed-sphere tile space.
31-
- Updates to scripting to allow for Intel MPI.
55+
- More optimal distribution of tiles on processors for cubed-sphere tile space ([PR #41](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/41)).
56+
- Updates to scripting to allow for Intel MPI ([PR #57](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/57)).
3257

3358
### Fixed
3459

35-
- Do not increment CO2_YEAR when it is a no-data-value. For Catchment simulations, exclude CatchCN-specific resource variables from LDAS.rc.
36-
- Bug fix and improved efficiency in matlab script for generation of mwRTM_param.
37-
- Changed EXPDIR to absolute path for POSTPROC_HIST>0 option to work.
38-
- Support HISTORY output of ASNOW alone from ENSAVG Gridcomp.
60+
- 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)).
61+
- Bug fix and improved efficiency in matlab script for generation of mwRTM_param ([PR #46](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/46)).
62+
- Changed EXPDIR to absolute path for POSTPROC_HIST>0 option to work ([PR #42](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/42)).
63+
- Support HISTORY output of ASNOW alone from ENSAVG Gridcomp ([PR #49](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/49)).
3964

4065
### Removed
4166

42-
- Remove restart options F and G.
67+
- Remove restart options F and G ([PR #40](https://github.com/GEOS-ESM/GEOSldas_GridComp/pull/40)).
4368

4469
-----------------------------
4570

0 commit comments

Comments
 (0)