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:
59e3605
)
Added MAXWALLTIME parameter for LoadLeveler
author
barate
<barate>
Tue, 30 Nov 2010 16:39:14 +0000
(16:39 +0000)
committer
barate
<barate>
Tue, 30 Nov 2010 16:39:14 +0000
(16:39 +0000)
src/LoadLeveler/Batch_BatchManager_eLL.cxx
patch
|
blob
|
history
diff --git
a/src/LoadLeveler/Batch_BatchManager_eLL.cxx
b/src/LoadLeveler/Batch_BatchManager_eLL.cxx
index 28ed73c169ba4b30450741106e5490a9c328a1ef..3b348fdd688e401ec02adfdb04dd9420acff65af 100644
(file)
--- a/
src/LoadLeveler/Batch_BatchManager_eLL.cxx
+++ b/
src/LoadLeveler/Batch_BatchManager_eLL.cxx
@@
-125,15
+125,11
@@
namespace Batch {
if (params.find(WORKDIR) != params.end())
workDir = params[WORKDIR].str();
else
if (params.find(WORKDIR) != params.end())
workDir = params[WORKDIR].str();
else
- throw EmulationException("params[WORKDIR] is not defined
! Please defined it, cannot submit this job
");
+ throw EmulationException("params[WORKDIR] is not defined
. Please define it, cannot submit this job.
");
if (params.find(EXECUTABLE) != params.end())
fileToExecute = params[EXECUTABLE].str();
else
if (params.find(EXECUTABLE) != params.end())
fileToExecute = params[EXECUTABLE].str();
else
- throw EmulationException("params[EXECUTABLE] is not defined ! Please defined it, cannot submit this job");
-
- // Optional parameters
- if (params.find(QUEUE) != params.end())
- queue = params[QUEUE].str();
+ throw EmulationException("params[EXECUTABLE] is not defined. Please define it, cannot submit this job.");
string::size_type p1 = fileToExecute.find_last_of("/");
string::size_type p2 = fileToExecute.find_last_of(".");
string::size_type p1 = fileToExecute.find_last_of("/");
string::size_type p2 = fileToExecute.find_last_of(".");
@@
-147,8
+143,12
@@
namespace Batch {
tempOutputFile << "#!/bin/bash" << endl;
tempOutputFile << "# @ output = " << workDir << "/logs/output.log." << rootNameToExecute << endl;
tempOutputFile << "# @ error = " << workDir << "/logs/error.log." << rootNameToExecute << endl;
tempOutputFile << "#!/bin/bash" << endl;
tempOutputFile << "# @ output = " << workDir << "/logs/output.log." << rootNameToExecute << endl;
tempOutputFile << "# @ error = " << workDir << "/logs/error.log." << rootNameToExecute << endl;
- if (queue != "")
- tempOutputFile << "# @ class = " << queue << endl;
+
+ // Optional parameters
+ if (params.find(MAXWALLTIME) != params.end())
+ tempOutputFile << "# @ wall_clock_limit = " << params[MAXWALLTIME] << ":00" << endl;
+ if (params.find(QUEUE) != params.end())
+ tempOutputFile << "# @ class = " << params[QUEUE] << endl;
// Define environment for the job
Environnement env = job.getEnvironnement();
// Define environment for the job
Environnement env = job.getEnvironnement();