223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

removed some no longer used defaults 

added library path for fftw
This commit is contained in:
Franz Roters 2012-01-17 08:37:09 +00:00
parent ae6abedee7
commit 0b5a1a8925
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
installation/mods_MarcMentat/apply_DAMASK_modifications
View File

@ -1,7 +1,5 @@
#!/bin/bash #!/bin/bash
DEFAULT_INSTALLDIR='/msc'
DEFAULT_ACMLDIR='/opt/acml4.0.0'
DEFAULT_VERSION='2011' DEFAULT_VERSION='2011'
WORKINGDIR=`dirname $0` WORKINGDIR=`dirname $0`
@ -18,16 +16,13 @@ echo "MSC version: $VERSION"
INSTALLDIR='' INSTALLDIR=''
if [ -f $WORKINGDIR/../../lib/pathinfo ]; then if [ -f $WORKINGDIR/../../lib/pathinfo ]; then
INSTALLDIR=`grep -vE "^[[:space:]]*#|^$" $WORKINGDIR/../../lib/pathinfo | grep msc | head -n1 | awk 'BEGIN { FS = "[ \t]+" } ; { print $2 }'` INSTALLDIR=`grep -vE "^[[:space:]]*#|^$" $WORKINGDIR/../../lib/pathinfo | grep -i msc | head -n1 | awk 'BEGIN { FS = "[ \t]+" } ; { print $2 }'`
fi fi
while [ ! -d "$INSTALLDIR" ] || [ -z "$INSTALLDIR" ] while [ ! -d "$INSTALLDIR" ] || [ -z "$INSTALLDIR" ]
do do
echo "Input path of MARC/MENTAT installation: [${DEFAULT_INSTALLDIR}]" echo "Input path of MARC/MENTAT installation:"
read INSTALLDIR read INSTALLDIR
if [ -z $INSTALLDIR ]; then
INSTALLDIR=${DEFAULT_INSTALLDIR}
fi
done done
INSTALLDIR=${INSTALLDIR%/} # remove trailing slash INSTALLDIR=${INSTALLDIR%/} # remove trailing slash
@ -35,6 +30,7 @@ echo "MSC installation path: $INSTALLDIR"
BLASDIR='' BLASDIR=''
FFTWDIR='' FFTWDIR=''
BLASTYPE=''
if [ -f $WORKINGDIR/../../lib/pathinfo ]; then if [ -f $WORKINGDIR/../../lib/pathinfo ]; then
IKMLDIR=`grep -vE "^[[:space:]]*#|^$" $WORKINGDIR/../../lib/pathinfo | grep -i ikml | head -n1 | awk 'BEGIN { FS = "[ \t]+" } ; { print $2 }'` IKMLDIR=`grep -vE "^[[:space:]]*#|^$" $WORKINGDIR/../../lib/pathinfo | grep -i ikml | head -n1 | awk 'BEGIN { FS = "[ \t]+" } ; { print $2 }'`
ACMLDIR=`grep -vE "^[[:space:]]*#|^$" $WORKINGDIR/../../lib/pathinfo | grep -i acml | head -n1 | awk 'BEGIN { FS = "[ \t]+" } ; { print $2 }'` ACMLDIR=`grep -vE "^[[:space:]]*#|^$" $WORKINGDIR/../../lib/pathinfo | grep -i acml | head -n1 | awk 'BEGIN { FS = "[ \t]+" } ; { print $2 }'`
@ -56,7 +52,7 @@ while [ ! -d "$BLASDIR" ] || [ -z "$BLASDIR" ]
do do
echo "Input path of BLAS installation:" echo "Input path of BLAS installation:"
read BLASDIR read BLASDIR
echo "Input path of BLAS installation [IKML | ACML | LAPACK]:" echo "Input type of BLAS installation [IKML | ACML | LAPACK]:"
read BLASTYPE read BLASTYPE
done done
@ -76,7 +72,7 @@ case $BLASTYPE in
BLAS=" -L$BLASDIR/ifort64_mp/lib -lacml_mp" BLAS=" -L$BLASDIR/ifort64_mp/lib -lacml_mp"
;; ;;
LAPACK | lapack) LAPACK | lapack)
BLAS=" -L$BLASDIR/lib -L$BLASDIR/lib64 -llapack" BLAS=" -L$BLASDIR/lib64 -L$BLASDIR/lib -llapack"
;; ;;
*) *)
echo "error, BLAS type must be IKML, ACML, or LAPACK" echo "error, BLAS type must be IKML, ACML, or LAPACK"
@ -84,7 +80,7 @@ case $BLASTYPE in
;; ;;
esac esac
FFTW=" -lfftw3" FFTW=" -L$FFTWDIR/lib -lfftw3"
# tools # tools
echo '' echo ''