added possibility to parse options for setup_code.sh and setup_processing.sh + other improvements in setup functionality

code/setup/compile_SpectralSolver.py

@@ -1,6 +1,8 @@
 #!/usr/bin/env python
-import os,string,re,damask
+
+import os,string
 from optparse import OptionParser, OptionGroup, Option, SUPPRESS_HELP
+import damask
 
 # -----------------------------
 class extendedOption(Option):

code/setup/modify_Files.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
-import os,string,re,damask
+import os,re
-
+import damask
 
 architectures = { 
                  'marc': { 
@@ -9,7 +9,6 @@ architectures = {
                          }, 
                 }
 
-
 damaskEnv = damask.Environment('../../')          # script location relative to root
 baseDir = damaskEnv.relPath('code/')
 
@@ -45,19 +44,3 @@ for line in content:
     line = '%sROOT ?= %s\n'%(m.group(1),substitution)
   makefile.write(line)
 makefile.close()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

code/setup/setup_code.sh

@@ -1,6 +1,5 @@
 #!/usr/bin/env sh
-${DAMASK_ROOT}/code/setup/setup_Makefile.py
-${DAMASK_ROOT}/code/setup/compile_SpectralSovers.py
-${DAMASK_ROOT}/code/setup/symlink_code.py
-
 
+${DAMASK_ROOT}/code/setup/modify_Files.py
+${DAMASK_ROOT}/code/setup/compile_SpectralSolver.py $@
+${DAMASK_ROOT}/code/setup/symlink_Code.py

code/setup/symlink_Code.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
-import os,string,re,damask
+import os
+import damask
 
 bin_link = { \
             '.' : [

lib/pathinfo

@@ -1,4 +1,7 @@
 # possible options are MSC, FFTW, IMKL, ACML, LAPACK
+# $id$
+# A relative path (like ./fftw/ in this example) starts from $DAMASK_ROOT/lib/
+# Do not add the proceeding /lib/ to the end of the base installation path
 
 #IMKL    /opt/intel/composerxe/mkl
 #ACML    /opt/acml4.4.0

processing/setup/compile_CoreModule.py

@@ -68,9 +68,8 @@ damaskEnv = Environment()
 baseDir = damaskEnv.relPath('processing/')
 codeDir = damaskEnv.relPath('code/')
 
-if   'imkl' in damaskEnv.pathInfo and damaskEnv.pathInfo['imkl'] != '':
+if   'imkl' in damaskEnv.pathInfo and damaskEnv.pathInfo['imkl'] != '' and options.compiler != 'gfortran':
-  if options.compiler=='gfortran': print 'GNU Fortran is not supported by IKML'
+  lib_lapack = '-L%s/lib/intel64 -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm'%(os.path.join(damaskEnv.pathInfo['imkl']))
-  lib_lapack = '-I%s/include -mkl=sequential'%(os.path.join(damaskEnv.pathInfo['imkl']))
 elif 'acml' in damaskEnv.pathInfo and damaskEnv.pathInfo['acml'] != '':
   lib_lapack = '-L%s/%s64/lib -lacml'%(os.path.join(damaskEnv.pathInfo['acml']),compiler)
 elif 'lapack' in damaskEnv.pathInfo and damaskEnv.pathInfo['lapack'] != '':

processing/setup/setup_processing.sh

@@ -1,3 +1,5 @@
 #!/usr/bin/env sh
-${DAMASK_ROOT}/processing/setup/compile_CoreModule.py
+
 ${DAMASK_ROOT}/processing/setup/symLink_Processing.py
+${DAMASK_ROOT}/processing/setup/compile_CoreModule.py $@
+

processing/setup/symLink_Processing.py

@@ -1,10 +1,8 @@
 #!/usr/bin/env python
 
 # Makes postprocessing routines acessible from everywhere.
-
+import os
-import os,glob,string
 from damask import Environment
-from optparse import OptionParser, Option
 
 damaskEnv = Environment()
 baseDir = damaskEnv.relPath('processing/')