diff --git a/cfg/chinook/comp.cfg b/cfg/chinook/comp.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..a596a18df7edc34f295ed20f973e36205cd61b24
--- /dev/null
+++ b/cfg/chinook/comp.cfg
@@ -0,0 +1,5 @@
+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'
diff --git a/cfg/chinook/gmsh.profile b/cfg/chinook/gmsh.profile
new file mode 100644
index 0000000000000000000000000000000000000000..bc68515e729ec126fe560efc3a6fd8d84dda3207
--- /dev/null
+++ b/cfg/chinook/gmsh.profile
@@ -0,0 +1,5 @@
+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"
diff --git a/cfg/chinook/intel.bashrc b/cfg/chinook/intel.bashrc
new file mode 100644
index 0000000000000000000000000000000000000000..d9b8d9fe00afca577c2c4fd17236e23f324d85de
--- /dev/null
+++ b/cfg/chinook/intel.bashrc
@@ -0,0 +1,8 @@
+# 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
diff --git a/cfg/chinook/intel.profile b/cfg/chinook/intel.profile
new file mode 100644
index 0000000000000000000000000000000000000000..5ae6ec08287093508e3038ddfbd3a1441075c0a6
--- /dev/null
+++ b/cfg/chinook/intel.profile
@@ -0,0 +1,8 @@
+# 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
diff --git a/cfg/chinook/intel2019/intel.bashrc b/cfg/chinook/intel2019/intel.bashrc
new file mode 100644
index 0000000000000000000000000000000000000000..8560647907b75eac876295a514a4180e53d41373
--- /dev/null
+++ b/cfg/chinook/intel2019/intel.bashrc
@@ -0,0 +1,9 @@
+# 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
diff --git a/cfg/chinook/intel2019/intel.profile b/cfg/chinook/intel2019/intel.profile
new file mode 100644
index 0000000000000000000000000000000000000000..9862a22596eccb6f66140ff1a836d72f97fa7723
--- /dev/null
+++ b/cfg/chinook/intel2019/intel.profile
@@ -0,0 +1,11 @@
+# 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
diff --git a/cfg/chinook/intel2019/mumps.profile b/cfg/chinook/intel2019/mumps.profile
new file mode 100644
index 0000000000000000000000000000000000000000..add06f65076ac54782c9d092cd63351345b99367
--- /dev/null
+++ b/cfg/chinook/intel2019/mumps.profile
@@ -0,0 +1,3 @@
+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"
diff --git a/cfg/chinook/intelOneApi/intel.bashrc b/cfg/chinook/intelOneApi/intel.bashrc
new file mode 100644
index 0000000000000000000000000000000000000000..d9b8d9fe00afca577c2c4fd17236e23f324d85de
--- /dev/null
+++ b/cfg/chinook/intelOneApi/intel.bashrc
@@ -0,0 +1,8 @@
+# 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
diff --git a/cfg/chinook/intelOneApi/intel.profile b/cfg/chinook/intelOneApi/intel.profile
new file mode 100644
index 0000000000000000000000000000000000000000..5ae6ec08287093508e3038ddfbd3a1441075c0a6
--- /dev/null
+++ b/cfg/chinook/intelOneApi/intel.profile
@@ -0,0 +1,8 @@
+# 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
diff --git a/cfg/chinook/intelOneApi/mumps.profile b/cfg/chinook/intelOneApi/mumps.profile
new file mode 100644
index 0000000000000000000000000000000000000000..2e804bb9f82fb1ae0f7370e89dd2812d09ffa170
--- /dev/null
+++ b/cfg/chinook/intelOneApi/mumps.profile
@@ -0,0 +1,3 @@
+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"
diff --git a/cfg/chinook/lagamine.profile b/cfg/chinook/lagamine.profile
new file mode 100644
index 0000000000000000000000000000000000000000..f8e4775f5d0074110bc831b07f445a947b427092
--- /dev/null
+++ b/cfg/chinook/lagamine.profile
@@ -0,0 +1,3 @@
+add2env LD_LIBRARY_PATH "/opt/lagamine/lib"
+add2env INCLUDE "/opt/lagamine/include"
+add2env LIB "/opt/lagamine/lib"
diff --git a/cfg/chinook/lam3.profile b/cfg/chinook/lam3.profile
new file mode 100644
index 0000000000000000000000000000000000000000..45d2a589b5ad4b9d3767dce2a6eb2e319e3d2339
--- /dev/null
+++ b/cfg/chinook/lam3.profile
@@ -0,0 +1,2 @@
+add2env PATH            "/opt/lam3/bin" front
+add2env LD_LIBRARY_PATH "/opt/lam3/lib"
diff --git a/cfg/chinook/leanVTK.profile b/cfg/chinook/leanVTK.profile
new file mode 100644
index 0000000000000000000000000000000000000000..11c2a0da389f66b4a839208f758922c40c5805d3
--- /dev/null
+++ b/cfg/chinook/leanVTK.profile
@@ -0,0 +1,3 @@
+#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
diff --git a/cfg/chinook/matlab.profile b/cfg/chinook/matlab.profile
new file mode 100644
index 0000000000000000000000000000000000000000..0ff358894261fe6d720b2ad0368687cf5a7ce5f1
--- /dev/null
+++ b/cfg/chinook/matlab.profile
@@ -0,0 +1 @@
+add2env PATH "/opt/matlab/bin"
diff --git a/cfg/chinook/mumps.profile b/cfg/chinook/mumps.profile
new file mode 100644
index 0000000000000000000000000000000000000000..2e804bb9f82fb1ae0f7370e89dd2812d09ffa170
--- /dev/null
+++ b/cfg/chinook/mumps.profile
@@ -0,0 +1,3 @@
+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"
diff --git a/cfg/chinook/parasolid.profile b/cfg/chinook/parasolid.profile
new file mode 100644
index 0000000000000000000000000000000000000000..e24e2e80de8a8cf8b1f2a4f4ef7f632bb44dcb81
--- /dev/null
+++ b/cfg/chinook/parasolid.profile
@@ -0,0 +1,3 @@
+add2env PATH "/opt/parasolid/shared_object"
+add2env INCLUDE "/opt/parasolid"
+export P_SCHEMA=/opt/parasolid/schema
diff --git a/cfg/chinook/samcef.profile b/cfg/chinook/samcef.profile
new file mode 100644
index 0000000000000000000000000000000000000000..834343ee4c4dcc979289fc859455636e016269dc
--- /dev/null
+++ b/cfg/chinook/samcef.profile
@@ -0,0 +1,2 @@
+export SAM_ZONE=200000000
+add2env PATH "/opt/samcef"
diff --git a/cfg/chinook/sol2.profile b/cfg/chinook/sol2.profile
new file mode 100644
index 0000000000000000000000000000000000000000..02fae66457b3355158233068468dccc123c6f322
--- /dev/null
+++ b/cfg/chinook/sol2.profile
@@ -0,0 +1,4 @@
+#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
diff --git a/launch.py b/launch.py
index 71aa7529cceade66f49951d65badaabb696e83cf..98ba0301f2b4469a40588cfda704391e992bfe2c 100755
--- a/launch.py
+++ b/launch.py
@@ -199,7 +199,7 @@ class LaunchJob(ParametricJob):
         return jobname.encode('ascii','ignore') # convert to ASCII if some strings were unicode
 
     def getOutFileName(self):
