Fix remote directories in file transfer and merge some tests

[tools/libbatch.git] / src / Vishnu / Batch_FactBatchManager_eVishnu.cxx

diff --git a/src/Vishnu/Batch_FactBatchManager_eVishnu.cxx b/src/Vishnu/Batch_FactBatchManager_eVishnu.cxx
index c0ede382fe1079691c1f010d993d99addc53b821..932e383f7d5f6e46523fae12359ccc7084875d1a 100644 (file)
--- a/src/Vishnu/Batch_FactBatchManager_eVishnu.cxx
+++ b/src/Vishnu/Batch_FactBatchManager_eVishnu.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2011  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
@@ -35,7 +35,7 @@ namespace Batch {
 
   static FactBatchManager_eVishnu sFBM_eVishnu;
 
-  FactBatchManager_eVishnu::FactBatchManager_eVishnu() : FactBatchManager_eClient("eVISHNU")
+  FactBatchManager_eVishnu::FactBatchManager_eVishnu() : FactBatchManager("VISHNU")
   {
   }
 
@@ -43,20 +43,13 @@ namespace Batch {
   {
   }
 
-  BatchManager * FactBatchManager_eVishnu::operator() (const char * hostname) const
+  BatchManager * FactBatchManager_eVishnu::operator() (const char * hostname,
+                                                       const char * username,
+                                                       CommunicationProtocolType protocolType,
+                                                       const char * mpiImpl) const
   {
     // MESSAGE("Building new BatchManager_eVishnu on host '" << hostname << "'");
-    return new BatchManager_eVishnu(this, hostname);
-  }
-
-  BatchManager_eClient * FactBatchManager_eVishnu::operator() (const char * hostname,
-                                                               const char * username,
-                                                               CommunicationProtocolType protocolType,
-                                                               const char * mpiImpl,
-                                                               int nb_proc_per_node) const
-  {
-    // MESSAGE("Building new BatchManager_eVishnu on host '" << hostname << "'");
-    return new BatchManager_eVishnu(this, hostname, username, protocolType, mpiImpl, nb_proc_per_node);
+    return new BatchManager_eVishnu(this, hostname, username, protocolType, mpiImpl);
   }
 
 }