Commit 6a8c66e9 authored by Alex Breuer's avatar Alex Breuer

Removed NetCDF-dependency from convergence scripts.

parent bdeb29ce
......@@ -38,14 +38,13 @@ function exec {
# Usage info
show_help() {
cat << EOF
Usage: ${0##*/} [-h] [-a ARCH-x XSMM -z ZLIB -5 HDF5 -n NETCDF -m MOAB -q EQUATIONS -t ELEMENTS -p PRECISION -o ORDERS -r RUNS -l CLENGTHS -c CODE_DIR -w WORK_DIR -d RESULT_DIR]
Usage: ${0##*/} [-h] [-a ARCH-x XSMM -z ZLIB -5 HDF5 -m MOAB -q EQUATIONS -t ELEMENTS -p PRECISION -o ORDERS -r RUNS -l CLENGTHS -c CODE_DIR -w WORK_DIR -d RESULT_DIR]
Runs the convergence benchmarks.
-h
-a ARCH ARCH-option passed to EDGE's build-script.
-x XSMM XSMM-option passed to EDGE's build-script.
-z ZLIB zlib-option passed to EDGE's build-script.
-5 HDF5 HDF5-option passed to EDGE's build-script.
-n NETCDF NetCDF-option passed to EDGE's build-script.
-m MOAB MOAB-option passed to EDGE's build-script.
-q EQUATIONS solved equations (either 'advection', 'elastic', or 'elastic+rupture').
-t ELEMENTS used elements (either 'line', 'tria3', 'quad4r', 'hex8r' or 'tet4'.
......@@ -77,8 +76,6 @@ while getopts "ha:x:q:t:p:o:r:m:l:c:w:d:" opt; do
;;
5) HDF5=$OPTARG
;;
n) NETCDF=$OPTARG
;;
m) MOAB=$OPTARG
;;
q) EQUATIONS=$OPTARG
......@@ -143,14 +140,6 @@ else
echo " HDF5: ${HDF5}"
fi
if [ "${NETCDF}" == "" ]
then
echo ' NETCDF not set, disabling.'
NETCDF=no
else
echo " NETCDF: ${NETCDF}"
fi
if [ "${MOAB}" == "" ]
then
echo ' MOAB not set, disabling.'
......@@ -310,7 +299,7 @@ do
echo "building code"
exec cd code
pwd
exec scons xml=../configs/${MESH}_${ELEMENTS}_${or}_${cl}.xml arch=${ARCH} precision=${PRECISION} xsmm=${XSMM} zlib=${ZLIB} hdf5=${HDF5} netcdf=${NETCDF} moab=${MOAB} -j 4
exec scons xml=../configs/${MESH}_${ELEMENTS}_${or}_${cl}.xml arch=${ARCH} precision=${PRECISION} xsmm=${XSMM} zlib=${ZLIB} hdf5=${HDF5} moab=${MOAB} -j 4
exec cd ..
for cl in $CLENGTHS
......
......@@ -32,8 +32,6 @@
export OMP_NUM_THREADS=24
module load netcdf
export LIBRARY_PATH=/opt/netcdf/4.3.2/intel/mvapich2_ib/lib/:$LIBRARY_PATH
export PATH=/oasis/projects/nsf/sds143/breuera/software/build/bin:$PATH
cd TEMPLATE_RUN_DIR
......
......@@ -36,7 +36,6 @@ export PATH=/home/Xabreue/software/bin:$PATH
export PATH=/opt/crtdc/binutils/2.24/bin/:$PATH
# load recent gcc
source /opt/crtdc/netcdf/source_swtool.sh
source /opt/crtdc/gcc/source_swtool.sh
source /opt/crtdc/mpfr/source_swtool.sh
source /opt/crtdc/mpc/source_swtool.sh
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment