Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
888cca4
add setting defaults and more commdline options for ladas
saraqzhang Apr 25, 2025
07cde3d
additional edit for integrated configuration of land-atm DAS (ldas_se…
gmao-rreichle May 2, 2025
5bdce17
update input strings for agcm_res
saraqzhang May 2, 2025
29f77d8
add land BCs version input for ladas
saraqzhang May 5, 2025
a1a2533
cleanup of command line args for land-atm DAS config (ldas_setup)
gmao-rreichle May 6, 2025
2443b5a
updated CHANGELOG.md
gmao-rreichle May 6, 2025
7742280
changed handling of N_ens for coupled land-atm DAS setup (ldas_setup)
gmao-rreichle May 6, 2025
8a7c7fc
add README on construction of exeinp.txt for LADAS
saraqzhang May 6, 2025
01f0f63
minor cleanup as suggested by Weiyuan (ldas_setup)
gmao-rreichle May 7, 2025
f07f2e4
additional cleanup as suggested by Weiyuan for integrated land-atm DA…
gmao-rreichle May 7, 2025
0ec5846
change handling of BCS_PATH in setup of coupled land-atm DAS (ldas_se…
gmao-rreichle May 7, 2025
ab9c3c3
exclude AGCM defaults of GEOS_SurfaceGridComp.rc from sample exeinp f…
gmao-rreichle May 7, 2025
ea03973
further changes in setting exeinp & batinp variables
saraqzhang May 13, 2025
11dca45
minor cleanup to improve readability (ldas_setup)
gmao-rreichle May 13, 2025
7f115d9
additional changes and cleanup for integrated land-atm DAS config (ld…
gmao-rreichle May 13, 2025
ef43e7e
additional commandline inputs for ladas
saraqzhang May 15, 2025
7a023c9
minor edit insert adas_cyc input in JOB_SGMT
saraqzhang May 16, 2025
21e3584
Merge branch 'develop' into feature/saraqzhang/setupfunc4ladas
weiyuan-jiang May 19, 2025
86056e5
fixed errors in most recent merge (conflict resolution); white-space …
gmao-rreichle May 19, 2025
14f5186
remove README.exeinp.txt.forladas (no longer needed)
gmao-rreichle May 19, 2025
ae2717e
edits of previous commit (ldas_setup):
gmao-rreichle May 20, 2025
8dbd52a
edits on varwindow, walltime and nml path default
saraqzhang May 20, 2025
d36c72c
for coupled land-atm DAS, ensure consistency between LANDASSIM_DT and…
gmao-rreichle May 20, 2025
29a2b3c
clean up processing of defaults from GEOS_SurfaceGridComp.rc (ldas_se…
gmao-rreichle May 20, 2025
1352dbb
fixed indent error introduced in last commit (ldas_setup)
gmao-rreichle May 20, 2025
a3c4312
fixed py bugs from previous commit (ldas_setup)
gmao-rreichle May 21, 2025
5278ce0
skip writing extra lines with #agcm=> or #ldas=>
saraqzhang May 21, 2025
054ba56
no exeinp for adas coupling
weiyuan-jiang May 22, 2025
8a8c1d6
remove unnecessary message
weiyuan-jiang May 22, 2025
df1b1f3
minor changes for ladas_cpl case
saraqzhang May 22, 2025
4a1802e
additional changes and cleanup for coupled land-atm DAS (ldas_setup):
gmao-rreichle May 22, 2025
08a8078
fixed syntax error from previous commit (ldas_setup)
gmao-rreichle May 22, 2025
c3ca2d5
fix path to rc template files (ldas_setup)
gmao-rreichle May 22, 2025
0f220cb
cleaned up logic of processing defaults from GEOS_SurfaceGridComp.rc …
gmao-rreichle May 22, 2025
3d9121e
Merge branch 'develop' into feature/saraqzhang/setupfunc4ladas (manua…
gmao-rreichle May 22, 2025
9d67552
additional default settings and command line args for land-atm DAS (#94)
gmao-rreichle May 27, 2025
1354459
Update CHANGELOG.md
gmao-rreichle May 27, 2025
52c4c95
Fix up CI
mathomp4 May 28, 2025
126601f
Update CHANGELOG.md in prep for release v3.0.0; minor CI update (#99)
gmao-rreichle May 28, 2025
7e64aa4
Fix up github CI
mathomp4 May 28, 2025
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
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
16 changes: 10 additions & 6 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
17 changes: 13 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
Expand Down
Loading