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

cfg/gaston/comp.cfg → cfg/chinook/comp.cfg

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

cfg/chinook/gmsh.profile

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

cfg/chinook/intel.bashrc

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

cfg/chinook/intel.profile

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

cfg/chinook/intel2019/intel.bashrc

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

cfg/chinook/intel2019/intel.profile

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

cfg/chinook/intel2019/mumps.profile

+add2env LD_LIBRARY_PATH "/opt/mumps-4.10.0-intel2019/lib"
+add2env LIB "/opt/mumps-4.10.0-intel2019/lib"
+add2env INCLUDE "/opt/mumps-4.10.0-intel2019/include"

cfg/chinook/intelOneApi/intel.bashrc

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

cfg/chinook/intelOneApi/intel.profile

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

cfg/chinook/intelOneApi/mumps.profile

+add2env LD_LIBRARY_PATH "/opt/mumps-4.10.0/lib"
+add2env LIB "/opt/mumps-4.10.0/lib"
+add2env INCLUDE "/opt/mumps-4.10.0/include"

cfg/chinook/lam3.profile

+add2env PATH            "/opt/lam3/bin" front
+add2env LD_LIBRARY_PATH "/opt/lam3/lib"

cfg/chinook/leanVTK.profile

+#add2env PATH "/i/opt/lean-vtk/lib/LeanVTK-1.0"
+add2env LIB "/opt/lean-vtk/lib/LeanVtk-1.0" front
+add2env CMAKE_PREFIX_PATH "/opt/lean-vtk/" front

cfg/chinook/mumps.profile

+add2env LD_LIBRARY_PATH "/opt/mumps-4.10.0/lib"
+add2env LIB "/opt/mumps-4.10.0/lib"
+add2env INCLUDE "/opt/mumps-4.10.0/include"

cfg/chinook/sol2.profile

+#add2env PATH "/opt/sol2/bin" 
+#add2env LIB "/opt/sol2/lib" front
+#add2env LD_LIBRARY_PATH "/opt/sol2/lib" front
+add2env INCLUDE "/opt/sol2/include" front

cfg/gaston/launch.cfg

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