From dbe7001b8d2000cbc1a9dbb58de88ddbecda1a5b Mon Sep 17 00:00:00 2001
From: secher <secher>
Date: Tue, 15 Jun 2010 07:45:17 +0000
Subject: [PATCH] debug for mpi container

---
 src/Container/SALOME_ContainerManager.cxx | 2 +-
 src/Launcher/Launcher_Job_SALOME.cxx      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Container/SALOME_ContainerManager.cxx b/src/Container/SALOME_ContainerManager.cxx
index 497e0c1ed..8412d2f91 100644
--- a/src/Container/SALOME_ContainerManager.cxx
+++ b/src/Container/SALOME_ContainerManager.cxx
@@ -1063,7 +1063,7 @@ std::string SALOME_ContainerManager::GetMPIZeroNode(const std::string machine, c
   status = system(command.c_str());
   if( status == 0 ){
     std::ifstream fp(tmpFile.c_str(),std::ios::in);
-    fp >> zeronode;
+    while(fp >> zeronode);
   }
 
   RmTmpFile(tmpFile);
diff --git a/src/Launcher/Launcher_Job_SALOME.cxx b/src/Launcher/Launcher_Job_SALOME.cxx
index 5d0e16b2d..d11057b51 100644
--- a/src/Launcher/Launcher_Job_SALOME.cxx
+++ b/src/Launcher/Launcher_Job_SALOME.cxx
@@ -77,7 +77,7 @@ Launcher::Job_SALOME::buildSalomeScript(Batch::Parametre params)
     resource_protocol = "rsh";
   
   launch_script_stream << "if [ \"x$LIBBATCH_NODEFILE\" != \"x\" ]; then " << std::endl;
-  launch_script_stream << "CATALOG_FILE=" << work_directory << "/CatalogResources_" << _launch_date << ".xml" << std::endl;
+  launch_script_stream << "CATALOG_FILE=" << "CatalogResources_" << _launch_date << ".xml" << std::endl;
   launch_script_stream << "export USER_CATALOG_RESOURCES_FILE=" << "$CATALOG_FILE" << std::endl;
   launch_script_stream << "echo '<!DOCTYPE ResourcesCatalog>'  > $CATALOG_FILE" << std::endl;
   launch_script_stream << "echo '<resources>'                 >> $CATALOG_FILE" << std::endl;	
-- 
2.39.2