Merge branch 'master' into papeleux

cfg/default/svn_git.bashrc

@@ -27,7 +27,6 @@ function mtsetup_co
 
 function parasolid_co
 {
-   #git clone $USER@$REP_GIT/parasolid.git
    git clone git@gitlab.uliege.be:am-dept/MN2L/parasolid.git
 }
 

cfg/fabulous/modules.profile

@@ -8,6 +8,8 @@ module load lagamineAPI
 module load samcef gmsh 
 module load isosurf tetgen triangle
 module load matlab scilab
+module load eigen gmm openmpi/gcc
+module load trilinos
 
 # intel community 
 #. /cm/shared/apps/intel-community/2017.2/mkl/bin/mklvars.sh intel64

cfg/garfield/misc.bashrc

-alias a2ps='a2ps --pro=color --line-numbers=5'
+alias a2ps='a2ps --pro=color --line-numbers=5 --medium=A4'
 alias plotdigitizer='java -Xmx256m -jar /opt/PlotDigitizer/PlotDigitizer.jar'
 alias open='xdg-open'

cfg/garfield/trilinos.profile

+# Trilinos custom compile localement
+# (permet le FIND_PACKAGE(Trilinos) dans CMake)
+add2env CMAKE_PREFIX_PATH "/home/boman/local/trilinos" front
+add2env PYTHONPATH "/home/boman/local/trilinos/lib/python2.7/site-packages" front

cfg/gaston/cmake.profile

+# Trilinos requires cmake >= 3.10
+add2env PATH "/opt/cmake/bin" front

cfg/gaston/swig.profile

+# Trilinos requires swig >= 3.0.11
+add2env PATH "/opt/swig/bin" front

cfg/garfield/trilinos.bashrc → cfg/gaston/trilinos.profile

 # Trilinos custom compile localement
 # (permet le FIND_PACKAGE(Trilinos) dans CMake)
-#add2env CMAKE_PREFIX_PATH "/opt/trilinos" front
+add2env CMAKE_PREFIX_PATH "/opt/trilinos" front
+add2env PYTHONPATH "/opt/trilinos/lib/python2.7/site-packages" front

cfg/spirou/eigen.profile

+add2env INCLUDE "/usr/local/eigen"

cfg/spirou/lagamine.profile

+add2env LD_LIBRARY_PATH "/opt/lagamine/lib"
+add2env INCLUDE "/opt/lagamine/include"
+add2env LIB "/opt/lagamine/lib"

comp.py

@@ -44,7 +44,7 @@ class CompJob(ParametricJob):
         self.repos.append(SVNRepo('oo_meta', 'svn+ssh://blueberry.ltas.ulg.ac.be/home/metafor/SVN/oo_meta/trunk'))
         self.repos.append(SVNRepo('oo_nda', 'svn+ssh://blueberry.ltas.ulg.ac.be/home/metafor/SVN/oo_nda/trunk'))
         self.repos.append(GitRepo('linuxbin', 'https://github.com/ulgltas/linuxbin.git'))
-        self.repos.append(GitRepo('parasolid', 'blueberry.ltas.ulg.ac.be:/home/metafor/GIT/parasolid.git'))
+        self.repos.append(GitRepo('parasolid', 'git@gitlab.uliege.be:am-dept/MN2L/parasolid.git'))
 
     def setDefaultPars(self):
         if len(self.pars)!=0: