Skip to content

Add river routing module for offline (GEOSldas) simulations#1143

Merged
sdrabenh merged 200 commits intodevelopfrom
feature/wjiang/Routing_GEOSroute_on_yujin
Apr 15, 2026
Merged

Add river routing module for offline (GEOSldas) simulations#1143
sdrabenh merged 200 commits intodevelopfrom
feature/wjiang/Routing_GEOSroute_on_yujin

Conversation

@weiyuan-jiang
Copy link
Copy Markdown
Contributor

@weiyuan-jiang weiyuan-jiang commented Aug 14, 2025

Add river routing module for offline land modeling (GEOSldas). Replaces #1023

Successfully 0-diff tested by @biljanaorescanin on 10-Apr-2026 #1143 (comment)

Merged branch of #1149 into present PR to resolve anticipated conflict when merging present PR after #1149 (9d1a15f)


Left for future PRs:

  • Run routing module within the AGCM and coupled model (AOGCM).
  • Run only the routing module (but not Catchment) in GEOSldas.
  • Include landice tiles in routing (GEOSldas and GCM).

Related PRs:


Testing:

  • TBD

List of tasks that remain to be addressed (in no particular order):


@YujiN, I am trying to bring back some codes in develop branch. The develop branch is not working as it is but I believe it would be more efficient. The runoff and the other variables are distributed as needed, which is way more efficient than allgatherV.

Yujin Zeng and others added 30 commits October 23, 2024 21:22
…t in GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOSroute_GridComp
@zyj8881357
Copy link
Copy Markdown

zyj8881357 commented Mar 24, 2026

@gmao-rreichle @weiyuan-jiang I have modified the routing model code to make it read the *.nc4 tile files.

Copy link
Copy Markdown
Contributor

@gmao-rreichle gmao-rreichle left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@zyj8881357 , @weiyuan-jiang : Sorry it took me so long to pick up the routing PR again. I have a few more cleanup questions, see below.
Merging the PR has gained some urgency because the SI team is planning to make relatively invasive changes across all GridComp F90 files under Surface. These changes will result in lots of conflicts with the present PR. Ideally, we can merge the present PR before the SI team makes their changes.

Yujin Zeng and others added 3 commits April 8, 2026 12:47
…lict and for consistency with F90 file names (./Raster/preproc/outlets/*.f90, ./Raster/preproc/routing_model/*.f90)
Copy link
Copy Markdown
Contributor

@gmao-rreichle gmao-rreichle left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@zyj8881357 :
Thanks for making the changes. I went through and resolved conversations when possible. I further cleaned up the module names for the outlets and routing constants. Note that there was a naming conflict after your most recent change, when both modules were named "routing_constant".
Here's a list of open issues:

  1. Please try simulations for (i) a non-global domain on the EASE grid and (ii) a domain that includes landice tiles. Weiyuan isn't sure that the new *-Pfafstetter tile file for EASE works with non-global domains (#1143 (comment)), and I'm not sure if we ever tested a simulation with landice tiles.
  2. Biljana mentioned you gave her a new routing_parameter.nc file. Are the new parameters based on SMAP NRv11.4? (#1143 (comment))
  3. The program get_num_sub_catchment.f90 doesn't seem to use the info from the *-Pfafstetter tile file. Instead, it looks to me like it compute things from scratch based on raster information. What exactly do we need this program to do, and can it be done more cleanly using the *-Pfafstetter tile file?

cc: @weiyuan-jiang

@biljanaorescanin
Copy link
Copy Markdown
Contributor

Testing summary:

  1. PR was tested for one day AMIP, REPLAY and No Inc. REPLAY all were zero diff.
  2. PR also passes regression test.

During testing besides this branch/PR I used:

Component Current Tag Target/Branch
GEOS_Util (t) v2.1.12 (DH) (b) main
MAPL (t) v2.67.0 (DH) (t) v2.68.0 (DH)

@biljanaorescanin biljanaorescanin marked this pull request as ready for review April 10, 2026 13:53
@biljanaorescanin biljanaorescanin requested review from a team as code owners April 10, 2026 13:53
@biljanaorescanin biljanaorescanin removed the Contingent - DNA These changes are contingent on other PRs (DNA=do not approve) label Apr 10, 2026
gmao-rreichle
gmao-rreichle previously approved these changes Apr 10, 2026
bena-nasa
bena-nasa previously approved these changes Apr 10, 2026
…n_yujin (manually resolved conflict in make_bcs_shared.py)
@gmao-rreichle gmao-rreichle dismissed stale reviews from bena-nasa, biljanaorescanin, and themself via 9d1a15f April 13, 2026 15:24
@sdrabenh sdrabenh merged commit 2561115 into develop Apr 15, 2026
21 of 28 checks passed
@sdrabenh sdrabenh deleted the feature/wjiang/Routing_GEOSroute_on_yujin branch April 15, 2026 18:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

0 diff The changes in this pull request have verified to be zero-diff with the target branch. enhancement New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants