From 0f78f01c1189f849595793637cb4335c6e23bca9 Mon Sep 17 00:00:00 2001 From: kvrigor Date: Tue, 16 Jun 2026 16:38:18 +0200 Subject: [PATCH 1/5] eCLM: Made LAPACK lib required --- .gitmodules | 2 +- models/eCLM | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index b795dd8..a5ceb97 100644 --- a/.gitmodules +++ b/.gitmodules @@ -17,7 +17,7 @@ [submodule "models/eCLM"] path = models/eCLM url = https://github.com/HPSCTerrSys/eCLM.git - branch = beta-0.6 + branch = dev-eclm-lapack-fix [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 98054f5..ae7ca8d 160000 --- a/models/eCLM +++ b/models/eCLM @@ -1 +1 @@ -Subproject commit 98054f5eb6df272fb79183b8d87f3f8e8a626131 +Subproject commit ae7ca8dbc5fc9bf2af77a9b67db5238de4e02b52 From db32985ac65ab7c03c23dc2dcf7341b80f86e44f Mon Sep 17 00:00:00 2001 From: Marco van Hulten Date: Wed, 17 Jun 2026 12:58:32 +0200 Subject: [PATCH 2/5] Load LAPACK on Marvin Fixes #118 --- env/uni-bonn.gnu.openmpi | 1 + 1 file changed, 1 insertion(+) diff --git a/env/uni-bonn.gnu.openmpi b/env/uni-bonn.gnu.openmpi index fca4ac0..fcb5585 100644 --- a/env/uni-bonn.gnu.openmpi +++ b/env/uni-bonn.gnu.openmpi @@ -12,6 +12,7 @@ module --force purge # Primary compiler toolchain module load GCC/12.3.0 module load OpenMPI/4.1.5-GCC-12.3.0 +module load ScaLAPACK/2.2.0-gompi-2023a-fb # Basic scripting and build tools module load Python/3.11.3-GCCcore-12.3.0 From 11c38a2f46c58be5baf0b3b6400dc44b9a5923f8 Mon Sep 17 00:00:00 2001 From: Marco van Hulten Date: Wed, 17 Jun 2026 13:17:14 +0200 Subject: [PATCH 3/5] Fixed Marvin's SYSTEMNAME to 'marvin' This is what the default script would also set and this is consistent with the handling for Ubuntu. --- env/uni-bonn.gnu.openmpi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/env/uni-bonn.gnu.openmpi b/env/uni-bonn.gnu.openmpi index fcb5585..a3be772 100644 --- a/env/uni-bonn.gnu.openmpi +++ b/env/uni-bonn.gnu.openmpi @@ -33,7 +33,7 @@ module load Tcl/8.6.13-GCCcore-12.3.0 module load ecCodes/2.31.0-gompi-2023a # Set SYSTEMNAME and STAGE for Marvin -export SYSTEMNAME="Marvin" +export SYSTEMNAME="marvin" export STAGE="${EBVERSIONGOMPI}${EBVERSIONIIMPI}" # Set default compilers From 9781d235ec5a4a0fa30c04cf157f5e425cf65cf1 Mon Sep 17 00:00:00 2001 From: Marco van Hulten Date: Wed, 17 Jun 2026 13:18:04 +0200 Subject: [PATCH 4/5] Prefer $SYSTEMNAME over $(hostname) for nice printing When having to find out what could've gone wrong, both strings can be interesting,but I think it is more convenient to see ${SYSTEMNAME}. --- env/default.2025.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/env/default.2025.env b/env/default.2025.env index 3e1a6ca..510f29e 100644 --- a/env/default.2025.env +++ b/env/default.2025.env @@ -41,7 +41,7 @@ elif [[ $SYSTEMNAME == *"marvin"* ]]; then elif [[ $SYSTEMNAME == *"UBUNTU"* ]]; then export TSMP2_ENV_FILE=${env_dir}/ubuntu.gnu.openmpi else - echo "WARNING: Unknown default environment for machine '$(hostname)'" + echo "WARNING: Unknown default environment for machine '${SYSTEMNAME}'" known_machine="false" fi From 7964c16d1abc8eda05d2f194feb675fd674d8214 Mon Sep 17 00:00:00 2001 From: kvrigor Date: Wed, 17 Jun 2026 15:41:40 +0200 Subject: [PATCH 5/5] eCLM: Updated to beta-0.7 --- .gitmodules | 2 +- models/eCLM | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index a5ceb97..a20571b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -17,7 +17,7 @@ [submodule "models/eCLM"] path = models/eCLM url = https://github.com/HPSCTerrSys/eCLM.git - branch = dev-eclm-lapack-fix + branch = beta-0.7 [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 ae7ca8d..81bc52f 160000 --- a/models/eCLM +++ b/models/eCLM @@ -1 +1 @@ -Subproject commit ae7ca8dbc5fc9bf2af77a9b67db5238de4e02b52 +Subproject commit 81bc52f4d0e9275f8b87d186978e8198093b4927