Merge branch 'boman' into 'master'

Merge branch "boman"

See merge request am-dept/linuxbin!48

cfg/fsa-spirou/compilers.bashrc

@@ -25,3 +25,14 @@ if [ -d /opt/intel ] ; then
     . /opt/intel/oneapi/mkl/latest/env/vars.sh
     . /opt/intel/oneapi/tbb/latest/env/vars.sh
 fi
+
+function use_intel_compilers() {
+    source /opt/intel/oneapi/compiler/latest/env/vars.sh
+    export CC=icc
+    export CXX=icpc
+    export FC=ifort
+    echo "Intel compiler enabled!"
+    echo "  CC=`which $CC`"
+    echo "  CXX=`which $CXX`"
+    echo "  FC=`which $FC`"
+}

cfg/fsa-spirou/slicer.bashrc

+# Slicer aliases
+
+alias slicer='/opt/Slicer/Slicer'
+alias Slicer='/opt/Slicer/Slicer'

cfg/fsa-spirou/swig.profile

+add2env PATH "/opt/swig/bin" front

cfg/fsa-spirou/vtk.profile

+add2env PATH "/opt/vtk/bin" front
+add2env LD_LIBRARY_PATH "/opt/vtk/lib"
+add2env PYTHONPATH "/opt/vtk/lib/python3.12/site-packages"
+add2env INCLUDE "/opt/vtk/include" front
+add2env LIB "/opt/vtk/lib" front

cfg/loop.sh

@@ -19,9 +19,9 @@ function add2env()
         return
     fi
 
-    ndir=${2%/}                  # remove trailing space
-    if [ -d $ndir ] ; then       # if the second arg is an existing folder
-        if [ -z ${!1} ] ; then   # if the first arg is an empty env variable
+    ndir=${2%/}                    # remove trailing space
+    if [ -d "$ndir" ] ; then       # if the second arg is an existing folder
+        if [ -z "${!1}" ] ; then   # if the first arg is an empty env variable
             #echo $1 is empty
             eval export $1="$ndir"
         else

cfg/master2/compilers.profile

-module load cmake
-
-# --- ICC ---
-# Metafor ne compile plus avec ces vieux compilateurs intel
-# Le probleme vient du gcc sous jacent qui est bcp trop vieux (headers foireux)
-#module load intel/compiler/64/14.0/2013_sp1.3.174 
-
-# --- GCC ---
-module load gcc/4.9.2
-module load openmpi/1.6.4/gcc-4.9.2 # EVITER openmpi 1.8.4!
-module load intel/tbb/64/4.2/2013_sp1.3.174
-module load intel/mkl/64/11.1/2013_sp1.3.174
-
-# sinon cmake build avec /usr/bin/c++...
-export CC=gcc
-export CXX=g++
-export FC=gfortran
-
-

cfg/master2/git.profile

-module load git

cfg/master2/gmm.profile

-# gmm compile localement
-add2env INCLUDE "/home/ulg/nlcm/rboman/local/gmm/include" front

cfg/master2/gmsh.profile

-# gmsh compile par RB
-add2env PATH "/home/ulg/nlcm/rboman/local/gmsh/bin" front

cfg/master2/lammps.profile

-add2env PATH "~/dev/lammps/src"

cfg/master2/pcre.profile

-# pcre (swig) compile localement par RB
-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

-module load python/2.7.10
-
-# trucs qui manquent dans le modulefile de David
-add2env CMAKE_PREFIX_PATH "/cm/shared/apps/python/2.7.10" front

cfg/master2/swig.profile

-add2env PATH "/home/ulg/nlcm/rboman/local/swig-3.0.11/bin" front

cfg/spring/gmsh.profile

 add2env PATH "/opt/gmsh/bin" front
 add2env LD_LIBRARY_PATH "/opt/gmsh/lib"
 add2env PYTHONPATH "/opt/gmsh/lib"
+add2env INCLUDE "/opt/gmsh/include" front
+add2env LIB "/opt/gmsh/lib" front