Skip to content

Add river routing #850

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-rreichle wants to merge 6 commits into
base: develop
Choose a base branch
from
Draft

Add river routing #850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3c4d253
Update components.yaml with routing branches for GEOSldas_GridComp an…
gmao-rreichle Dec 3, 2025
24b6215
Use MAPL branch until new MAPL release is ready (components.yaml)
gmao-rreichle Dec 3, 2025
8e4ca41
Update MAPL to v2.64.0 in components.yaml
gmao-rreichle Dec 5, 2025
5a44efa
Update MAPL to v2.64 in CMakeLists.txt
gmao-rreichle Dec 5, 2025
6b69699
Clarify that all fields in a given collection must be in same tile sp…
gmao-rreichle Dec 8, 2025
ca74bfe
Minor clarification of output specs (README.OutputSpecs.md)
gmao-rreichle Dec 8, 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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ if (NOT Baselibs_FOUND)
# Another issue with historical reasons, old/wrong zlib target used in GEOS
add_library(ZLIB::zlib ALIAS ZLIB::ZLIB)

find_package(MAPL 2.63 QUIET)
find_package(MAPL 2.64 QUIET)
if (MAPL_FOUND)
message(STATUS "Found MAPL: ${MAPL_BASE_DIR} (found version \"${MAPL_VERSION})\"")
endif ()
Expand Down
6 changes: 3 additions & 3 deletions components.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,18 +51,18 @@ GMAO_perllib:
MAPL:
local: ./src/Shared/@MAPL
remote: ../MAPL.git
tag: v2.63.1
tag: v2.64.0
develop: develop

GEOSldas_GridComp:
local: ./src/Components/@GEOSldas_GridComp
remote: ../GEOSldas_GridComp.git
branch: develop
branch: feature/wjiang/route
develop: develop

GEOSgcm_GridComp:
local: ./src/Components/@GEOSgcm_GridComp
remote: ../GEOSgcm_GridComp.git
branch: develop
branch: feature/wjiang/Routing_GEOSroute_on_yujin
sparse: ./config/GEOSgcm_GridComp_ldas.sparse
develop: develop
8 changes: 4 additions & 4 deletions doc/README.OutputSpecs.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@ Output of the latter two sets of files can be turned on/off in the `[NML_INPUT_P

As part of `ldas_setup`, a sample `HISTORY.rc` configuration file is created in the experiment's `./run` directory. Users specify the desired output by editing `HISTORY.rc`.

`HISTORY.rc` defines a number of output file "Collections", each of which contains one or more output variables. Output can be in the native tile space ("1d") or gridded ("2d"), _**except**_ when the simulation is in the EASE grid tile space (see below).
`HISTORY.rc` defines a number of output file "Collections", each of which contains one or more output variables. Output can be in the native tile space ("1d") or gridded ("2d").

All variables contained in a given Collection are written:
* on the same ("2d") grid (if gridded),
* at the same frequency, and
* with either time-average ("tavg") or instantaneous ("inst") sampling mode.

In the following example, two Collections are written. The `tavg3_2d_lnd_Nx` Collection contains time-average ("tavg"), 3-hourly ("3"), gridded ("2d") data, and the `inst1_1d_lfs_Nt` Collection contains snapshot/instantaneous ("inst"), 1-hourly, tile-space ("1d") data.
In the following example, two Collections are written. The `tavg3_2d_lnd_Nx` Collection contains time-average ("tavg"), 3-hourly ("3"), gridded ("2d") land ("lnd") data, and the `inst1_1d_glc_Nt` Collection contains snapshot/instantaneous ("inst"), 1-hourly, tile-space ("1d") glacier ("glc") data.
```
COLLECTIONS:
'tavg3_2d_lnd_Nx'
'inst1_1d_lfs_Nt'
'inst1_1d_glc_Nt'
::
```

Expand Down Expand Up @@ -69,7 +69,7 @@ In addition, the line "VERSION: 1" must be present in the header of `HISTORY.rc`

**Special considerations for GEOSldas**

1. Since the introduction of mixed land+landice simulations, the tile space can differ across gridded components. For example, METFORCE fields are in the full land+landice tile space, whereas CATCH fields are in the land tilespace. Therefore, in mixed land+landice simulations, METFORCE fields and CATCH fields can no longer appear in the same "1d" HISTORY collection (which was previously the case in the "1d_lfs" collection).
1. Since the introduction of mixed land+landice simulations, the tile space can differ across gridded components. For example, METFORCE fields are in the full land+landice tile space, whereas CATCH fields are in the land tilespace. Therefore, in mixed land+landice simulations, METFORCE fields and CATCH fields can no longer appear in the same HISTORY Collection (which was previously the case in the "lfs" Collection, for both "1d" and "2d" output).

2. Beginning with MAPL v2.63.1, simulations on the EASE grid tile space can write "2d" gridded output on the native EASE grid as well as interpolated to lat/lon and cube-sphere grids.

Expand Down
Loading