Merge from BR_VISHNU

diff --git a/src/Launcher/Launcher.cxx b/src/Launcher/Launcher.cxx
index 919f2fcc0374cfba21dc4a573459ab10765182f9..46ee67b54a7984c40092487c482ca57f4c937c2a 100644 (file)
--- a/src/Launcher/Launcher.cxx
+++ b/src/Launcher/Launcher.cxx
@@ -422,6 +422,9 @@ Launcher_cpp::FactoryBatchManager(ParserResourcesType& params)
     case ll:
       bmType = "eLL";
       break;
+    case vishnu:
+      bmType = "eVISHNU";
+      break;
     default:
       LAUNCHER_MESSAGE("Bad batch description of the resource: Batch = " << params.Batch);
       throw LauncherException("No batchmanager for that cluster - Bad batch description of the resource");

diff --git a/src/ResourcesManager/SALOME_ResourcesCatalog_Handler.cxx b/src/ResourcesManager/SALOME_ResourcesCatalog_Handler.cxx
index 73ac4ece0f88959028a9946b764a71fa20e9dcef..4f40a979279018e1d743776e519749b27c5e2de3 100755 (executable)
--- a/src/ResourcesManager/SALOME_ResourcesCatalog_Handler.cxx
+++ b/src/ResourcesManager/SALOME_ResourcesCatalog_Handler.cxx
@@ -524,6 +524,8 @@ SALOME_ResourcesCatalog_Handler::ProcessMachine(xmlNodePtr machine_descr, Parser
       resource.Batch = slurm;
     else if  (aBatch == "ll")
       resource.Batch = ll;
+    else if  (aBatch == "vishnu")
+      resource.Batch = vishnu;
     else
       resource.Batch = none;
   }
@@ -745,6 +747,9 @@ void SALOME_ResourcesCatalog_Handler::PrepareDocToXmlFile(xmlDocPtr theDoc)
       case ll:
         xmlNewProp(node, BAD_CAST test_batch, BAD_CAST "ll");
         break;
+      case vishnu:
+        xmlNewProp(node, BAD_CAST test_batch, BAD_CAST "vishnu");
+        break;
       default:
         xmlNewProp(node, BAD_CAST test_batch, BAD_CAST "");
     }

diff --git a/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.cxx b/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.cxx
index 13583cd2caef42b698a8e4101cc4ba866a12e023..62df8530489c15569b23bdd29dbfcabfd2ee42ce 100644 (file)
--- a/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.cxx
+++ b/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.cxx
@@ -244,6 +244,8 @@ ParserResourcesType::PrintBatchType() const
     return "slurm";
   else if (Batch == ll)
     return "ll";
+  else if (Batch == vishnu)
+    return "vishnu";
   else 
     return "ssh";
 }

diff --git a/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.hxx b/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.hxx
index 1885a8e3ce9c693b95452900c71f055077dfeca5..bc164cd2e5915c3e3467f05b3a6931ac032376f0 100755 (executable)
--- a/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.hxx
+++ b/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.hxx
@@ -45,7 +45,7 @@ enum AccessProtocolType {rsh, ssh, srun, pbsdsh, blaunch};
 
 enum AccessModeType {interactive, batch};
 
-enum BatchType {none, pbs, lsf, sge, ssh_batch, ccc, ll, slurm};
+enum BatchType {none, pbs, lsf, sge, ssh_batch, ccc, ll, slurm, vishnu};
 
 enum MpiImplType {nompi, lam, mpich1, mpich2, openmpi, slurmmpi, prun};
 

diff --git a/src/ResourcesManager/SALOME_ResourcesManager.cxx b/src/ResourcesManager/SALOME_ResourcesManager.cxx
index 090b2d3530c8e9bd400f18b2a16e49bc7f7b0e6a..506501089dfaf9ad3f777621ee9a5bc07b969d4c 100644 (file)
--- a/src/ResourcesManager/SALOME_ResourcesManager.cxx
+++ b/src/ResourcesManager/SALOME_ResourcesManager.cxx
@@ -256,6 +256,8 @@ SALOME_ResourcesManager::GetResourceDefinition(const char * name)
     p_ptr->batch = "ssh";
   else if( resource.Batch == ll )
     p_ptr->batch = "ll";
+  else if( resource.Batch == vishnu )
+    p_ptr->batch = "vishnu";
 
   return p_ptr;
 }
@@ -293,6 +295,8 @@ SALOME_ResourcesManager::AddResource(const Engines::ResourceDefinition& new_reso
     resource.Batch = ssh_batch;
   else if  (aBatch == "ll")
     resource.Batch = ll;
+  else if  (aBatch == "vishnu")
+    resource.Batch = vishnu;
   else if (aBatch == "")
     resource.Batch = none;
   else {