Remove distinction between batch managers ssh_batch and none

diff --git a/src/Launcher/Launcher.cxx b/src/Launcher/Launcher.cxx
index 8471b2265615a38f3bfab27aae4bcfbf77875648..9ec41817f047118470f3349e8c31abd4f293b17d 100644 (file)
--- a/src/Launcher/Launcher.cxx
+++ b/src/Launcher/Launcher.cxx
@@ -454,7 +454,7 @@ Launcher_cpp::FactoryBatchManager(ParserResourcesType& params)
     case slurm:
       bmType = "SLURM";
       break;
-    case ssh_batch:
+    case none:
       bmType = "LOCAL";
       break;
     case ll:

diff --git a/src/ResourcesManager/ResourcesManager.cxx b/src/ResourcesManager/ResourcesManager.cxx
index 30b32efe9b6048199819e6b94e571cc6fb5d8497..45c5bccd9142ed11431f5cf1a3a0e8857f5a3d5d 100644 (file)
--- a/src/ResourcesManager/ResourcesManager.cxx
+++ b/src/ResourcesManager/ResourcesManager.cxx
@@ -580,7 +580,7 @@ void ResourcesManager_cpp::AddDefaultResourceInCatalog()
   resource.HostName = Kernel_Utils::GetHostname();
   resource.DataForSort._Name = DEFAULT_RESOURCE_NAME;
   resource.Protocol = sh;
-  resource.Batch = ssh_batch;
+  resource.Batch = none;
   if (getenv("HOME") != NULL && getenv("APPLI") != NULL)
   {
     resource.AppliPath = string(getenv("HOME")) + "/" + getenv("APPLI");

diff --git a/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.cxx b/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.cxx
index 7a5750f41ccb0fa2d0325d0028bc205f1fe626bd..46685377a62ab917ea9b4fa5a9674115110400bb 100644 (file)
--- a/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.cxx
+++ b/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.cxx
@@ -278,8 +278,6 @@ ParserResourcesType::getBatchTypeStr() const
     return "oar";
   case coorm:
     return "coorm";
-  case ssh_batch:
-    return "ssh_batch";
   default:
     throw SALOME_Exception("Unknown batch type");
   }
@@ -348,8 +346,6 @@ void ParserResourcesType::setBatchTypeStr(const string & batchTypeStr)
     Batch = slurm;
   else if (batchTypeStr == "ccc")
     Batch = ccc;
-  else if (batchTypeStr == "ssh_batch")
-    Batch = ssh_batch;
   else if (batchTypeStr == "ll")
     Batch = ll;
   else if (batchTypeStr == "vishnu")
@@ -358,7 +354,7 @@ void ParserResourcesType::setBatchTypeStr(const string & batchTypeStr)
     Batch = oar;
   else if (batchTypeStr == "coorm")
     Batch = coorm;
-  else if (batchTypeStr == "")
+  else if (batchTypeStr == "" || batchTypeStr == "none" || batchTypeStr == "ssh_batch")
     Batch = none;
   else
     throw SALOME_Exception((string("Unknown batch type ") + batchTypeStr).c_str());

diff --git a/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.hxx b/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.hxx
index 75969394f701641a539fbbaf829ba669f390a59e..351d1e0c70a3cf9133ea7e55a70e15a7e1b10d02 100755 (executable)
--- a/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.hxx
+++ b/src/ResourcesManager/SALOME_ResourcesCatalog_Parser.hxx
@@ -45,7 +45,7 @@ enum AccessProtocolType {sh, rsh, ssh, srun, pbsdsh, blaunch};
 
 enum ResourceType {cluster, single_machine};
 
-enum BatchType {none, pbs, lsf, sge, ssh_batch, ccc, ll, slurm, vishnu, oar, coorm};
+enum BatchType {none, pbs, lsf, sge, ccc, ll, slurm, vishnu, oar, coorm};
 
 enum MpiImplType {nompi, lam, mpich1, mpich2, openmpi, ompi, slurmmpi, prun};