From: ribes <ribes>
Date: Mon, 16 Nov 2009 12:45:12 +0000 (+0000)
Subject: Adding queue support for PBS
X-Git-Tag: new_launcher_alpha_091119~7
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ff168645bd6719d80d543988569056b4c05a4534;p=tools%2Flibbatch.git

Adding queue support for PBS
---

diff --git a/src/PBS/Batch_BatchManager_ePBS.cxx b/src/PBS/Batch_BatchManager_ePBS.cxx
index 8e4d1be..31ed6ab 100644
--- a/src/PBS/Batch_BatchManager_ePBS.cxx
+++ b/src/PBS/Batch_BatchManager_ePBS.cxx
@@ -229,6 +229,8 @@ namespace Batch {
       edt = params[MAXWALLTIME];
     if (params.find(MAXRAMSIZE) != params.end()) 
       mem = params[MAXRAMSIZE];
+    if (params.find(QUEUE) != params.end()) 
+      queue = params[QUEUE].str();
 
     string::size_type p1 = fileToExecute.find_last_of("/");
     string::size_type p2 = fileToExecute.find_last_of(".");
@@ -247,15 +249,15 @@ namespace Batch {
       tempOutputFile << "#PBS -l nodes=" << nodes_requested << endl;
     }
     if (queue != "")
-      tempOutputFile << "#BSUB -q " << queue << endl;
+      tempOutputFile << "#PBS -q " << queue << endl;
     if( edt > 0 )
       tempOutputFile << "#PBS -l walltime=" << edt*60 << endl;
     if( mem > 0 )
       tempOutputFile << "#PBS -l mem=" << mem << "mb" << endl;
-    tempOutputFile << "#PBS -o " << workDir << "/logs/output.log." << rootNameToExecute << endl ;
-    tempOutputFile << "#PBS -e " << workDir << "/logs/error.log."  << rootNameToExecute << endl ;
-    tempOutputFile << "cd " << workDir << endl ;
-    tempOutputFile << "./" + fileNameToExecute << endl;;
+    tempOutputFile << "#PBS -o " << workDir << "/logs/output.log." << rootNameToExecute << endl;
+    tempOutputFile << "#PBS -e " << workDir << "/logs/error.log."  << rootNameToExecute << endl;
+    tempOutputFile << "cd " << workDir << endl;
+    tempOutputFile << "./" + fileNameToExecute << endl;
     tempOutputFile.flush();
     tempOutputFile.close();