merge from BR_KERNEL_REFACTORING

[modules/kernel.git] / src / ResourcesManager / SALOME_ResourcesManager.cxx

diff --git a/src/ResourcesManager/SALOME_ResourcesManager.cxx b/src/ResourcesManager/SALOME_ResourcesManager.cxx
index eb932fdc84dbbd98adae1909b161e91b26f2dadc..30a1c1b44eadfb65d220409d7d1aad8dc4a3e868 100644 (file)
--- a/src/ResourcesManager/SALOME_ResourcesManager.cxx
+++ b/src/ResourcesManager/SALOME_ResourcesManager.cxx
@@ -237,6 +237,8 @@ SALOME_ResourcesManager::GetResourceDefinition(const char * name)
     p_ptr->mpiImpl = "mpich2";
   else if( resource.mpi == openmpi )
     p_ptr->mpiImpl = "openmpi";
+  else if( resource.mpi == ompi )
+    p_ptr->mpiImpl = "ompi";
   else if( resource.mpi == slurmmpi )
     p_ptr->mpiImpl = "slurmmpi";
   else if( resource.mpi == prun )
@@ -315,6 +317,8 @@ SALOME_ResourcesManager::AddResource(const Engines::ResourceDefinition& new_reso
     resource.mpi = mpich2;
   else if (anMpi == "openmpi")
     resource.mpi = openmpi;
+  else if (anMpi == "ompi")
+    resource.mpi = ompi;
   else if  (anMpi == "slurmmpi")
     resource.mpi = slurmmpi;
   else if  (anMpi == "prun")
@@ -499,7 +503,7 @@ SALOME_ResourcesManager::getMachineFile(std::string resource_name,
           cluster_it++;
         }
       }
-      else if (resource.mpi == openmpi)
+      else if ((resource.mpi == openmpi) || (resource.mpi == ompi))
       {
         // Creating machine file
         machine_file_name = tmpnam(NULL);