Adding a new specific parameter for LoadLeveler

name  = LoadLevelerJobType
value = loadleveler job type (usualy is serial, mpi, bluegene, ...)

diff --git a/salome_adm/unix/config_files/check_libbatch.m4 b/salome_adm/unix/config_files/check_libbatch.m4
index 8c5ec95afae3174859f7cf3b8788f192c3af3480..089dc070df8fec563d3c93b80773b65f87498b64 100644 (file)
--- a/salome_adm/unix/config_files/check_libbatch.m4
+++ b/salome_adm/unix/config_files/check_libbatch.m4
@@ -53,14 +53,14 @@ LOCAL_INCLUDES=""
 LOCAL_LIBS=""
 
 if test "x$LIBBATCH_DIR" != "x" ; then
-  LOCAL_INCLUDES="-I$LIBBATCH_DIR/include"
+  LOCAL_INCLUDES="-I$LIBBATCH_DIR/include/Batch"
   if test "x$LIBBATCH_DIR" = "x/usr" ; then
     LOCAL_LIBS="-lBatch"
   else
     LOCAL_LIBS="-L$LIBBATCH_DIR/lib -lBatch"
   fi
 else
-  LOCAL_INCLUDES="-I/usr/include"
+  LOCAL_INCLUDES="-I/usr/include/Batch"
   LOCAL_LIBS="-lBatch"
 fi
 

diff --git a/src/Launcher/BatchTest.cxx b/src/Launcher/BatchTest.cxx
index 80f59953e8962b2068f3c64fb111d75484a85b0a..53a765bf04bf8bb6602216a159d2a5ff3f8cee9f 100644 (file)
--- a/src/Launcher/BatchTest.cxx
+++ b/src/Launcher/BatchTest.cxx
@@ -24,8 +24,8 @@
 #include "Launcher.hxx"
 
 #ifdef WITH_LIBBATCH
-#include <Batch/Batch_Date.hxx>
-#include <Batch/Batch_MpiImpl.hxx>
+#include <Batch_Date.hxx>
+#include <Batch_MpiImpl.hxx>
 #endif
 
 #include "utilities.h"

diff --git a/src/Launcher/Launcher.cxx b/src/Launcher/Launcher.cxx
index e416a934c26b2adfe7bd9808619417faa99b2bbf..672212ba721a2bbc5c9f785357cff339d41dd3cb 100644 (file)
--- a/src/Launcher/Launcher.cxx
+++ b/src/Launcher/Launcher.cxx
@@ -21,10 +21,10 @@
 //
 
 #ifdef WITH_LIBBATCH
-#include <Batch/Batch_Date.hxx>
-#include <Batch/Batch_BatchManagerCatalog.hxx>
-#include <Batch/Batch_FactBatchManager_eClient.hxx>
-#include <Batch/Batch_BatchManager_eClient.hxx>
+#include <Batch_Date.hxx>
+#include <Batch_BatchManagerCatalog.hxx>
+#include <Batch_FactBatchManager_eClient.hxx>
+#include <Batch_BatchManager_eClient.hxx>
 #endif
 
 #include "Basics_Utils.hxx"

diff --git a/src/Launcher/Launcher_Job.cxx b/src/Launcher/Launcher_Job.cxx
index d2023ae128176c95ce077160a20fb1de335c1d8e..72594b8da042955f0aaee578cd419753f12d635f 100644 (file)
--- a/src/Launcher/Launcher_Job.cxx
+++ b/src/Launcher/Launcher_Job.cxx
@@ -23,7 +23,7 @@
 #include "Launcher.hxx"
 
 #ifdef WITH_LIBBATCH
-#include <Batch/Batch_Constants.hxx>
+#include <Batch_Constants.hxx>
 #endif
 
 Launcher::Job::Job()
@@ -507,6 +507,10 @@ Launcher::Job::common_job_params()
   if (_queue != "")
     params[Batch::QUEUE] = _queue;
 
+  // Specific parameters
+  std::map<std::string, std::string>::iterator it = _specific_parameters.find("LoalLevelerJobType");
+  if (it != _specific_parameters.end())
+    params[Batch::LL_JOBTYPE] = it->second;
   return params;
 }
 

diff --git a/src/Launcher/Launcher_Job.hxx b/src/Launcher/Launcher_Job.hxx
index eeba823a743d65c9d3fc3c05f72ccd657662a2bf..ae169ad440ed355adb4d3e7b72ada62b776c3f2e 100644 (file)
--- a/src/Launcher/Launcher_Job.hxx
+++ b/src/Launcher/Launcher_Job.hxx
@@ -38,10 +38,10 @@
 #include <exception>
 
 #ifdef WITH_LIBBATCH
-#include <Batch/Batch_Job.hxx>
-#include <Batch/Batch_Date.hxx>
-#include <Batch/Batch_JobId.hxx>
-#include <Batch/Batch_EmulationException.hxx>
+#include <Batch_Job.hxx>
+#include <Batch_Date.hxx>
+#include <Batch_JobId.hxx>
+#include <Batch_EmulationException.hxx>
 #endif
 
 #include <libxml/parser.h>