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 c3cf644074913426921395e91d624e5fd7db5c7e..b0a26da0dd4e763c619eac1e2b22aa9626f6ef08 100644 (file)
--- a/src/PBS/BatchManager_PBS.cxx
+++ b/src/PBS/BatchManager_PBS.cxx
@@ -154,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];