Merge class BatchManager_eClient into class BatchManager

[tools/libbatch.git] / src / LSF / Batch_FactBatchManager_eLSF.cxx

diff --git a/src/LSF/Batch_FactBatchManager_eLSF.cxx b/src/LSF/Batch_FactBatchManager_eLSF.cxx
index f79992225f822b3595ed24465979939efe0232a5..ee2585eeec31163e2cba41559d23f872c6101e26 100644 (file)
--- a/src/LSF/Batch_FactBatchManager_eLSF.cxx
+++ b/src/LSF/Batch_FactBatchManager_eLSF.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
@@ -33,8 +33,10 @@
 
 namespace Batch {
 
+  static FactBatchManager_eLSF sFBM_eLSF;
+
   // Constructeur
-  FactBatchManager_eLSF::FactBatchManager_eLSF() : FactBatchManager_eClient("eLSF")
+  FactBatchManager_eLSF::FactBatchManager_eLSF() : FactBatchManager("LSF")
   {
     // Nothing to do
   }
@@ -45,19 +47,14 @@ namespace Batch {
     // Nothing to do
   }
 
-  // Functor
-  BatchManager * FactBatchManager_eLSF::operator() (const char * hostname) const
-  {
-    // MESSAGE("Building new BatchManager_LSF on host '" << hostname << "'");
-    return new BatchManager_eLSF(this, hostname);
-  }
-
-  BatchManager_eClient * FactBatchManager_eLSF::operator() (const char * hostname,
-                                                            CommunicationProtocolType protocolType,
-                                                            const char * mpiImpl) const
+  BatchManager * FactBatchManager_eLSF::operator() (const char * hostname,
+                                                    const char * username,
+                                                    CommunicationProtocolType protocolType,
+                                                    const char * mpiImpl,
+                                                    int nb_proc_per_node) const
   {
     // MESSAGE("Building new BatchManager_LSF on host '" << hostname << "'");
-    return new BatchManager_eLSF(this, hostname, protocolType, mpiImpl);
+    return new BatchManager_eLSF(this, hostname, username, protocolType, mpiImpl);
   }
 
 }