Merge branch 'master' into romain

cfg/CentOs6/comp.cfg

+self.pars['CMAKELIST'].val='centos6.cmake'
+self.pars['NB_TASKS'].val='6'
+self.pars['NB_THREADS'].val='1'
+self.pars['RUNMETHOD'].vals=['interactive','at','batch']
+self.pars['RUNMETHOD'].val='batch'

cfg/CentOs6/launch.cfg

+self.pars['NB_THREADS'].val='4'
+self.pars['NB_TASKS'].val='1'
+self.pars['RUNMETHOD'].vals=['interactive','at','batch', 'sge']
+self.pars['RUNMETHOD'].val='sge'
+self.pars['QUEUE'].val='defq'
+self.pars['SGE_PE'].val='snode'
+self.pars['SGEARGS'].val=''
+self.pars['TIME'].val='0-1:00:00'
+self.pars['MEMORY'].val='1000'

cfg/blueberry/comp.cfg

+self.pars['CMAKELIST'].val='gaston.cmake'
+self.pars['NB_TASKS'].val='6'
+self.pars['NB_THREADS'].val='1'
+self.pars['RUNMETHOD'].vals=['interactive','at','batch',]
+self.pars['RUNMETHOD'].val='batch'

cfg/blueberry/launch.cfg

+self.pars['NB_THREADS'].val='6'
+self.pars['NB_TASKS'].val='1'
+self.pars['RUNMETHOD'].vals=['interactive','at','batch']
+self.pars['RUNMETHOD'].val='batch'

cfg/clifton/comp.cfg

+self.pars['CMAKELIST'].val='gaston.cmake'
+self.pars['NB_TASKS'].val='6'
+self.pars['NB_THREADS'].val='1'
+self.pars['RUNMETHOD'].vals=['interactive','at','batch',]
+self.pars['RUNMETHOD'].val='batch'

cfg/clifton/launch.cfg

+self.pars['NB_THREADS'].val='6'
+self.pars['NB_TASKS'].val='1'
+self.pars['RUNMETHOD'].vals=['interactive','at','batch']
+self.pars['RUNMETHOD'].val='batch'

cfg/fabulous/comp.cfg

+self.pars['CMAKELIST'].val='fabulous.cmake'
+self.pars['NB_TASKS'].val='8'
+self.pars['NB_THREADS'].val='1'
+self.pars['RUNMETHOD'].vals=['interactive',]
+self.pars['RUNMETHOD'].val='interactive'

cfg/fabulous/launch.cfg

+self.pars['NB_THREADS'].val='12'
+self.pars['NB_TASKS'].val='1'
+self.pars['RUNMETHOD'].vals=['interactive','slurm']
+self.pars['RUNMETHOD'].val='slurm'
+self.pars['QUEUE'].val='defq'
+self.pars['MEMORY'].val='1000'
+self.pars['TIME'].val='0-1:00:00'
+self.pars['LOCALDISK'].val=True

cfg/frontal3/launch.cfg

+self.pars['MAIL_ADDR'].val='CanonicalEmailAdress'
+self.pars['NB_TASKS'].val='1'
+self.pars['NB_THREADS'].val='24'
+self.pars['MULTITEST'].val=False
+self.pars['LOCALDISK'].val=False
+self.pars['TIME'].val='1:00:00'
+self.pars['MEMORY'].val='1000'
+self.pars['QUEUE'].val='main'
+self.pars['PROJECT'].val='hpcwe'
+self.pars['RUNMETHOD'].vals=['pbs',]
+self.pars['RUNMETHOD'].val='pbs'
+self.pars['MODEL'].vals=['auto','westemere','westmere_fat','westmere_xfat','ivyBridge','haswell_xfat',]
+self.pars['MODEL'].val='auto'
+self.pars['EXEC_NAME'].val='e:\\Dev64\\Offi\\linuxbin\\Metafor.exe'

cfg/frontal3/ls_colors.bashrc

+LS_COLORS='di=01;34:ln=01;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:su=37;41:sg=30;43:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.dz=01;31:*.gz=01;31:*.lz=01;31:*.xz=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.jpg=01;35:*.jpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.axv=01;35:*.anx=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.axa=00;36:*.oga=00;36:*.spx=00;36:*.xspf=00;36'
+export LS_COLORS

cfg/frontal3/modules.profile

+
+module load python/2.7
+module load swig/3.0.10/64/gcc/4.4.7
+module load compiler/gcc/6.4.0
+module load cmake/3.11.1/64/gcc/5.5.0
+
+. /softs/intel/compilers_and_libraries_2018.5.274/linux/mkl/bin/mklvars.sh intel64
+. /softs/intel/compilers_and_libraries_2018.5.274/linux/tbb/bin/tbbvars.sh intel64
+. /softs/intel/compilers_and_libraries_2018.5.274/linux/bin/compilervars.sh intel64
+export INTEL_LICENSE_FILE=/softs/intel/licenses
+
+# sinon cmake prend /usr/bin/cc meme si gcc est dans le PATH!
+export CC=gcc
+export CXX=g++
+export FC=gfortran
+
+#icc
+#export CC=$(which icc)
+#export CXX=$(which icpc)
+#export FC=$(which ifort)

cfg/frontal3/python.profile

+# python recompile (probleme avec la version recompilee en module)
+add2env PATH "/projects/acad/hpcwe/softs/python/bin" front
+add2env LD_LIBRARY_PATH "/projects/acad/hpcwe/softs/python/lib" front
+add2env CMAKE_PREFIX_PATH "/projects/acad/hpcwe/softs/python" front

cfg/gaston/comp.cfg

+self.pars['CMAKELIST'].val='gaston.cmake'
+self.pars['NB_TASKS'].val='6'
+self.pars['NB_THREADS'].val='1'
+self.pars['RUNMETHOD'].vals=['interactive','at','batch',]
+self.pars['RUNMETHOD'].val='batch'

cfg/gaston/launch.cfg

+self.pars['NB_THREADS'].val='6'
+self.pars['NB_TASKS'].val='1'
+self.pars['RUNMETHOD'].vals=['interactive','at','batch']
+self.pars['RUNMETHOD'].val='batch'

cfg/spring/comp.cfg

+self.pars['CMAKELIST'].val='spring.cmake'
+self.pars['NB_TASKS'].val='4'
+self.pars['NB_THREADS'].val='1'
+self.pars['RUNMETHOD'].vals=['interactive','at','batch',]
+self.pars['RUNMETHOD'].val='batch'

cfg/spring/launch.cfg

+self.pars['NB_THREADS'].val='4'
+self.pars['NB_TASKS'].val='1'
+self.pars['RUNMETHOD'].vals=['interactive','at','batch']
+self.pars['RUNMETHOD'].val='batch'

cfg/thorgal/comp.cfg

+self.pars['CMAKELIST'].val='thorgal.cmake'
+self.pars['NB_TASKS'].val='4'
+self.pars['NB_THREADS'].val='1'
+self.pars['RUNMETHOD'].vals=['interactive','at','batch',]
+self.pars['RUNMETHOD'].val='batch'

cfg/thorgal/launch.cfg

+self.pars['NB_THREADS'].val='4'
+self.pars['NB_TASKS'].val='1'
+self.pars['RUNMETHOD'].vals=['interactive','at','batch']
+self.pars['RUNMETHOD'].val='batch'

cfg/windows/comp.cfg

+self.pars['RUNMETHOD'].vals=['interactive',]
+self.pars['RUNMETHOD'].val='interactive'

cfg/windows/launch.cfg

+self.pars['RUNMETHOD'].vals=['interactive',]
+self.pars['RUNMETHOD'].val='interactive'