Skip to content

Commit

Permalink
Merge branch 'update.tools.setup.env' into 'master.dev'
Browse files Browse the repository at this point in the history
[update.tools.setup.env] Updated environment modules to GCC 13.1.0 + OpenMPI 4.1.5 + HDF5 1.14.0 + PETSc 3.19.3 + HOPR

See merge request piclas/piclas!825
  • Loading branch information
pnizenkov committed Jun 30, 2023
2 parents ffd30e9 + 19bf5d9 commit 86a3879
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 11 deletions.
4 changes: 4 additions & 0 deletions tools/Setup_ModuleEnv/InstallGCC.sh
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,9 @@ fi
# sudo apt-get install libmpc-dev
GCCVERSION='12.2.0'

# Check requirements and update the pre-requisites inquiry below if necessary
GCCVERSION='13.1.0'

# --------------------------------------------------------------------------------------------------
# Check pre-requisites
# --------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -149,6 +152,7 @@ if [ ! -e "${MODULEFILE}" ]; then
# Download tar.gz file from FTP server
if [ ! -f ${TARFILE} ]; then
wget -O gcc-${GCCVERSION}.tar.gz "ftp://ftp.fu-berlin.de/unix/languages/gcc/releases/gcc-${GCCVERSION}/gcc-${GCCVERSION}.tar.gz"
#wget -O gcc-${GCCVERSION}.tar.gz ".de/mirrors/gnu/mirror/gcc.gnu.org/pub/gcc/releases/gcc-${GCCVERSION}/gcc-${GCCVERSION}.tar.gz"
fi

# Check if tar.gz file was correctly downloaded, abort script if non-existent
Expand Down
4 changes: 2 additions & 2 deletions tools/Setup_ModuleEnv/InstallHDF5.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ do
then
LOADMODULES=0
# Set desired versions
USECOMPILERVERSION=11.2.0
USEMPIVERSION=4.1.1
USECOMPILERVERSION=13.1.0
USEMPIVERSION=4.1.5
# Force --rerun via 'set'
echo ""
echo "Running '-m' with GCC $USECOMPILERVERSION and OpenMPI $USEMPIVERSION"
Expand Down
12 changes: 8 additions & 4 deletions tools/Setup_ModuleEnv/InstallHOPR.sh
Original file line number Diff line number Diff line change
Expand Up @@ -96,23 +96,27 @@ do
#CMAKEVERSION=3.15.3-d
#CMAKEVERSION=3.17.0-d
#CMAKEVERSION=3.20.3
CMAKEVERSION=3.21.3
#CMAKEVERSION=3.21.3
CMAKEVERSION=3.24.2

#GCCVERSION=9.2.0
#GCCVERSION=9.3.0
#GCCVERSION=10.1.0
#GCCVERSION=10.2.0
GCCVERSION=11.2.0
#GCCVERSION=11.2.0
GCCVERSION=13.1.0

#OPENMPIVERSION=3.1.4
#OPENMPIVERSION=4.0.1
#OPENMPIVERSION=4.0.2
#OPENMPIVERSION=3.1.6
OPENMPIVERSION=4.1.1
#OPENMPIVERSION=4.1.1
OPENMPIVERSION=4.1.5

#HDF5VERSION=1.10.5
#HDF5VERSION=1.10.6
HDF5VERSION=1.12.1
#HDF5VERSION=1.12.1
HDF5VERSION=1.14.0
fi

# Check if re-run mode is selected by the user
Expand Down
3 changes: 2 additions & 1 deletion tools/Setup_ModuleEnv/InstallMPIallCOMPILERS.sh
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ if [ "${WHICHMPI}" == "openmpi" ]; then
#MPIVERSION=4.0.1
#MPIVERSION=4.0.5
#MPIVERSION=4.1.1
MPIVERSION=4.1.4
#MPIVERSION=4.1.4
MPIVERSION=4.1.5
elif [ "${WHICHMPI}" == "mpich" ]; then
# DOWNLOAD and INSTALL MPICH (example mpich-3.2.0)
MPIVERSION=3.2
Expand Down
11 changes: 7 additions & 4 deletions tools/Setup_ModuleEnv/InstallPETSc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -103,14 +103,16 @@ do
#GCCVERSION=10.1.0
#GCCVERSION=10.2.0
#GCCVERSION=11.2.0
GCCVERSION=12.2.0
#GCCVERSION=12.2.0
GCCVERSION=13.1.0

#OPENMPIVERSION=3.1.4
#OPENMPIVERSION=4.0.1
#OPENMPIVERSION=4.0.2
#OPENMPIVERSION=3.1.6
#OPENMPIVERSION=4.1.1
OPENMPIVERSION=4.1.4
#OPENMPIVERSION=4.1.4
OPENMPIVERSION=4.1.5

fi

Expand All @@ -126,10 +128,11 @@ WHICHMPI=openmpi

# DOWNLOAD and INSTALL PETSc (example PETSc-3.17.0)
#PETSCVERSION=3.17.0
PETSCVERSION=3.18.4
#PETSCVERSION=3.18.4
PETSCVERSION=3.19.3

# Activate DEBUGGING MODE with ON/OFF
DEBUG=ON
DEBUG=OFF

if [[ ${DEBUG} == 'ON' ]]; then
DEBUGDIR='_debug'
Expand Down

0 comments on commit 86a3879

Please sign in to comment.