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

cfg/clifton/cgal.profile

+#add2env LIB "/opt/cgal"
+add2env INCLUDE "/opt/cgal"

cfg/clifton/comp.cfg

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

cfg/clifton/gmsh.profile

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

cfg/clifton/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/clifton/launch.cfg

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

cfg/clifton/intelCommunity.bashrc → cfg/clifton/oneApi.bashrc

@@ -3,6 +3,9 @@
 # EXPLANATIONS [RB]: (see "cfg/garfield/compilers.*")
 
 if [ -d /opt/intel ] ; then
-    . /opt/intel/mkl/bin/mklvars.sh intel64
-    . /opt/intel/tbb/bin/tbbvars.sh intel64
+     #. /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/clifton/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/clifton/scilab.profile

-add2env PATH "/opt/scilab/bin"