update nic4

cfg/master2/git.profile

-# git 1.9.1 recompile localement par RB
 
-if [ -d /home/ulg/nlcm/rboman/local/git-1.9.1/bin ] ; then
-    PATH=/home/ulg/nlcm/rboman/local/git-1.9.1/bin:$PATH
-fi
+module load git
 

cfg/master2/gmm.profile

-# gmm compile localement par RB
+# gmm compile localement
 
-if [ -d /home/ulg/nlcm/rboman/local/gmm-4.2.1/include ] ; then
-    if [ -z "${INCLUDE}" ] ; then
-        export INCLUDE=/home/ulg/nlcm/rboman/local/gmm-4.2.1/include
-    else
-        INCLUDE=$INCLUDE:/home/ulg/nlcm/rboman/local/gmm-4.2.1/include
-    fi
-fi
+add2env INCLUDE "/home/ulg/nlcm/rboman/local/gmm/include" front
 

cfg/master2/gmsh.profile

-# gmsh
+# gmsh compile par RB
 
-if [ -d /home/ulg/nlcm/rboman/local/gmsh-2.12.0/bin ] ; then
-    PATH=/home/ulg/nlcm/rboman/local/gmsh-2.12.0/bin:$PATH
-fi
+add2env PATH "/home/ulg/nlcm/rboman/local/gmsh/bin" front
 

cfg/master2/local.profile

+# local binaries 
+
+add2env PATH "$HOME/dev/local/bin" front
+add2env INCLUDE "$HOME/dev/local/include" front
+add2env LIB "$HOME/dev/local/lib" front
+

cfg/master2/local_bin.profile

-# git 1.9.1 recompile localement par RB
-
-if [ -d /home/ulg/nlcm/rboman/local/bin ] ; then
-    PATH=/home/ulg/nlcm/rboman/local/bin:$PATH
-fi
-

cfg/master2/mumps.profile

-# mumps compile localement par RB
-
-if [ -d /home/ulg/nlcm/rboman/local/mumps-4.10.0/lib ] ; then
-    if [ -z "${LIB}" ] ; then
-        export LIB=/home/ulg/nlcm/rboman/local/mumps-4.10.0/lib
-    else
-        LIB=$LIB:/home/ulg/nlcm/rboman/local/mumps-4.10.0/lib
-    fi
-fi
-
-if [ -d /home/ulg/nlcm/rboman/local/mumps-4.10.0/include ] ; then
-    if [ -z "${INCLUDE}" ] ; then
-        export INCLUDE=/home/ulg/nlcm/rboman/local/mumps-4.10.0/include
-    else
-        INCLUDE=$INCLUDE:/home/ulg/nlcm/rboman/local/mumps-4.10.0/include
-    fi
-fi
-

cfg/master2/pcre.profile

 # pcre (swig) compile localement par RB
 
-if [ -d /home/ulg/nlcm/rboman/local/pcre-8.33/lib ] ; then
-    if [ -z "${LIB}" ] ; then
-        export LIB=/home/ulg/nlcm/rboman/local/pcre-8.33/lib
-    else
-        LIB=$LIB:/home/ulg/nlcm/rboman/local/pcre-8.33/lib
-    fi
-fi
-
-if [ -d /home/ulg/nlcm/rboman/local/pcre-8.33/include ] ; then
-    if [ -z "${INCLUDE}" ] ; then
-        export INCLUDE=/home/ulg/nlcm/rboman/local/pcre-8.33/include
-    else
-        INCLUDE=$INCLUDE:/home/ulg/nlcm/rboman/local/pcre-8.33/include
-    fi
-fi
-
-if [ -d /home/ulg/nlcm/rboman/local/pcre-8.33/lib ] ; then
-    if [ -z "${LD_LIBRARY_PATH}" ] ; then
-        export LD_LIBRARY_PATH=/home/ulg/nlcm/rboman/local/pcre-8.33/lib
-    else
-        LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/home/ulg/nlcm/rboman/local/pcre-8.33/lib
-    fi
-fi
-
-
+add2env LIB "/home/ulg/nlcm/rboman/local/pcre/lib" front
+add2env INCLUDE "/home/ulg/nlcm/rboman/local/pcre/include" front
+add2env LD_LIBRARY_PATH "/home/ulg/nlcm/rboman/local/pcre/lib" front
 

cfg/master2/python.profile

@@ -2,12 +2,5 @@
 module load python/2.7.10
 
 # trucs qui manquent dans le modulefile de David
-
-if [ -d /cm/shared/apps/python/2.7.10 ] ; then
-    if [ -z "${CMAKE_PREFIX_PATH}" ] ; then
-        export CMAKE_PREFIX_PATH=/cm/shared/apps/python/2.7.10
-    else
-        CMAKE_PREFIX_PATH=/cm/shared/apps/python/2.7.10:${CMAKE_PREFIX_PATH}
-    fi
-fi
+add2env CMAKE_PREFIX_PATH "/cm/shared/apps/python/2.7.10" front
 

cfg/master2/swig.profile

 # swig recompile localement par RB
 
-if [ -d /home/ulg/nlcm/rboman/local/swig-3.0.11/bin ] ; then
-    PATH=/home/ulg/nlcm/rboman/local/swig-3.0.11/bin:$PATH
-fi
+add2env PATH "/home/ulg/nlcm/rboman/local/swig-3.0.11/bin" front
 

cfg/master2/trilinos.profile

-# trilinos compile en local par RB 
-
-if [ -d /home/ulg/nlcm/rboman/local/trilinos-12.6.1 ] ; then
-    if [ -z "${CMAKE_PREFIX_PATH}" ] ; then
-        export CMAKE_PREFIX_PATH=/home/ulg/nlcm/rboman/local/trilinos-12.6.1
-    else
-        CMAKE_PREFIX_PATH=/home/ulg/nlcm/rboman/local/trilinos-12.6.1:${CMAKE_PREFIX_PATH}
-    fi
-fi
-