Number of procs per node is now a job parameter instead of a BatchManager attribute

[tools/libbatch.git] / src / LoadLeveler / Batch_FactBatchManager_eLL.cxx

diff --git a/src/LoadLeveler/Batch_FactBatchManager_eLL.cxx b/src/LoadLeveler/Batch_FactBatchManager_eLL.cxx
index 60178736b6ce3a51bc020c196999152e11e9711c..7ca85321aa74045febe026b4c769e93e7e72f7da 100644 (file)
--- a/src/LoadLeveler/Batch_FactBatchManager_eLL.cxx
+++ b/src/LoadLeveler/Batch_FactBatchManager_eLL.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -26,16 +26,20 @@
  *  Author : Renaud BARATE - EDF R&D
  */
 
+#include "Batch_ParameterTypeMap.hxx"
 #include "Batch_BatchManager_eLL.hxx"
 #include "Batch_FactBatchManager_eLL.hxx"
 
 namespace Batch {
 
+  def_Constant(LL_JOBTYPE);
+
   static FactBatchManager_eLL sFBM_eLL;
 
-  FactBatchManager_eLL::FactBatchManager_eLL() : FactBatchManager_eClient("eLL")
+  FactBatchManager_eLL::FactBatchManager_eLL() : FactBatchManager("LL")
   {
-    // Nothing to do
+    // Add specific parameters
+    ParameterTypeMap::getInstance().addParameter(LL_JOBTYPE, STRING, 1);
   }
 
   FactBatchManager_eLL::~FactBatchManager_eLL()
@@ -43,21 +47,13 @@ namespace Batch {
     // Nothing to do
   }
 
-  // Functor
-  BatchManager * FactBatchManager_eLL::operator() (const char * hostname) const
-  {
-    // MESSAGE("Building new BatchManager_eLL on host '" << hostname << "'");
-    return new BatchManager_eLL(this, hostname);
-  }
-
-  BatchManager_eClient * FactBatchManager_eLL::operator() (const char * hostname,
-                                                           const char * username,
-                                                           CommunicationProtocolType protocolType,
-                                                           const char * mpiImpl,
-                                                           int nb_proc_per_node) const
+  BatchManager * FactBatchManager_eLL::operator() (const char * hostname,
+                                                   const char * username,
+                                                   CommunicationProtocolType protocolType,
+                                                   const char * mpiImpl) const
   {
     // MESSAGE("Building new BatchManager_eLL on host '" << hostname << "'");
-    return new BatchManager_eLL(this, hostname, username, protocolType, mpiImpl, nb_proc_per_node);
+    return new BatchManager_eLL(this, hostname, username, protocolType, mpiImpl);
   }
 
 }