Skip to content

add ensemble avg for routing and landice ( one landice member so far) - #176

Merged
gmao-rreichle merged 23 commits into
developfrom
feature/wjiang/add_ensavg_landice_route
Jul 21, 2026
Merged

gmao-rreichle merged 23 commits into
developfrom
feature/wjiang/add_ensavg_landice_route

Conversation

@weiyuan-jiang

@weiyuan-jiang weiyuan-jiang commented May 27, 2026 •

Copy link
Copy Markdown
Contributor

Adds ensemble capability in GEOSldas for Route and Landice. The latter is hardwired to N_ens_landice=1 for now.

After merge, the following inputs to the GEOSldas regression test suite must be edited:

  • /discover/nobackup/mathomp4/LDAS_Restarts/NGHTLY_TST_TV4000/HISTORY_L4_SM.rc
  • /discover/nobackup/mathomp4/LDAS_Restarts/NGHTLY_TST_CS/assim/ldas179b8_C180/run/HISTORY.rc

These files are used by the GLOBAL[CS]/assim tests. Within the files, replace ENSAVG with LANDAVG.

Related PRs:
GEOS-ESM/GEOSgcm_GridComp#1421. (merged 21-July-2026)

cc: @mathomp4

@weiyuan-jiang
weiyuan-jiang requested review from a team as code owners May 27, 2026 16:41
@weiyuan-jiang weiyuan-jiang added enhancement New feature or request 0-diff labels May 27, 2026
@gmao-rreichle
gmao-rreichle marked this pull request as draft May 27, 2026 17:45
@weiyuan-jiang

Copy link
Copy Markdown
Contributor Author

This PR is zero-diff

@zyj8881357

Copy link
Copy Markdown

I have checked the PR with six members of ensemble run and compared with discharge observations. The results look good.

@gmao-rreichle

Copy link
Copy Markdown
Collaborator

@weiyuan-jiang : Thanks again for sorting through the ensavg output across the various new GridComps, this is great!

I added a couple of commits:

  • 6787d9a, 4a34a1c: Renamed "ForceAvg" to "MetforceAvg" for consistency.
  • ae53b7d: Fixed a HISTORY file used in the coupled land-atm DAS.
  • cc05e77, 835d8fa: Resolved conflicts with current "develop" branch (ISSM-related).

Please double-check these commits. The big change on develop since the present PR was started is the addition of ISSM under Landice. Since we hardwire Landice to a single ensemble member, I assume that no further action is needed to accommodate ISSM within the new Landice ensemble capability. Is that correct? Or might the addition of ISSM require changes in the revised "ensavg" GridComp?

PS: I'm submitting this comment before the CI build completes. Apologies if I introduced a build error. If I did, I'll fix it tomorrow.

@gmao-rreichle

Copy link
Copy Markdown
Collaborator

@weiyuan-jiang : I don't understand why this branch built successfully yesterday. It should depend on NUM_SNOW_LAYERS and NUM_ICE_LAYERS being made public in the Landice GC, which is part of GEOS-ESM/GEOSgcm_GridComp#1421 but not on the GCM GC "develop" branch (which is presumably used by CI in the build test).

In looking a bit more into this, I noticed that NUM_SNOW_LAYERS and NUM_ICE_LAYERS exist with the same names in both the Landice GC and the sea ice model (CICE). That's ok as long as the variables are not public, but now we need the variables from LANDICE to be public. To make this safer, I appended "_LANDICE" to the public name:

I still don't understand why the present PR builds without seeing the branch that makes the NUM_*_LAYERS public. I did not find anything that made the sea ice variables public, maybe I missed it. Can you explain this?

@weiyuan-jiang

Copy link
Copy Markdown
Contributor Author

@weiyuan-jiang : I don't understand why this branch built successfully yesterday. It should depend on NUM_SNOW_LAYERS and NUM_ICE_LAYERS being made public in the Landice GC, which is part of GEOS-ESM/GEOSgcm_GridComp#1421 but not on the GCM GC "develop" branch (which is presumably used by CI in the build test).

In looking a bit more into this, I noticed that NUM_SNOW_LAYERS and NUM_ICE_LAYERS exist with the same names in both the Landice GC and the sea ice model (CICE). That's ok as long as the variables are not public, but now we need the variables from LANDICE to be public. To make this safer, I appended "_LANDICE" to the public name:

I still don't understand why the present PR builds without seeing the branch that makes the NUM_*_LAYERS public. I did not find anything that made the sea ice variables public, maybe I missed it. Can you explain this?

I guess it wasn't really build with develop branch but the right branch of GEOS-ESM/GEOSgcm_GridComp#1421

@gmao-rreichle

Copy link
Copy Markdown
Collaborator

I guess it wasn't really build with develop branch but the right branch of GEOS-ESM/GEOSgcm_GridComp#1421

But where/how do we tell the CI build test to use the branch associated with GEOS-ESM/GEOSgcm_GridComp#1421 rather than the "develop" branch?

cc: @mathomp4

@GEOS-ESM GEOS-ESM deleted a comment from github-actions Bot Jul 17, 2026
@gmao-rreichle
gmao-rreichle marked this pull request as ready for review July 21, 2026 16:30
@gmao-rreichle
gmao-rreichle merged commit 70f93ea into develop Jul 21, 2026
12 of 14 checks passed
@gmao-rreichle
gmao-rreichle deleted the feature/wjiang/add_ensavg_landice_route branch July 21, 2026 16:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

0-diff enhancement New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants