diff --git a/cfg/gaston/eigen.profile b/cfg/clifton/eigen.profile
similarity index 100%
rename from cfg/gaston/eigen.profile
rename to cfg/clifton/eigen.profile
diff --git a/cfg/clifton/gmsh.profile b/cfg/clifton/gmsh.profile
index 4a3ec051441ecc8b4892b76cca8038877445e44d..3bb33ff2a83ef55b84a208219203deeb402413b3 100644
--- a/cfg/clifton/gmsh.profile
+++ b/cfg/clifton/gmsh.profile
@@ -1,4 +1,3 @@
-
 add2env PATH "/opt/gmsh/bin" front
 add2env INCLUDE "/opt/gmsh/include" front
 add2env LIB "/opt/gmsh/lib" front
diff --git a/cfg/gaston/cmake.profile b/cfg/gaston/cmake.profile
deleted file mode 100644
index aa827bc444b3676e163d75670b55147543fe2e90..0000000000000000000000000000000000000000
--- a/cfg/gaston/cmake.profile
+++ /dev/null
@@ -1,2 +0,0 @@
-# Trilinos requires cmake >= 3.10
-add2env PATH "/opt/cmake/bin" front
diff --git a/cfg/gaston/gcc.profile b/cfg/gaston/gcc.profile
deleted file mode 100644
index 74e8226dec1f90211c190fc8e09bb61da76d7583..0000000000000000000000000000000000000000
--- a/cfg/gaston/gcc.profile
+++ /dev/null
@@ -1,6 +0,0 @@
-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
-
diff --git a/cfg/gaston/gmm.profile b/cfg/gaston/gmm.profile
deleted file mode 100644
index 45f02f9641edbaa0f28d9adc082f084ccd6b60b3..0000000000000000000000000000000000000000
--- a/cfg/gaston/gmm.profile
+++ /dev/null
@@ -1 +0,0 @@
-add2env INCLUDE /opt/gmm
diff --git a/cfg/gaston/intelCommunity.bashrc b/cfg/gaston/intelCommunity.bashrc
deleted file mode 100644
index 43482b633f9fbd79eb2dc15eb695d37e0e509762..0000000000000000000000000000000000000000
--- a/cfg/gaston/intelCommunity.bashrc
+++ /dev/null
@@ -1,10 +0,0 @@
-# Intel compiler and/or TBB/MKL 
-#
-# 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
-fi
diff --git a/cfg/gaston/intelCommunity.profile b/cfg/gaston/intelCommunity.profile
deleted file mode 100644
index e5d1ff529ac7757508667647255d5708529c0467..0000000000000000000000000000000000000000
--- a/cfg/gaston/intelCommunity.profile
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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
diff --git a/cfg/gaston/oneApi.bashrc b/cfg/gaston/oneApi.bashrc
new file mode 100644
index 0000000000000000000000000000000000000000..0e8e36f622535c9f747cfe71949a6f9aa049e1df
--- /dev/null
+++ b/cfg/gaston/oneApi.bashrc
@@ -0,0 +1,9 @@
+# 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
+     #. /opt/intel/oneapi/compiler/latest/env/vars.sh intel64
+fi
diff --git a/cfg/gaston/oneApi.profile b/cfg/gaston/oneApi.profile
new file mode 100644
index 0000000000000000000000000000000000000000..0272e8b34d7501a47c2e1bf541a027193046c85c
--- /dev/null
+++ b/cfg/gaston/oneApi.profile
@@ -0,0 +1,10 @@
+# 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
diff --git a/cfg/gaston/python.profile b/cfg/gaston/python.profile
deleted file mode 100644
index e191c0280d315ed2c6f372ac0baafa131223e715..0000000000000000000000000000000000000000
--- a/cfg/gaston/python.profile
+++ /dev/null
@@ -1,3 +0,0 @@
-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
diff --git a/cfg/gaston/swig.profile b/cfg/gaston/swig.profile
deleted file mode 100644
index 253b9d9a567d0b9c22fb291b12d39680c0775d8d..0000000000000000000000000000000000000000
--- a/cfg/gaston/swig.profile
+++ /dev/null
@@ -1,2 +0,0 @@
-# Trilinos requires swig >= 3.0.11
-add2env PATH "/opt/swig/bin" front
diff --git a/cfg/gaston/trilinos.profile b/cfg/gaston/trilinos.profile
deleted file mode 100644
index 42177c7358f4fbcd57f4d9cbad99f12f26846e4b..0000000000000000000000000000000000000000
--- a/cfg/gaston/trilinos.profile
+++ /dev/null
@@ -1,4 +0,0 @@
-# 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
diff --git a/cfg/gaston/vtk.profile b/cfg/gaston/vtk.profile
deleted file mode 100644
index b1da9c9519c59b522763f67f82d2c5fab7c7d211..0000000000000000000000000000000000000000
--- a/cfg/gaston/vtk.profile
+++ /dev/null
@@ -1,4 +0,0 @@
-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
diff --git a/cfg/vaillant/eigen.profile b/cfg/vaillant/eigen.profile
new file mode 100644
index 0000000000000000000000000000000000000000..8477a380dbf5f7024156aec2f10df25e4ea6e524
--- /dev/null
+++ b/cfg/vaillant/eigen.profile
@@ -0,0 +1 @@
+add2env INCLUDE "/opt/eigen/include/eigen3"
diff --git a/cfg/vaillant/gmsh.profile b/cfg/vaillant/gmsh.profile
index 412f3fcb47cd01cfd224b34e5ac684e0516fecd4..db85932a1f7db6db8f23bf46a7db4f99ea27f207 100644
--- a/cfg/vaillant/gmsh.profile
+++ b/cfg/vaillant/gmsh.profile
@@ -1,3 +1,5 @@
 add2env PATH "/opt/gmsh/bin" front
 add2env LD_LIBRARY_PATH "/opt/gmsh/lib"
 add2env PYTHONPATH "/opt/gmsh/lib"
