Add possibility to specify extra parameters (Slurm and CCC)

diff --git a/src/CCC/BatchManager_CCC.cxx b/src/CCC/BatchManager_CCC.cxx
index eaea3320542284899bb98b5bd44d7edd37ab112c..c4f5bc5801db6bf1c2694aa78853a14c236444d2 100644 (file)
--- a/src/CCC/BatchManager_CCC.cxx
+++ b/src/CCC/BatchManager_CCC.cxx
@@ -229,6 +229,9 @@ namespace Batch {
     tempOutputFile << "#MSUB -o " << baseDir << "/logs/output.log." << rootNameToExecute << endl ;
     tempOutputFile << "#MSUB -e " << baseDir << "/logs/error.log." << rootNameToExecute << endl ;
 
+    if (params.find(EXTRAPARAMS) != params.end())
+      tempOutputFile << params[EXTRAPARAMS] << endl;
+
     tempOutputFile << "cd " << workDir << endl ;
 
     // generate nodes file

diff --git a/src/Core/Constants.cxx b/src/Core/Constants.cxx
index 607b53606c9744b544f441a46ce0ebba76bc2563..1b27c7d8d640581bbce78e4efe16d57e062320ac 100644 (file)
--- a/src/Core/Constants.cxx
+++ b/src/Core/Constants.cxx
@@ -51,6 +51,7 @@ namespace Batch {
   def_Constant(EXCLUSIVE);
   def_Constant(MEMPERCPU);
   def_Constant(WCKEY);
+  def_Constant(EXTRAPARAMS);
 
   // Parameters for COORM
   def_Constant(LAUNCHER_FILE);

diff --git a/src/Core/Constants.hxx b/src/Core/Constants.hxx
index cf2b0cac5f7f4e320aa320c95053a2df0c207bd1..ba62694dd21df0d61a0431137c1daccdf63bbc87 100644 (file)
--- a/src/Core/Constants.hxx
+++ b/src/Core/Constants.hxx
@@ -62,6 +62,7 @@ namespace Batch {
   decl_extern_Constant(EXCLUSIVE);
   decl_extern_Constant(MEMPERCPU);
   decl_extern_Constant(WCKEY);
+  decl_extern_Constant(EXTRAPARAMS);
 
   // Parameters for COORM
   decl_extern_Constant(LAUNCHER_FILE);

diff --git a/src/Core/ParameterTypeMap.cxx b/src/Core/ParameterTypeMap.cxx
index 60c14348553dcc83ae6b70e3526bf4d0bca56127..0b5c0df40550de1c83e7978e576df4797013acf1 100644 (file)
--- a/src/Core/ParameterTypeMap.cxx
+++ b/src/Core/ParameterTypeMap.cxx
@@ -64,6 +64,7 @@ namespace Batch {
     addParameter("EXCLUSIVE", BOOL, 1);
     addParameter("MEMPERCPU", LONG, 1);
     addParameter("WCKEY", STRING, 1);
+    addParameter("EXTRAPARAMS", STRING, 1);
 
        // Parameters for COORM
     addParameter("LAUNCHER_FILE", STRING, 1);

diff --git a/src/Slurm/BatchManager_Slurm.cxx b/src/Slurm/BatchManager_Slurm.cxx
index 0fe20d03ba36424b8bb6c48efc5d9d9e37c4abd8..17a7773a4d120b88933f3b1d05c0822e2cfaf983 100644 (file)
--- a/src/Slurm/BatchManager_Slurm.cxx
+++ b/src/Slurm/BatchManager_Slurm.cxx
@@ -154,6 +154,8 @@ namespace Batch {
       tempOutputFile << "#SBATCH --partition=" << params[QUEUE] << endl;
     if (params.find(WCKEY) != params.end())
       tempOutputFile << "#SBATCH --wckey=" << params[WCKEY] << endl;
+    if (params.find(EXTRAPARAMS) != params.end())
+      tempOutputFile << params[EXTRAPARAMS] << endl;
 
     // Define environment for the job
     Environnement env = job.getEnvironnement();