Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename arolla to tsa #236

Merged
merged 4 commits into from
Jan 23, 2020
Merged

Rename arolla to tsa #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9bee106
Renamed env_arolla to env_tsa and changed all instances of arolla
Jan 23, 2020
10cbbbf
also support arolla
havogt Jan 23, 2020
4640642
improve error message
havogt Jan 23, 2020
b3516ac
fix cmake
havogt Jan 23, 2020
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
6 changes: 4 additions & 2 deletions tools/cscs-scripts/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,9 @@ elif [ "$(hostname | grep kesch)" != "" ] ; then
elif [ "$(hostname | grep daint)" != "" ] ; then
MYHOST="daint"
elif [ "$(hostname | grep arolla)" != "" ] ; then
MYHOST="arolla"
MYHOST="tsa"
elif [ "$(hostname | grep tsa)" != "" ] ; then
MYHOST="tsa"
elif [ "$(hostname | grep tave)" != "" ] ; then
MYHOST="tave"
else
Expand Down Expand Up @@ -195,7 +197,7 @@ fi

#NetCDF
SERIALBOX_USE_NETCDF=OFF
if [ "${FC_COMPILER}" = "gfortran" ] && [ "$MYHOST" != "arolla" ]; then
if [ "${FC_COMPILER}" = "gfortran" ] && [ "$MYHOST" != "tsa" ]; then
SERIALBOX_USE_NETCDF=ON
fi

Expand Down
16 changes: 6 additions & 10 deletions tools/cscs-scripts/env_arolla.sh → tools/cscs-scripts/env_tsa.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,31 +69,27 @@ fi
module load craype-x86-skylake
module load craype-network-infiniband
module load slurm
module load cmake/3.14.3
module load cmake/3.14.5

if [ "$FC_COMPILER" = "pgfortran" ]; then
module load PrgEnv-pgi/19.4
module load PrgEnv-pgi
module load gcc
elif [ "$FC_COMPILER" = "ftn" ]; then
module load PrgEnv-cray
module load gcc
echo "$FC_COMPILER not available on tsa"
exit 1
elif [ "$FC_COMPILER" = "ifort" ]; then
echo "not defined"
echo "$FC_COMPILER not available on tsa"
exit 1
else
module load PrgEnv-gnu
fi

#module load netcdf-c++/4.3.0-gmvolf-18.12
#module load hdf5/1.10.5-gmvolf-18.12
#export NETCDF_ROOT=${EBROOTNETCDF}

export CXX=$(which g++)
export CC=$(which gcc)
export FC=$(which $FC_COMPILER)

export Boost_NO_SYSTEM_PATHS=true
export Boost_NO_BOOST_CMAKE=true

export BOOST_ROOT=/project/c14/install/daint/boost/boost_1_67_0
export BOOST_ROOT=/project/c14/install/tsa/boost/boost_1_67_0