Towards TSMP2-GPU on JUPITER by kvrigor · Pull Request #147 · HPSCTerrSys/TSMP2

kvrigor · 2026-10-09T12:44:54Z

Working builds:

nvhpc=env/jsc.2026.nvhpc.openmpi
gcc=env/jsc.2026.gnu.openmpi
icon2026=/e/project1/training2647/TSMP2-X2/icon2026.04_coup-oas

# eCLM-ParFlow
./build_tsmp2.sh eclm --env $gcc
./build_tsmp2.sh eclm --env $nvhpc

# eCLM-ParFlow
./build_tsmp2.sh eclm parflowgpu --env $gcc
./build_tsmp2.sh eclm parflowgpu --env $nvhpc

# ICON-eCLM
./build_tsmp2.sh eclm icon --icon_src $icon2026 --env $nvhpc
./build_tsmp2.sh eclm icongpu --icon_src $icon2026 --env $nvhpc

# ICON-eCLM-Parflow
./build_tsmp2.sh parflowgpu eclm icongpu --icon_src $icon2026 --env $nvhpc

TODO:

- Replaced "include <mpif.h>" with "use mpi". https://icg4geo.icg.kfa-juelich.de/ExternalReposPublic/oasis3-mct/-/commit/14503d81f877544e411fd5b2e94ec0596f58a0fd - Fixed incorrect data type passed to MPI_GATHER https://icg4geo.icg.kfa-juelich.de/ExternalReposPublic/oasis3-mct/-/commit/7c4fc975baecee2ab0ec0b71a07e4e241a8d34e6

…env file

## Pure PDAF - **`BuildPDAF.cmake`**: Add NVHPC support - **`BuildPDAFMODEL.cmake`**: Make `-lgfortran` conditional on GNU compiler. Add GPU libraries for `ParFlowGPU` builds. - **`BuildParFlow.cmake`**: Umpire is passed to ParFlow for `ParFlowGPU+PDAF` builds - **`models/parflow_pdaf`**: Update submodule `v3.14.1-pdaf` → `v3.15.0-pdaf`, necessary update for GPU support ## OASIS (affects all coupled simulations) - **`BuildOASIS3MCT.cmake`**: Add `make realclean` as configure step

