Deal with rounding issues(PBS).

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

diff --git a/src/PBS/BatchManager_PBS.cxx b/src/PBS/BatchManager_PBS.cxx
index 14255ba7140bc2c3108adddb6d289ef42f4cd176..b0a26da0dd4e763c619eac1e2b22aa9626f6ef08 100644 (file)
--- a/src/PBS/BatchManager_PBS.cxx
+++ b/src/PBS/BatchManager_PBS.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2020  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
@@ -60,14 +60,11 @@ namespace Batch {
   }
 
   // Methode pour le controle des jobs : soumet un job au gestionnaire
-  const JobId BatchManager_PBS::submitJob(const Job & job)
+  const JobId BatchManager_PBS::runJob(const Job & job)
   {
     Parametre params = job.getParametre();
     const std::string workDir = params[WORKDIR];
 
-    // export input files on cluster
-    exportInputFiles(job);
-
     // build batch script for job
     string scriptFile = buildSubmissionScript(job);
 
@@ -131,7 +128,7 @@ namespace Batch {
   }
 
   // Methode pour le controle des jobs : teste si un job est present en machine
-  bool BatchManager_PBS::isRunning(const JobId & jobid)
+  bool BatchManager_PBS::isRunning(const JobId & /*jobid*/)
   {
     throw NotYetImplementedException("BatchManager_PBS::isRunning");
   }
@@ -157,9 +154,22 @@ namespace Batch {
     int nbproc = 1;
     if (params.find(NBPROC) != params.end())
       nbproc = params[NBPROC];
-    int nbprocpernode = 1;
+    int nbprocpernode = 0;
     if (params.find(NBPROCPERNODE) != params.end())
       nbprocpernode = params[NBPROCPERNODE];
+    int nbnode = 0;
+    if (params.find(NBNODE) != params.end())
+    {
+      nbnode = params[NBNODE];
+      if(nbnode > 0 && nbprocpernode == 0)
+      {
+        nbprocpernode = nbproc / nbnode;
+        if(nbprocpernode * nbnode < nbproc)
+          ++nbprocpernode;
+      }
+    }
+    if(nbprocpernode == 0) // if not defined
+      nbprocpernode = 1;
     int edt = 0;
     if (params.find(MAXWALLTIME) != params.end()) 
       edt = params[MAXWALLTIME];