Adapt to change in nbprocpernode in libbatch

diff --git a/src/Launcher/Launcher.cxx b/src/Launcher/Launcher.cxx
index 02c2ab966fc35f96e6096dcc4ced8c2e010ff25e..4b74fca15aca3f165138b25ac2553408403dbff5 100644 (file)
--- a/src/Launcher/Launcher.cxx
+++ b/src/Launcher/Launcher.cxx
@@ -368,7 +368,6 @@ Launcher_cpp::FactoryBatchManager(ParserResourcesType& params)
   Batch::CommunicationProtocolType protocol;
   Batch::FactBatchManager * fact;
 
-  int nb_proc_per_node = params.DataForSort._nbOfProcPerNode;
   std::string hostname = params.HostName;
 
   switch(params.Protocol)
@@ -450,7 +449,7 @@ Launcher_cpp::FactoryBatchManager(ParserResourcesType& params)
   }
   LAUNCHER_MESSAGE("Instanciation of batch manager of type: " << bmType);
   Batch::BatchManager * batch_client = (*fact)(hostname.c_str(), params.UserName.c_str(),
-                                               protocol, mpi.c_str(), nb_proc_per_node);
+                                               protocol, mpi.c_str());
   return batch_client;
 }
 

diff --git a/src/Launcher/Launcher_Job.cxx b/src/Launcher/Launcher_Job.cxx
index 945baabc11e312fdea55df3b78c6e00f735dde21..9ade1bfd2d450d2d3463a8996ac0278d19c96fc0 100644 (file)
--- a/src/Launcher/Launcher_Job.cxx
+++ b/src/Launcher/Launcher_Job.cxx
@@ -457,6 +457,7 @@ Launcher::Job::common_job_params()
   params[Batch::NAME] = getJobName();
   params[Batch::USER] = _resource_definition.UserName;
   params[Batch::NBPROC] = _resource_required_params.nb_proc;
+  params[Batch::NBPROCPERNODE] = _resource_required_params.nb_proc_per_node;
 
   // Memory in megabytes
   if (_resource_required_params.mem_mb > 0)