Merge 'master' branch into 'V9_dev' branch

[modules/kernel.git] / src / Launcher / Launcher_Job.hxx

diff --git a/src/Launcher/Launcher_Job.hxx b/src/Launcher/Launcher_Job.hxx
index e2674c6e531b493be1e1d5cab673dcef8b4c28ba..2f2322bf828eef095b4ad37182e6668c7ffd311d 100644 (file)
--- a/src/Launcher/Launcher_Job.hxx
+++ b/src/Launcher/Launcher_Job.hxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2009-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2009-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -79,6 +79,8 @@ namespace Launcher
       void setExclusive(bool exclusive);
       void setExclusiveStr(const std::string & exclusiveStr);
       void setMemPerCpu(unsigned long mem_per_cpu);
+      void setWCKey(const std::string & wckey);
+      void setExtraParams(const std::string & extra_params);
       void setReference(const std::string & reference);
          // For COORM
          void setLauncherFile(const std::string & launcher_file);
@@ -99,6 +101,8 @@ namespace Launcher
       bool getExclusive() const;
       std::string getExclusiveStr() const;
       unsigned long getMemPerCpu() const;
+      std::string getWCKey() const;
+      std::string getExtraParams() const;
       std::string getReference() const;
 
          // For COORM
@@ -155,7 +159,9 @@ namespace Launcher
       std::string _queue;
       bool _exclusive;
       unsigned long _mem_per_cpu;
-      std::string _reference;
+      std::string _wckey;
+      std::string _extra_params;
+      std::string _reference; //! Reference of the job for the batch manager
 
          // Parameters for COORM
          std::string _launcher_file;