-        outFileName  = "%s.%s-%s.txt" % (self.pars['OUTFILE'].val, self.pars['ALGORITHM'].val,self.jobId)
+        outFileName  = "%s.%s%s.txt" % (self.pars['OUTFILE'].val, self.pars['ALGORITHM'].val,self.jobId)
         if self.debug:
             print("outFileName = ", outFileName)
         return outFileName
@@ -353,6 +353,7 @@ class LaunchJob(ParametricJob):
         pin.write(b'battery = b.Battery() \n')
         pin.write(b'battery.keepFacs = True\n')
         pin.write(('battery.dirs = [r"%s"]\n'%tests).encode('utf-8'))
+        pin.write(('battery.jobId = r"%s"\n'%self.jobId).encode('utf-8'))
 
         if (self.pars['ALGORITHM'].val == "execfile"):
             reg1=r"(.+)_0*([1-9][0-9]*)\.py"
diff --git a/mtfLicense/chinook.lic b/mtfLicense/chinook.lic
new file mode 100644
index 0000000000000000000000000000000000000000..57d22d8273596c17efb88ccabce16b3b7700b58f
--- /dev/null
+++ b/mtfLicense/chinook.lic
@@ -0,0 +1 @@
+646574612B0A060C031B13305B736D657470666F722024372D0F021B1900102D0F0C1703161163666F727D6574611A6F726D047461660C726D65E161666FE26D657471666F7211657461076F726D06746166FA726D65E561666FCE676574