]> SALOME platform Git repositories - modules/jobmanager.git/commitdiff
Salome HOME
Adding SLURM BR_Dev_For_6_3_1 V6_3_0 V6_3_0b2 V6_3_0rc1
authorribes <ribes>
Thu, 12 May 2011 15:42:44 +0000 (15:42 +0000)
committerribes <ribes>
Thu, 12 May 2011 15:42:44 +0000 (15:42 +0000)
src/genericgui/JM_EditSalomeResource.cxx

index 38b12513a97841bfb9360e8c599c9c911d5f6b32..1f961fdaf9f08ccc279d0a111d4bc6c96dbc7f2f 100644 (file)
@@ -121,6 +121,7 @@ JM::EditSalomeResource::EditSalomeResource(QWidget *parent, BL::SALOMEServices *
   _batch_line->addItem("sge");
   _batch_line->addItem("ssh");
   _batch_line->addItem("ccc");
+  _batch_line->addItem("slurm");
   _batch_line->addItem("ll");
   _batch_line->setCurrentIndex(-1);
 
@@ -130,7 +131,7 @@ JM::EditSalomeResource::EditSalomeResource(QWidget *parent, BL::SALOMEServices *
   _mpiImpl_line->addItem("mpich1");
   _mpiImpl_line->addItem("mpich2");
   _mpiImpl_line->addItem("openmpi");
-  _mpiImpl_line->addItem("slurm");
+  _mpiImpl_line->addItem("slurmmpi");
   _mpiImpl_line->addItem("prun");
   _mpiImpl_line->setCurrentIndex(-1);
 
@@ -215,8 +216,10 @@ JM::EditSalomeResource::get_infos()
     _batch_line->setCurrentIndex(3);
   else if (batch == "ccc")
     _batch_line->setCurrentIndex(4);
-  else if (batch == "ll")
+  else if (batch == "slurm")
     _batch_line->setCurrentIndex(5);
+  else if (batch == "ll")
+    _batch_line->setCurrentIndex(6);
   else  
     _batch_line->setCurrentIndex(-1);
   
@@ -229,7 +232,7 @@ JM::EditSalomeResource::get_infos()
     _mpiImpl_line->setCurrentIndex(2);
   else if (mpiImpl == "openmpi")
     _mpiImpl_line->setCurrentIndex(3);
-  else if (mpiImpl == "slurm")
+  else if (mpiImpl == "slurmmpi")
     _mpiImpl_line->setCurrentIndex(4);
   else if (mpiImpl == "prun")
     _mpiImpl_line->setCurrentIndex(5);