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

[tools/libbatch.git] / src / PBS / Batch_FactBatchManager_ePBS.cxx

diff --git a/src/PBS/Batch_FactBatchManager_ePBS.cxx b/src/PBS/Batch_FactBatchManager_ePBS.cxx
index 2984a3c077bf6066f55b605ce7f80e9330a1e4b3..df41a541ff0509befabd8d60d9243899556a7cb5 100644 (file)
--- a/src/PBS/Batch_FactBatchManager_ePBS.cxx
+++ b/src/PBS/Batch_FactBatchManager_ePBS.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  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
@@ -28,17 +28,15 @@
  *
  */
 
-#include <string>
 #include "Batch_BatchManager_ePBS.hxx"
 #include "Batch_FactBatchManager_ePBS.hxx"
-//#include "utilities.h"
 
 namespace Batch {
 
   static FactBatchManager_ePBS sFBM_ePBS;
 
   // Constructeur
-  FactBatchManager_ePBS::FactBatchManager_ePBS() : FactBatchManager_eClient("ePBS")
+  FactBatchManager_ePBS::FactBatchManager_ePBS() : FactBatchManager("PBS")
   {
     // Nothing to do
   }
@@ -49,20 +47,12 @@ namespace Batch {
     // Nothing to do
   }
 
-  // Functor
-  BatchManager * FactBatchManager_ePBS::operator() (const char * hostname) const
+  BatchManager * FactBatchManager_ePBS::operator() (const char * hostname,
+                                                    const char * username,
+                                                    CommunicationProtocolType protocolType,
+                                                    const char * mpiImpl) const
   {
-    // MESSAGE("Building new BatchManager_PBS on host '" << hostname << "'");
-    return new BatchManager_ePBS(this, hostname);
+    return new BatchManager_ePBS(this, hostname, username, protocolType, mpiImpl);
   }
 
-  BatchManager_eClient * FactBatchManager_ePBS::operator() (const char * hostname,
-                                                            CommunicationProtocolType protocolType,
-                                                            const char * mpiImpl) const
-  {
-    // MESSAGE("Building new BatchManager_PBS on host '" << hostname << "'");
-    return new BatchManager_ePBS(this, hostname, protocolType, mpiImpl);
-  }
-
-
 }