+add2env INCLUDE "/opt/gmsh/include"
+add2env LIB "/opt/gmsh/lib"
diff --git a/cfg/warson/cmake.profile b/cfg/warson/cmake.profile
deleted file mode 100644
index aa827bc444b3676e163d75670b55147543fe2e90..0000000000000000000000000000000000000000
--- a/cfg/warson/cmake.profile
+++ /dev/null
@@ -1,2 +0,0 @@
-# Trilinos requires cmake >= 3.10
-add2env PATH "/opt/cmake/bin" front
diff --git a/cfg/warson/compilers.bashrc b/cfg/warson/compilers.bashrc
deleted file mode 100644
index 2e502d83aaf2a9e1ed93294553f217acf51edbd4..0000000000000000000000000000000000000000
--- a/cfg/warson/compilers.bashrc
+++ /dev/null
@@ -1,7 +0,0 @@
-add2env PATH "/opt/gcc-9.4.0/bin" front
-add2env LD_LIBRARY_PATH "/opt/gcc-9.4.0/lib64" front
-# sinon cmake build avec /usr/bin/c++...
-export CC=gcc
-export CXX=g++
-export FC=gfortran
-
diff --git a/cfg/warson/compilers.profile b/cfg/warson/compilers.profile
deleted file mode 100644
index 3e1604a097f470a8f845e11af0b71d86dcebfbc1..0000000000000000000000000000000000000000
--- a/cfg/warson/compilers.profile
+++ /dev/null
@@ -1,8 +0,0 @@
-add2env PATH "/opt/gcc-9.4.0/bin" front
-add2env LD_LIBRARY_PATH "/opt/gcc-9.4.0/lib64" front
-
-# sinon cmake build avec /usr/bin/c++...
-export CC=gcc
-export CXX=g++
-export FC=gfortran
-
diff --git a/cfg/warson/gmsh.profile b/cfg/warson/gmsh.profile
index 412f3fcb47cd01cfd224b34e5ac684e0516fecd4..bc68515e729ec126fe560efc3a6fd8d84dda3207 100644
--- a/cfg/warson/gmsh.profile
+++ b/cfg/warson/gmsh.profile
@@ -1,3 +1,5 @@
-add2env PATH "/opt/gmsh/bin" front
+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"
+add2env PYTHONPATH      "/opt/gmsh/lib"
diff --git a/cfg/warson/intelCommunity.bashrc b/cfg/warson/intelCommunity.bashrc
deleted file mode 100644
index 06b19829f74c80dfdd976ee5101827abd29d4a99..0000000000000000000000000000000000000000
--- a/cfg/warson/intelCommunity.bashrc
+++ /dev/null
@@ -1,9 +0,0 @@
-# Intel compiler and/or TBB/MKL 
-#
-# 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
-fi
-export MKL_DEBUG_CPU_TYPE=5
diff --git a/cfg/warson/intelCommunity.profile b/cfg/warson/intelCommunity.profile
deleted file mode 100644
index 3e1712b61b2a5ce6663f92f7e136e05e370bb2fe..0000000000000000000000000000000000000000
--- a/cfg/warson/intelCommunity.profile
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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
-export MKL_DEBUG_CPU_TYPE=5
diff --git a/cfg/warson/leanVTK.profile b/cfg/warson/leanVTK.profile
new file mode 100644
index 0000000000000000000000000000000000000000..02bfbe93b89e19ea08e33f2a75c3565ae475c9e5
--- /dev/null
+++ b/cfg/warson/leanVTK.profile
@@ -0,0 +1 @@
+add2env PATH "/usr/local/lib/LeanVTK-1.0"
diff --git a/cfg/warson/metafor.profile b/cfg/warson/metafor.profile
deleted file mode 100644
index 3fe8c1e1de6b4b0fa74cbb4791608142a0f3779f..0000000000000000000000000000000000000000
--- a/cfg/warson/metafor.profile
+++ /dev/null
@@ -1 +0,0 @@
-add2env PATH /home/$USER/dev/Metafor_master/oo_metaB/bin
diff --git a/cfg/warson/oneApi.bashrc b/cfg/warson/oneApi.bashrc
new file mode 100644
index 0000000000000000000000000000000000000000..0e8e36f622535c9f747cfe71949a6f9aa049e1df
--- /dev/null
+++ b/cfg/warson/oneApi.bashrc
@@ -0,0 +1,9 @@
+# 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
+     #. /opt/intel/oneapi/compiler/latest/env/vars.sh intel64
+fi
diff --git a/cfg/warson/oneApi.profile b/cfg/warson/oneApi.profile
new file mode 100644
index 0000000000000000000000000000000000000000..0272e8b34d7501a47c2e1bf541a027193046c85c
--- /dev/null
+++ b/cfg/warson/oneApi.profile
@@ -0,0 +1,10 @@
+# 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
diff --git a/parametricJob.py b/parametricJob.py
index 2f19121a67565f9a689f32dac9f681cafa661413..609b0eee75f7e83cf19a8ebbeaa2a22dd4f614db 100644
--- a/parametricJob.py
+++ b/parametricJob.py
@@ -1,10 +1,8 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
-#from future import standard_library
-#standard_library.install_aliases()
-import sys, os, os.path, shutil, socket, platform, glob, fnmatch
-import datetime, tarfile, subprocess, string, re
+import sys, os, os.path, socket, platform, fnmatch
+import subprocess, string, re
 from prmClasses import *
 
 # -- Base Class ----------------------------------------------------------------
