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

moved DAMASK_NUM_THREADS to options, DAMASK_env.sh gets it from there

This commit is contained in:
Martin Diehl 2014-01-13 10:56:54 +00:00
parent 619ebf4c1f
commit 3d69d9b927
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DAMASK_env.sh
View File

@ -8,8 +8,10 @@ else
LOCATION=${STAT##* } LOCATION=${STAT##* }
fi fi
export DAMASK_ROOT=${LOCATION} export DAMASK_ROOT=${LOCATION}
export DAMASK_NUM_THREADS=2
source $DAMASK_ROOT/installation/options source $DAMASK_ROOT/installation/options
if [ "x$DAMASK_NUM_THREADS" != "x" ]
then export DAMASK_NUM_THREADS=$DAMASK_NUM_THREADS
fi
export FFTWROOT=${FFTWROOT} export FFTWROOT=${FFTWROOT}
LD_NEW=$FFTWROOT/lib LD_NEW=$FFTWROOT/lib
if [ "x$LAPACKROOT" != "x" ] if [ "x$LAPACKROOT" != "x" ]

1
installation/options
View File

@ -14,3 +14,4 @@ ACMLROOT=
IMKLROOT= IMKLROOT=
F90=gfortran F90=gfortran
MSCROOT=/msc MSCROOT=/msc
DAMASK_NUM_THREADS=2