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
0023366: [CEA 1972] Porting Salome to GCC 6
[modules/kernel.git]
/
src
/
Container
/
SALOME_ContainerManager.cxx
diff --git
a/src/Container/SALOME_ContainerManager.cxx
b/src/Container/SALOME_ContainerManager.cxx
index 0072c24435fef010576eab033c04b47570598671..676adc8e34b03a7cc0252c8db70bb569ca399233 100644
(file)
--- a/
src/Container/SALOME_ContainerManager.cxx
+++ b/
src/Container/SALOME_ContainerManager.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-390,7
+390,8
@@
Engines::Container_ptr SALOME_ContainerManager::GiveContainer(const Engines::Con
return ret;
}
// A mpi parallel container register on zero node in NS
return ret;
}
// A mpi parallel container register on zero node in NS
- containerNameInNS = _NS->BuildContainerNameForNS(params, GetMPIZeroNode(hostname,machFile).c_str());
+ std::string mpiZeroNode = GetMPIZeroNode(resource_selected,machFile).c_str();
+ containerNameInNS = _NS->BuildContainerNameForNS(params, mpiZeroNode.c_str());
}
else
containerNameInNS = _NS->BuildContainerNameForNS(params, hostname.c_str());
}
else
containerNameInNS = _NS->BuildContainerNameForNS(params, hostname.c_str());
@@
-1000,7
+1001,7
@@
void SALOME_ContainerManager::AddOmninamesParams(std::ostream& fileStream, SALOM
void SALOME_ContainerManager::MakeTheCommandToBeLaunchedASync(std::string& command)
{
#ifdef WIN32
void SALOME_ContainerManager::MakeTheCommandToBeLaunchedASync(std::string& command)
{
#ifdef WIN32
- command = "%PYTHONBIN% -c \"import subprocess ; subprocess.Popen(
command
).pid\"";
+ command = "%PYTHONBIN% -c \"import subprocess ; subprocess.Popen(
r'" + command + "'
).pid\"";
#else
command += " &";
#endif
#else
command += " &";
#endif
@@
-1194,12
+1195,17
@@
std::string SALOME_ContainerManager::GetMPIZeroNode(const std::string machine, c
std::string zeronode;
std::string command;
std::string tmpFile = BuildTemporaryFileName();
std::string zeronode;
std::string command;
std::string tmpFile = BuildTemporaryFileName();
+ const ParserResourcesType resInfo(_resManager->GetResourceDefinition(machine));
+
+ if(resInfo.Protocol == sh)
+ {
+ return resInfo.HostName;
+ }
if( GetenvThreadSafe("LIBBATCH_NODEFILE") == NULL )
{
if (_isAppliSalomeDefined)
{
if( GetenvThreadSafe("LIBBATCH_NODEFILE") == NULL )
{
if (_isAppliSalomeDefined)
{
- const ParserResourcesType resInfo(_resManager->GetResourceDefinition(machine));
if (resInfo.Protocol == rsh)
command = "rsh ";
if (resInfo.Protocol == rsh)
command = "rsh ";