Salome HOME
projects
/
modules
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from V6_main 13/12/2012
[modules/kernel.git]
/
src
/
ResourcesManager
/
SALOME_ResourcesCatalog_Parser.hxx
diff --git
a/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.hxx
b/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.hxx
index 20a390db1f239a37b39a5df7a9fb6f7b3b2d421b..1ac87b3400ea9e38b298dab2945c4a9835b0cd43 100755
(executable)
--- a/
src/ResourcesManager/SALOME_ResourcesCatalog_Parser.hxx
+++ b/
src/ResourcesManager/SALOME_ResourcesCatalog_Parser.hxx
@@
-47,7
+47,7
@@
enum AccessModeType {interactive, batch};
enum BatchType {none, pbs, lsf, sge, ssh_batch, ccc, ll, slurm, vishnu};
enum BatchType {none, pbs, lsf, sge, ssh_batch, ccc, ll, slurm, vishnu};
-enum MpiImplType {nompi, lam, mpich1, mpich2, openmpi, slurmmpi, prun};
+enum MpiImplType {nompi, lam, mpich1, mpich2, openmpi,
ompi,
slurmmpi, prun};
class RESOURCESMANAGER_EXPORT ResourceDataToSort
{
class RESOURCESMANAGER_EXPORT ResourceDataToSort
{