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

2014-01-13 10:56:54 +00:00 · 2014-01-13 10:56:54 +00:00 · 3d69d9b927
parent 619ebf4c1f
commit 3d69d9b927
2 changed files with 4 additions and 1 deletions
--- a/DAMASK_env.sh
+++ b/DAMASK_env.sh
@ -8,8 +8,10 @@ else
  LOCATION=${STAT##* }
 fi
 export DAMASK_ROOT=${LOCATION}
-export DAMASK_NUM_THREADS=2
 source $DAMASK_ROOT/installation/options
+if [ "x$DAMASK_NUM_THREADS" != "x" ] 
+  then export DAMASK_NUM_THREADS=$DAMASK_NUM_THREADS
+fi
 export FFTWROOT=${FFTWROOT}
 LD_NEW=$FFTWROOT/lib
 if [ "x$LAPACKROOT" != "x" ] 
--- a/installation/options
+++ b/installation/options
@ -14,3 +14,4 @@ ACMLROOT=
 IMKLROOT=
 F90=gfortran
 MSCROOT=/msc
+DAMASK_NUM_THREADS=2