Skip to content

Updates to introduce new version of Catchment-CN: Catchment-CN5.1 #829

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
gmao-jkolassa wants to merge 26 commits into
base: develop
Choose a base branch
from
Draft

Updates to introduce new version of Catchment-CN: Catchment-CN5.1 #829

Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
ecdbc36
pointing to GEOSgcm_GridComp branch for CNCLM51
gmao-jkolassa Oct 19, 2022
47a2daf
update MAPL
gmao-jkolassa Nov 7, 2022
4075762
update to latest develop
gmao-jkolassa Jan 11, 2023
7438f28
Merge branch 'develop' into feature/jkolassa_cnclm51
gmao-jkolassa Jan 24, 2023
955373a
update ldas_setup for LSM_CHOICE 4
gmao-jkolassa Jan 24, 2023
654f01b
accommodate LSM_CHOICE = 4
gmao-jkolassa Jan 25, 2023
c8d53b8
group LSM_CHOICE 3 and 4
gmao-jkolassa Jan 25, 2023
dc738a6
point to MAPL with updated get_var
gmao-jkolassa Feb 24, 2023
9b6444f
Merge branch 'develop' into feature/jkolassa_cnclm51
gmao-jkolassa Feb 28, 2023
ac3ba4b
point to MAPL develop branch
gmao-jkolassa Feb 28, 2023
73dee23
update to latest develop
gmao-jkolassa Mar 24, 2023
f4428b3
Merge branch 'develop' into feature/jkolassa_cnclm51
gmao-jkolassa Jun 27, 2023
e125d43
Merge branch 'develop' into feature/jkolassa_cnclm51
gmao-jkolassa Sep 12, 2023
6e5f9c9
Merge branch 'develop' into feature/jkolassa_cnclm51
gmao-jkolassa Nov 1, 2023
22aef9c
update to latest develop
gmao-jkolassa May 15, 2024
11f756d
point to new GEOSldas_GridComp branch
gmao-jkolassa May 15, 2024
8153a5f
Merge branch 'develop' into feature/jkolassa_cnclm51
gmao-jkolassa Jun 3, 2025
eb5684b
using MAPL develop branch until it is published in a tag
gmao-jkolassa Jun 27, 2025
78fa3de
merge develop
gmao-jkolassa Jul 1, 2025
4f4023b
use MAPL tag v2.57.0
gmao-jkolassa Jul 1, 2025
65e995f
Temporarily specify GEOS_Util branch in components.yaml
gmao-rreichle Aug 6, 2025
749560f
Update components.yaml
gmao-rreichle Aug 6, 2025
84ed13c
switching GEOS_Util branch to "main" while awaiting new release (comp…
gmao-rreichle Aug 28, 2025
558970d
Update to GEOS_Util v2.1.10 (components.yaml)
gmao-rreichle Aug 29, 2025
74624d4
Merge branch 'develop' into feature/jkolassa_cnclm51
gmao-rreichle Sep 4, 2025
d4361af
Merge branch 'develop' into feature/jkolassa_cnclm51
gmao-rreichle Nov 22, 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
4 changes: 2 additions & 2 deletions components.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@ MAPL:
GEOSldas_GridComp:
local: ./src/Components/@GEOSldas_GridComp
remote: ../GEOSldas_GridComp.git
branch: develop
branch: feature/jkolassa_cnclm51
develop: develop

GEOSgcm_GridComp:
local: ./src/Components/@GEOSgcm_GridComp
remote: ../GEOSgcm_GridComp.git
branch: develop
branch: feature/jkolassa_cnclm51
sparse: ./config/GEOSgcm_GridComp_ldas.sparse
develop: develop