Shortlog: 554c09fd (tag: tsmp-patches-v0.2) declared character pointer arrays as contiguous 7c4fc975 Fixed incorrect data type passed to MPI_GATHER 14503d81 Replaced "include <mpif.h>" with "use mpi" 9e43db07 Used 8 make threads to speed up build c850840d Set default build to S2026 and GNU+OpenMPI 5253349d (tag: tsmp-patches-v0.1) rename `da_comm` to `COMM_model_oas https://icg4geo.icg.kfa-juelich.de/ExternalReposPublic/oasis3-mct/-/commits/tsmp-patches-v0.2?ref_type=tags

eCLM shortlog: - 9c8f1ae22 (tag: rc-0.1) Added LICENSE header "University of Illinois/NCSA Open Source License" (#150) - b06eb7eba eCLM-ParFlow: Couple surface water and route all layer-1 water fluxes to ParFlow (#147) - 345124543 docs: Separate JSC HPC and generic HPC quick-start guides (#148) - e113460a9 cd back to static.resources after git lfs pull (#144) - f7daa6045 Fix directory path in quick start instructions (#143) - a8d1d89e1 eCLM-ParFlow: Couple urban landunits (#133) - f9c3fa96d eCLM-ParFlow: Normalize ParFlow source term over the gridcell (#132) - 55db76e4b eCLM-ParFlow: Calculate hydraulic conductivity based on ParFlow's water content (#129) - 66c98a5db eCLM-ParFlow: account for soil ice when receiving ParFlow water content (#126, #123) (#127) - c6268fe4e Workaround for cache-apt-pkgs-action issue (#137) - 102b7c5d2 Disable the balance-check reporting in eCLM-ParFlow simulations (#125) - 5be92812f (tag: beta-0.8) Fix excessively negative ET over sandy soil in eCLM-ParFlow coupling (#105) (#124)

eCLM release candidate v0.1 (`rc-0.1`) mostly contains eCLM-Parflow fixes by Stefan. Here's a short log of `rc-0.1` vs. `beta-0.8`: ``` 9c8f1ae22 (tag: rc-0.1) Added LICENSE header "University of Illinois/NCSA Open Source License" (#150) b06eb7eba eCLM-ParFlow: Couple surface water and route all layer-1 water fluxes to ParFlow (#147) 345124543 docs: Separate JSC HPC and generic HPC quick-start guides (#148) e113460a9 cd back to static.resources after git lfs pull (#144) f7daa6045 Fix directory path in quick start instructions (#143) a8d1d89e1 eCLM-ParFlow: Couple urban landunits (#133) f9c3fa96d eCLM-ParFlow: Normalize ParFlow source term over the gridcell (#132) 55db76e4b eCLM-ParFlow: Calculate hydraulic conductivity based on ParFlow's water content (#129) 66c98a5db eCLM-ParFlow: account for soil ice when receiving ParFlow water content (#126, #123) (#127) c6268fe4e Workaround for cache-apt-pkgs-action issue (#137) 102b7c5d2 Disable the balance-check reporting in eCLM-ParFlow simulations (#125) 5be92812f (tag: beta-0.8) Fix excessively negative ET over sandy soil in eCLM-ParFlow coupling (#105) (#124) ``` Some extra minor changes in this PR too: - CI: Removed 'ICON standalone' job - CI: Updated OASIS download logic - Deprecate env files for `Stages/2023` and `Stages/2024`

Merged from `master` branch (PR #151)

Updates to OASIS mostly related to NVHPC fixes. Expected tarball checksum is d5c2618563c4883bd309b196be63313e4f60dd0f58c3d926d3ed6bebad685039

Details of the fix is at https://icg4geo.icg.kfa-juelich.de/ExternalReposPublic/oasis3-mct/-/commit/59e03411bbbe9e6c39612fb62402f189cc0c4a38

kvrigor · 2026-10-27T12:19:13Z

Hello @AGonzalezNicolas , @s-poll , and @jjokella : this PR is ready to be merged and I would need help to review it. This is the same branch we used in the ESiWACE hackathon last week. While there are a lot of files changed in this PR, the changes can be summarized as so:

Introduced 2026 environment files. These files were tested on JURECA, JUWELS, and JUPITER.
Changes in build_tsmp2.sh and CMake scripts mostly relate to Stages/2026 NVHPC and ICONGPU fixes.
Updated OASIS3-MCT to tsmp-patches-v0.2. This update mostly contains fixes to make Stages/2026 NVHPC work.
PDAF compile fixes on NVHPC by Johannes.
As with the recent update in eCLM CI, TSMP2 CI is also now decoupled to IBG-3 Gitlab.

AGonzalezNicolas

This PR drops the existing --icon alias (and likewise --eclm, --parflow, etc.).
With this PR, the build script will fail with --icon --eclm --parflow.

kvrigor · 2026-10-27T13:45:29Z

This PR drops the existing --icon alias (and likewise --eclm, --parflow, etc.). With this PR, the build script will fail with --icon --eclm --parflow.

Yes, the plan is to deprecate --<model> options as described in #114

- Towards TSMP2-GPU on JUPITER (#147) - Updated eCLM to rc-0.1 (#151) - Enable CMake parallel build (#89) - Build script: Add --checkout flag to submodule update (#146) - Added contribution guidelines and CITATION file (#135)

kvrigor added 6 commits October 9, 2026 14:43

Added NVHPC support to Parflow and OASIS

1f1d2d1

Removed Stages 2023 & 2024

33f5997

GNU+PSMPI env file

5755aa8

BuildOASIS: clean first before building libraries

e91f640

New env: jsc.2026.intel.psmpi

20fc48d

kvrigor linked an issue Oct 14, 2026 that may be closed by this pull request

OASIS3-MCT fails to build under NVHPC+OpenMPI toolchain (Stages/2026) #142

Closed

Deprecated --<component-model> switches; passed --icongpu options to …

e2ee7cb

…env file

kvrigor linked an issue Oct 14, 2026 that may be closed by this pull request

Deprecate ./build_tsmp2.sh --<component-model> in favor of ./build_tsmp2.sh <component-model> #114

Closed

kvrigor and others added 11 commits October 15, 2026 14:50

eCLM-ICONGPU should build OASIS first.

2a567ec

Merge branch 'master' into env-s2026-nvhpc

dee820a

ParflowGPU NVHPC build hacks

e0773bf

ICON build hacks

381a271

Changed eCLM to 'dev-iconeclm-exchfix'

52445f9

ICONGPU should also build eCLM in coupling mode

f5d182f

eCLM: updated dev-iconeclm-exchfix

a3a0c08

use loascplscheme_exchcoef only with ICON

d319165

BuildParFlow: Error message enforcing ParFlow on GPUs for NVHPC

8eccd1d

Ensure OMPI_* vars are unset

ba9de00

kvrigor changed the title ~~Stages/2026 support on JURECA-DC and JUPITER~~ Towards TSMP2-GPU on JUPITER Oct 23, 2026

This was linked to issues Oct 23, 2026

ESiWACE3 Hackathon Planning #143

Closed

ParFlowGPU build fails on Stages/2026 NVHPC+OpenMPI #148

Closed

kvrigor mentioned this pull request Oct 23, 2026

ESiWACE3 Hackathon Planning #143

Closed

kvrigor added 4 commits October 26, 2026 14:08

BuildICON: GPU build only works on NVHPC for now.

858c3d1

BuildParflow: Removed unnecessary comment

4708287

Added comment on why SUNDIALS module was disabled

72ce734

kvrigor added 4 commits October 27, 2026 07:17

Updated eCLM to rc-0.1

9045eeb

Merged from `master` branch (PR #151)

CI: Updated OASIS to tsmp-patches-v0.2

9e6786a

Updates to OASIS mostly related to NVHPC fixes. Expected tarball checksum is d5c2618563c4883bd309b196be63313e4f60dd0f58c3d926d3ed6bebad685039

CI: OASIS version shouldn't be hardcoded

0403403

Updated tsmp-patches-v0.2 to include gfortran compile fixes

2bb90da

Details of the fix is at https://icg4geo.icg.kfa-juelich.de/ExternalReposPublic/oasis3-mct/-/commit/59e03411bbbe9e6c39612fb62402f189cc0c4a38

kvrigor marked this pull request as ready for review October 27, 2026 12:15

kvrigor requested review from AGonzalezNicolas, jjokella and s-poll October 27, 2026 12:15

AGonzalezNicolas reviewed Oct 27, 2026

View reviewed changes

AGonzalezNicolas approved these changes Oct 27, 2026

View reviewed changes

kvrigor merged commit fe82f2a into master Oct 28, 2026
7 checks passed

kvrigor deleted the env-s2026-nvhpc branch October 29, 2026 06:35

Navigation Menu

Repository navigation

Towards TSMP2-GPU on JUPITER - #147

Towards TSMP2-GPU on JUPITER#147
kvrigor merged 26 commits into
masterfrom
env-s2026-nvhpc

kvrigor commented Oct 9, 2026 •

edited

Loading

Uh oh!

kvrigor commented Oct 27, 2026

Uh oh!

AGonzalezNicolas left a comment •

edited

Loading

Uh oh!

kvrigor commented Oct 27, 2026

Uh oh!

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

kvrigor commented Oct 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kvrigor commented Oct 27, 2026

Uh oh!

AGonzalezNicolas left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

kvrigor commented Oct 27, 2026

Uh oh!

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

kvrigor commented Oct 9, 2026 •

edited

Loading

AGonzalezNicolas left a comment •

edited

Loading