Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
[submodule "models/eCLM"]
path = models/eCLM
url = https://github.com/HPSCTerrSys/eCLM.git
branch = beta-0.6
branch = beta-0.7
[submodule "models/oasis3-mct"]
path = models/oasis3-mct
url = https://icg4geo.icg.kfa-juelich.de/ExternalReposPublic/oasis3-mct
Expand Down
2 changes: 1 addition & 1 deletion env/default.2025.env
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 2 additions & 1 deletion env/uni-bonn.gnu.openmpi
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -32,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
Expand Down
Loading