-// Copyright (C) 2007-2019 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
}
// 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");
}
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];