@@ -64,10 +62,14 @@ class ParametricJob(PRMSet):
                 f.close()
             except:
                 text="file not found"
+
+        maxsize = 5*1024*1024
+        if(len(head+text)>maxsize):
+            text = text[:maxsize]
+            text+=f'\n\n[message truncated - see file={file}]\n'
         import smtplib
         server = smtplib.SMTP(smtpServ)        
         server.sendmail(fromA, toA, (head+text).encode('ascii','ignore'))
-        #server.sendmail(fromA, toA, head+text)
         server.quit()
 
     def mailhtml(self, file, subject):
@@ -75,7 +77,6 @@ class ParametricJob(PRMSet):
         # getting address & smtp servers
         fromA, toA, smtpServ = self.getMailData()
         # building email
-        #from email.MIMEText import MIMEText
         from email.mime.text import MIMEText
         file = open(file,'r')
         text = file.read()
@@ -105,9 +106,7 @@ class ParametricJob(PRMSet):
         mail['From']    = fromA
         mail['To']      = toA
         mail['Subject'] = subject
-        #mail.preamble   = 'Battery result in attachement \n'
         machineName = socket.gethostname()
-        #from email.MIMEText import MIMEText
         from email.mime.text import MIMEText
         text = "Battery result on %s in attachement ...\n" % machineName
         msg  = MIMEText(text, 'html','iso-8859-1')
@@ -131,6 +130,7 @@ class ParametricJob(PRMSet):
             print("file %s correctly closed after mailing" % fileName)
         except smtplib.SMTPException:
             text="file %s not found"%fileName
+
         # Encode the payload using Base64
         encoders.encode_base64(msg)
         (head, tail) = os.path.split(fileName)
@@ -205,7 +205,7 @@ class ParametricJob(PRMSet):
         nodeHost = socket.gethostname()
         filename = self.rmNodeResultsScriptName(jobId)
         localNodeDir = self.getLocalDiskDir(jobId)
-        #write file
+        # write file
         file=open(filename,"w")
         file.write("#!/usr/bin/env python3\n")
         #sshRmCmd = 'ssh %s "rm -rf %s"' % (nodeHost, localNodeDir)