Merge remote-tracking branch 'origin/master' into papeleux

cfg/gaston/cmake.profile

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

cfg/gaston/eigen.profile

-add2env INCLUDE /opt/eigen/include/eigen3

cfg/gaston/gcc.profile

-add2env PATH "/opt/gcc-10.3.0/bin" front
-add2env LD_LIBRARY_PATH "/opt/gcc-10.3.0/lib64" front
-export CC=/opt/gcc-10.3.0/bin/gcc
-export CXX=/opt/gcc-10.3.0/bin/g++
-export FC=/opt/gcc-10.3.0/bin/gfortran
-

cfg/gaston/gmm.profile

-add2env INCLUDE /opt/gmm

cfg/gaston/intelCommunity.profile

-# Intel compiler and/or TBB/MKL 
-#
-# EXPLANATIONS [RB]: (see "cfg/garfield/compilers.*")
-
-if [ -n "$BASH_VERSION" ]; then
-    if [ -d /opt/intel ] ; then
-        . /opt/intel/mkl/bin/mklvars.sh intel64
-        . /opt/intel/tbb/bin/tbbvars.sh intel64
-    fi
-fi

cfg/gaston/intelCommunity.bashrc → cfg/gaston/oneApi.bashrc

@@ -2,9 +2,8 @@
 #
 # EXPLANATIONS [RB]: (see "cfg/garfield/compilers.*")
 
-if [ -z "$MKLROOT" ]; then
-    . /opt/intel/mkl/bin/mklvars.sh intel64
-fi
-if [ -z "$TBBROOT" ]; then
-    . /opt/intel/tbb/bin/tbbvars.sh intel64
+if [ -d /opt/intel ] ; then
+     . /opt/intel/oneapi/tbb/latest/env/vars.sh intel64
+     . /opt/intel/oneapi/mkl/latest/env/vars.sh intel64
+     #. /opt/intel/oneapi/compiler/latest/env/vars.sh intel64
 fi

cfg/gaston/oneApi.profile

+# Intel compiler and/or TBB/MKL 
+#
+# EXPLANATIONS [RB]: (see "cfg/garfield/compilers.*")
+
+if [ -d /opt/intel ] ; then
+     #. /opt/intel/oneapi/setvars.sh intel64
+     . /opt/intel/oneapi/tbb/latest/env/vars.sh intel64     
+     . /opt/intel/oneapi/mkl/latest/env/vars.sh intel64
+     #. /opt/intel/oneapi/compiler/latest/env/vars.sh intel64
+fi

cfg/gaston/python.profile

-add2env PATH "/opt/python/bin" front
-# added in ld.conf.d (else no way to have it in batch/at)
-#add2env LD_LIBRARY_PATH "/opt/python/lib" front

cfg/gaston/swig.profile

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

cfg/gaston/trilinos.profile

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

cfg/gaston/vtk.profile

-add2env LD_LIBRARY_PATH "/opt/vtk/lib/" front 
-add2env LIB "/opt/vtk/lib/cmake/vtk-7.1" front
-add2env PYTHONPATH "/opt/vtk/lib/python3.7/site-packages" front
-#add2env INCLUDE "/opt/vtk/include/vtk-7.1" front