Salome HOME
projects
/
tools
/
libbatch.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
79ce173
)
Use NBNODE with PBS.
author
Ovidiu Mircescu
<ovidiu.mircescu@edf.fr>
Wed, 27 Jan 2021 15:44:24 +0000
(16:44 +0100)
committer
Ovidiu Mircescu
<ovidiu.mircescu@edf.fr>
Wed, 27 Jan 2021 15:44:24 +0000
(16:44 +0100)
src/PBS/BatchManager_PBS.cxx
patch
|
blob
|
history
diff --git
a/src/PBS/BatchManager_PBS.cxx
b/src/PBS/BatchManager_PBS.cxx
index c3cf644074913426921395e91d624e5fd7db5c7e..265c6ec0d246607bf0cefa665a573e9fac0e6109 100644
(file)
--- a/
src/PBS/BatchManager_PBS.cxx
+++ b/
src/PBS/BatchManager_PBS.cxx
@@
-154,9
+154,18
@@
namespace Batch {
int nbproc = 1;
if (params.find(NBPROC) != params.end())
nbproc = params[NBPROC];
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];
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 == 0) // if not defined
+ nbprocpernode = 1;
int edt = 0;
if (params.find(MAXWALLTIME) != params.end())
edt = params[MAXWALLTIME];
int edt = 0;
if (params.find(MAXWALLTIME) != params.end())
edt = params[MAXWALLTIME];