From 404c8a43f3909b7335445ed2aff78ceac2b4d834 Mon Sep 17 00:00:00 2001
From: barate <barate>
Date: Fri, 18 Feb 2011 09:01:43 +0000
Subject: [PATCH] Fixed BatchManager_eLL for use with Ivanoe cluster (temporary
 fix, a cleaner fix has to be found)

---
 src/LoadLeveler/Batch_BatchManager_eLL.cxx | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/LoadLeveler/Batch_BatchManager_eLL.cxx b/src/LoadLeveler/Batch_BatchManager_eLL.cxx
index a9a47d5..d0fca47 100644
--- a/src/LoadLeveler/Batch_BatchManager_eLL.cxx
+++ b/src/LoadLeveler/Batch_BatchManager_eLL.cxx
@@ -144,8 +144,25 @@ namespace Batch {
     tempOutputFile << "#!/bin/bash" << endl;
     tempOutputFile << "# @ output = " << workDir << "/logs/output.log." << rootNameToExecute << endl;
     tempOutputFile << "# @ error = " << workDir << "/logs/error.log." << rootNameToExecute << endl;
+    tempOutputFile << "# @ node_usage = not_shared" << endl;
+
+    if (params.find(NAME) != params.end())
+      tempOutputFile << "# @ job_name = " << params[NAME] << endl;
 
     // Optional parameters
+    int nbproc = 1;
+    if (params.find(NBPROC) != params.end())
+      nbproc = params[NBPROC];
+    //if (nbproc == 1)
+    //  tempOutputFile << "# @ job_type = serial" << endl;
+    //else {
+      //  tempOutputFile << "# @ job_type = parallel" << endl;
+      tempOutputFile << "# @ job_type = mpich" << endl;
+      tempOutputFile << "# @ node = " << nbproc << endl;
+      tempOutputFile << "# @ tasks_per_node = 1" << endl;
+    //}
+    //tempOutputFile << "# @ job_type = bluegene" << endl;
+
     if (params.find(MAXWALLTIME) != params.end())
       tempOutputFile << "# @ wall_clock_limit = " << params[MAXWALLTIME] << ":00" << endl;
     if (params.find(MAXRAMSIZE) != params.end())
@@ -164,7 +181,6 @@ namespace Batch {
       tempOutputFile << endl;
     }
 
-    tempOutputFile << "# @ job_type = bluegene" << endl;
     tempOutputFile << "# @ queue" << endl;
 
     // generate nodes file
-- 
2.39.2