From 34664681321f48b10a6cb93b349d2719bc35c8e5 Mon Sep 17 00:00:00 2001 From: kvrigor Date: Mon, 26 Oct 2026 14:37:15 +0100 Subject: [PATCH 1/4] Removed unsupported envs: Stages/2023 and Stages/2024 --- env/jsc.2023.intel.psmpi | 34 ------------------------------- env/jsc.2024.intel.psmpi | 44 ---------------------------------------- 2 files changed, 78 deletions(-) delete mode 100644 env/jsc.2023.intel.psmpi delete mode 100644 env/jsc.2024.intel.psmpi diff --git a/env/jsc.2023.intel.psmpi b/env/jsc.2023.intel.psmpi deleted file mode 100644 index 3b9ac71e..00000000 --- a/env/jsc.2023.intel.psmpi +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env bash - -# Load modules -module --force purge -module use $OTHERSTAGES -module load Stages/2023 -module load Intel/2022.1.0 -module load ParaStationMPI/5.7.0-1 -# -module load Hypre/2.27.0-cpu -module load Silo/4.11 -module load Tcl/8.6.12 -# -module load ecCodes/2.27.0 -module load HDF5/1.12.2-serial -module load netCDF/4.9.0 -module load netCDF-Fortran/4.6.0 -module load PnetCDF/1.12.3 -module load cURL/7.83.0 -module load Szip/.2.1.1 -module load Python/3.10.4 -module load NCO/5.1.3 -module load CMake/3.23.1 -module load git/2.36.0-nodocs - -module load pkgconf/.1.8.0 - -module li - -# Set default compilers -export CC=mpicc -export FC=mpif90 -export CXX=mpicxx -export MPI_HOME=$EBROOTPSMPI diff --git a/env/jsc.2024.intel.psmpi b/env/jsc.2024.intel.psmpi deleted file mode 100644 index 2908f650..00000000 --- a/env/jsc.2024.intel.psmpi +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env bash - -# Load modules -module --force purge -module use $OTHERSTAGES -module load Stages/2024 -module load Intel/2023.2.1 -module load ParaStationMPI/5.9.2-1 -#module load IntelMPI/2021.10.0 - -# -module load Hypre/2.31.0-cpu -module load Silo/4.11.1 -module load Tcl/8.6.13 -# -module load ecCodes/2.31.0 -module load HDF5/1.14.2 -module load netCDF/4.9.2 -module load netCDF-Fortran/4.6.1 -module load PnetCDF/1.12.3 -module load cURL/8.0.1 -module load Szip/.2.1.1 -module load Python/3.11.3 -module load NCO/5.1.8 -module load CMake/3.26.3 -module load git/2.41.0-nodocs - -# Set default compilers -export CC=mpicc -export FC=mpif90 -export CXX=mpicxx -export MPI_HOME=$EBROOTPSMPI - -# Display compiler settings -module li -echo "====================================== COMPILER SETTINGS ======================================" -echo " Machine: ${SYSTEMNAME} on Stages/$STAGE" -echo " MPI lib: $(mpichversion | head -n 1 | tr -d =)" -echo " C: $($CC --version | head -n 1)" -echo " C++: $($CXX --version | head -n 1)" -echo " Fortran: $($FC --version | head -n 1)" -echo "===============================================================================================" -echo "" - From b0ddbf97e9e162d1bc26529ea528d1a391056e3d Mon Sep 17 00:00:00 2001 From: kvrigor Date: Mon, 26 Oct 2026 14:44:43 +0100 Subject: [PATCH 2/4] CI: Removed 'ICON standalone' job and downloaded OASIS from Datapub --- .github/workflows/CI.yml | 51 ++++------------------------------------ 1 file changed, 5 insertions(+), 46 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 25ab893d..4bffd326 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -28,16 +28,6 @@ jobs: parflow_dir: "parflow", model_opts: "eCLM ParFlowGPU" } - - { - name: "ICON standalone", - use_oasis: "False", - model_opts: "ICON" - } -# - { -# name: "CLM3.5-PDAF", -# use_oasis: "False", -# model_opts: "CLM3.5 PDAF" -# } - { name: "eCLM-PDAF", use_oasis: "False", @@ -68,7 +58,6 @@ jobs: VER_HYPRE: 2.33.0 VER_ECCODES: 2.40.0 VER_OASIS: tsmp-patches-v0.1 - VER_ICON_UPSTREAM: release-2026.04-public MAKE_JOBS: 4 steps: @@ -328,9 +317,7 @@ jobs: echo "VER_ParFlow=${VER_ParFlow}" >> $GITHUB_OUTPUT fi - if [[ "${{ matrix.config.name }}" == "ICON standalone" ]]; then - echo "${{ env.VER_ICON_UPSTREAM }} => VER_ICON_UPSTREAM" - elif [[ "${{ matrix.config.name }}" == *"ICON"* ]]; then + if [[ "${{ matrix.config.name }}" == *"ICON"* ]]; then VER_ICON=$(cat model_versions | grep -w "icon" | cut -d' ' -f1) echo "${VER_ICON} => VER_ICON" echo "VER_ICON=${VER_ICON}" >> $GITHUB_OUTPUT @@ -357,7 +344,10 @@ jobs: name: Update OASIS3-MCT submodule ${{ steps.model-versions.outputs.VER_OASIS }} working-directory: ${{ env.TSMP2_ROOT }} run: | - pwd && git clone -b $VER_OASIS https://icg4geo.icg.kfa-juelich.de/ExternalReposPublic/oasis3-mct.git + pwd + wget --quiet https://datapub.fz-juelich.de/slts/sw_hpscterrys/oasis3-mct-${VER_OASIS}.tar.gz + tar xf oasis3-mct-${VER_OASIS}.tar.gz + mv oasis3-mct-${VER_OASIS} oasis3-mct - if: matrix.config.use_oasis == 'True' && steps.cache-oasis-restore.outputs.cache-hit != 'true' name: Cache OASIS3-MCT ${{ env.VER_OASIS }} @@ -411,30 +401,6 @@ jobs: run: | pwd && git submodule update --init --force . - # - # ICON Standalone - # - - if: matrix.config.name == 'ICON standalone' - name: Restore cached ICON standalone ${{ env.VER_ICON_UPSTREAM }} - uses: actions/cache/restore@v4 - id: cache-icon-standalone-restore - with: - path: ${{ env.TSMP2_ROOT }}/models/icon-model - key: ${{ matrix.config.name }}_icon-${{ env.VER_ICON_UPSTREAM }} - - - if: matrix.config.name == 'ICON standalone' && steps.cache-icon-standalone-restore.outputs.cache-hit != 'true' - name: Update ICON standalone ${{ env.VER_ICON_UPSTREAM }} - working-directory: ${{ env.TSMP2_ROOT }}/models - run: | - pwd && git clone -b ${{ env.VER_ICON_UPSTREAM }} --recursive https://gitlab.dkrz.de/icon/icon-model.git - - - if: matrix.config.name == 'ICON standalone' && steps.cache-icon-standalone-restore.outputs.cache-hit != 'true' - name: Cache ICON standalone ${{ env.VER_ICON_UPSTREAM }} - uses: actions/cache/save@v4 - with: - path: ${{ env.TSMP2_ROOT }}/models/icon-model - key: ${{ matrix.config.name }}_icon-${{ env.VER_ICON_UPSTREAM }} - # # Pre-build checks # @@ -446,10 +412,6 @@ jobs: echo "Entering 'oasis3-mct'" echo "$(git -C oasis3-mct describe --tags --always)" fi - if [[ "${{ matrix.config.name }}" == "ICON standalone" ]]; then - echo "Entering 'models/icon-model'" - echo "$(git -C models/icon-model describe --tags --always)" - fi - name: Check TSMP2 dependencies working-directory: ${{ env.DEPENDENCIES_ROOT }} @@ -469,9 +431,6 @@ jobs: if [[ "${{ matrix.config.use_oasis }}" == "True" ]]; then MODEL_OPTS="${MODEL_OPTS} --OASIS_SRC ${TSMP2_ROOT}/oasis3-mct" fi - if [[ "${{ matrix.config.name }}" == "ICON standalone" ]]; then - MODEL_OPTS="${MODEL_OPTS} --ICON_SRC ${TSMP2_ROOT}/models/icon-model" - fi BUILD_TSMP2_CMD="./build_tsmp2.sh ${MODEL_OPTS} --no_update --parallel ${MAKE_JOBS}" echo $BUILD_TSMP2_CMD && echo "" eval $BUILD_TSMP2_CMD From 7642928941f4843c298ba3cd927ede8b4d90f838 Mon Sep 17 00:00:00 2001 From: kvrigor Date: Mon, 26 Oct 2026 15:05:09 +0100 Subject: [PATCH 3/4] OASIS sha256 checksum for tsmp-patches-v0.1 Expected checksum is 9b1d8d24efbff1ce7d2b2e4fd75249ea3a9c647c57e4c0a652dc7de695c5ec49 --- .github/workflows/CI.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 4bffd326..70428b68 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -58,6 +58,7 @@ jobs: VER_HYPRE: 2.33.0 VER_ECCODES: 2.40.0 VER_OASIS: tsmp-patches-v0.1 + CHECKSUM_OASIS: 9b1d8d24efbff1ce7d2b2e4fd75249ea3a9c647c57e4c0a652dc7de695c5ec49 MAKE_JOBS: 4 steps: @@ -346,6 +347,7 @@ jobs: run: | pwd wget --quiet https://datapub.fz-juelich.de/slts/sw_hpscterrys/oasis3-mct-${VER_OASIS}.tar.gz + echo "${CHECKSUM_OASIS} oasis3-mct-tsmp-patches-v0.1.tar.gz" | sha256sum -c tar xf oasis3-mct-${VER_OASIS}.tar.gz mv oasis3-mct-${VER_OASIS} oasis3-mct From 22c31da1069f73317e6884610723e7ccd101f4f5 Mon Sep 17 00:00:00 2001 From: kvrigor Date: Mon, 26 Oct 2026 15:07:57 +0100 Subject: [PATCH 4/4] Updated eCLM to rc-0.1 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) --- .gitmodules | 2 +- models/eCLM | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 2725566e..8804fdec 100644 --- a/.gitmodules +++ b/.gitmodules @@ -17,7 +17,7 @@ [submodule "models/eCLM"] path = models/eCLM url = https://github.com/HPSCTerrSys/eCLM.git - branch = master-parallel-build + branch = rc-0.1 [submodule "models/oasis3-mct"] path = models/oasis3-mct url = https://icg4geo.icg.kfa-juelich.de/ExternalReposPublic/oasis3-mct diff --git a/models/eCLM b/models/eCLM index 8d9ca1ea..9c8f1ae2 160000 --- a/models/eCLM +++ b/models/eCLM @@ -1 +1 @@ -Subproject commit 8d9ca1ea7a3418335527568417a889ef3f259634 +Subproject commit 9c8f1ae22afc9e47ffee46f24da4fb367736c77f