Update copyrights 2014.

[modules/jobmanager.git] / src / engine / BL_Job.hxx

diff --git a/src/engine/BL_Job.hxx b/src/engine/BL_Job.hxx
index cb3af3a7c1adfccc6d308c53cfb4f8b7d66f2f36..0a26e8cb6648a1bdf3a40a5551256bcd70c5f821 100644 (file)
--- a/src/engine/BL_Job.hxx
+++ b/src/engine/BL_Job.hxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2009-2013  CEA/DEN, EDF R&D
+// Copyright (C) 2009-2014  CEA/DEN, EDF R&D
 //
 // 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
@@ -56,15 +56,23 @@ namespace BL{
       void setDumpYACSState(const int & dump_yacs_state);
       int getDumpYACSState();
 
+      enum MemReqType {MEM_PER_NODE, MEM_PER_CPU};
+
       struct BatchParam
       {
         std::string batch_directory;
         std::string maximum_duration;
-        std::string expected_memory;
+        unsigned long mem_limit;
+        MemReqType mem_req_type;
         int nb_proc;
+        bool exclusive;
+
+               // Parameters for COORM
+               std::string launcher_file;
+               std::string launcher_args;
       };
-      void setBatchParameters(BL::Job::BatchParam & param);
-      BL::Job::BatchParam & getBatchParameters();
+      void setBatchParameters(const BL::Job::BatchParam & param);
+      const BL::Job::BatchParam & getBatchParameters();
 
       struct FilesParam
       {