version qui roule en sequentielle

diff --git a/resources/CatalogResources.xml b/resources/CatalogResources.xml
index 17d03ed45ec1aee3fad0628b7c5a03c8670cb258..3f8689ac2551f6a0972766d023785ca2781a4028 100644 (file)
--- a/resources/CatalogResources.xml
+++ b/resources/CatalogResources.xml
@@ -3,42 +3,46 @@
 
 <machine hostname="is111790" OS="LINUX" CPUFreqMHz="2992" memInMB="1024" protocol="r" mode="i" nbOfNodes="1" nbOfProcPerNode="1" preReqFilePath="/home/secher/SALOME2_INSTALL/KERNEL_INSTALL/salome.sh" >
 <modules modulePath="/home/secher/SALOME2_INSTALL/KERNEL_INSTALL" moduleName="KERNEL" />
-<modules modulePath="/export/home/LGLS/Products/MED_2.2.2" moduleName="MED" />
-<modules modulePath="/export/home/LGLS/Products/GEOM_2.2.2" moduleName="GEOM" />
-<modules modulePath="/export/home/LGLS/Products/SMESH_2.2.2" moduleName="SMESH" />
-<modules modulePath="/export/home/LGLS/Products/SUPERV_2.2.2" moduleName="SUPERV" />
-<modules modulePath="/export/home/LGLS/Products/VISU_2.2.2" moduleName="VISU" />
+<modules modulePath="/export/home/LGLS/Products/MED_3.0.0" moduleName="MED" />
+<modules modulePath="/export/home/LGLS/Products/GEOM_3.0.0" moduleName="GEOM" />
+<modules modulePath="/export/home/LGLS/Products/SMESH_3.0.0" moduleName="SMESH" />
+<modules modulePath="/export/home/LGLS/Products/SUPERV_3.0.0" moduleName="SUPERV" />
+<modules modulePath="/export/home/LGLS/Products/VISU_3.0.0" moduleName="VISU" />
 <modules modulePath="/home/secher/SALOME2_INSTALL/MYCOMPO_INSTALL" moduleName="MYCOMPO" />
+<modules modulePath="/home/secher/SALOME2_INSTALL/MYMPICOMPO_INSTALL" moduleName="MYMPICOMPO" />
 </machine>
 
 <machine hostname="is111915" OS="LINUX" CPUFreqMHz="2992" memInMB="1024" protocol="r" mode="i" nbOfNodes="1" nbOfProcPerNode="1" preReqFilePath="/home/secher/SALOME2_INSTALL/KERNEL_INSTALL/salome.sh" >
 <modules modulePath="/home/secher/SALOME2_INSTALL/KERNEL_INSTALL" moduleName="KERNEL" />
-<modules modulePath="/export/home/LGLS/Products/MED_2.2.2" moduleName="MED" />
-<modules modulePath="/export/home/LGLS/Products/GEOM_2.2.2" moduleName="GEOM" />
-<modules modulePath="/export/home/LGLS/Products/SMESH_2.2.2" moduleName="SMESH" />
-<modules modulePath="/export/home/LGLS/Products/SUPERV_2.2.2" moduleName="SUPERV" />
-<modules modulePath="/export/home/LGLS/Products/VISU_2.2.2" moduleName="VISU" />
+<modules modulePath="/export/home/LGLS/Products/MED_3.0.0" moduleName="MED" />
+<modules modulePath="/export/home/LGLS/Products/GEOM_3.0.0" moduleName="GEOM" />
+<modules modulePath="/export/home/LGLS/Products/SMESH_3.0.0" moduleName="SMESH" />
+<modules modulePath="/export/home/LGLS/Products/SUPERV_3.0.0" moduleName="SUPERV" />
+<modules modulePath="/export/home/LGLS/Products/VISU_3.0.0" moduleName="VISU" />
 <modules modulePath="/home/secher/SALOME2_INSTALL/MYCOMPO_INSTALL" moduleName="MYCOMPO" />
+<modules modulePath="/home/secher/SALOME2_INSTALL/MYMPICOMPO_INSTALL" moduleName="MYMPICOMPO" />
 </machine>
 
 <machine hostname="is111918" OS="LINUX" CPUFreqMHz="2992" memInMB="1024" protocol="r" mode="i" nbOfNodes="1" nbOfProcPerNode="1" preReqFilePath="/home/secher/SALOME2_INSTALL/KERNEL_INSTALL/salome.sh" >
 <modules modulePath="/home/secher/SALOME2_INSTALL/KERNEL_INSTALL" moduleName="KERNEL" />
-<modules modulePath="/export/home/LGLS/Products/MED_2.2.2" moduleName="MED" />
-<modules modulePath="/export/home/LGLS/Products/GEOM_2.2.2" moduleName="GEOM" />
-<modules modulePath="/export/home/LGLS/Products/SMESH_2.2.2" moduleName="SMESH" />
-<modules modulePath="/export/home/LGLS/Products/SUPERV_2.2.2" moduleName="SUPERV" />
-<modules modulePath="/export/home/LGLS/Products/VISU_2.2.2" moduleName="VISU" />
+<modules modulePath="/export/home/LGLS/Products/MED_3.0.0" moduleName="MED" />
+<modules modulePath="/export/home/LGLS/Products/GEOM_3.0.0" moduleName="GEOM" />
+<modules modulePath="/export/home/LGLS/Products/SMESH_3.0.0" moduleName="SMESH" />
+<modules modulePath="/export/home/LGLS/Products/SUPERV_3.0.0" moduleName="SUPERV" />
+<modules modulePath="/export/home/LGLS/Products/VISU_3.0.0" moduleName="VISU" />
 <modules modulePath="/home/secher/SALOME2_INSTALL/MYCOMPO_INSTALL" moduleName="MYCOMPO" />
+<modules modulePath="/home/secher/SALOME2_INSTALL/MYMPICOMPO_INSTALL" moduleName="MYMPICOMPO" />
 </machine>
 
 <machine hostname="is111996" OS="LINUX" CPUFreqMHz="2992" memInMB="1024" protocol="r" mode="i" nbOfNodes="1" nbOfProcPerNode="1" preReqFilePath="/home/secher/SALOME2_INSTALL/KERNEL_INSTALL/salome.sh" >
 <modules modulePath="/home/secher/SALOME2_INSTALL/KERNEL_INSTALL" moduleName="KERNEL" />
-<modules modulePath="/export/home/LGLS/Products/MED_2.2.2" moduleName="MED" />
-<modules modulePath="/export/home/LGLS/Products/GEOM_2.2.2" moduleName="GEOM" />
-<modules modulePath="/export/home/LGLS/Products/SMESH_2.2.2" moduleName="SMESH" />
-<modules modulePath="/export/home/LGLS/Products/SUPERV_2.2.2" moduleName="SUPERV" />
-<modules modulePath="/export/home/LGLS/Products/VISU_2.2.2" moduleName="VISU" />
+<modules modulePath="/export/home/LGLS/Products/MED_3.0.0" moduleName="MED" />
+<modules modulePath="/export/home/LGLS/Products/GEOM_3.0.0" moduleName="GEOM" />
+<modules modulePath="/export/home/LGLS/Products/SMESH_3.0.0" moduleName="SMESH" />
+<modules modulePath="/export/home/LGLS/Products/SUPERV_3.0.0" moduleName="SUPERV" />
+<modules modulePath="/export/home/LGLS/Products/VISU_3.0.0" moduleName="VISU" />
 <modules modulePath="/home/secher/SALOME2_INSTALL/MYCOMPO_INSTALL" moduleName="MYCOMPO" />
+<modules modulePath="/home/secher/SALOME2_INSTALL/MYMPICOMPO_INSTALL" moduleName="MYMPICOMPO" />
 </machine>
 
 </resources>

diff --git a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx
index ded32a011dee8b64987da04b0dbfbfdb81999919..520755cb4664f8233443922542a9f3ee4388edf5 100644 (file)
--- a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx
+++ b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.cxx
@@ -190,6 +190,7 @@ SALOME_LifeCycleCORBA::FindOrLoad_Component(const char *containerName,
     params->container_name=CORBA::string_dup(stContainer+rg+1);
     params->hostname=CORBA::string_dup(stContainer);
   }
+  params->isMPI = false;
   free(stContainer);
   return FindOrLoad_Component(params,componentName);
   

diff --git a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx
index 071595d9d1e216dd78aab69454d70e61a4dac11f..a46e023c8237287a5546936fa394fae84f2d5b03 100644 (file)
--- a/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx
+++ b/src/LifeCycleCORBA/SALOME_LifeCycleCORBA.hxx
@@ -53,9 +53,6 @@ public:
   SALOME_LifeCycleCORBA(SALOME_NamingService *ns = 0);
   virtual ~SALOME_LifeCycleCORBA();
 
-  Engines::Container_ptr 
-  FindContainer(const char *containerName); // for supervision
-
   Engines::Component_ptr 
   FindComponent(const Engines::MachineParameters& params,
                const char *componentName, 

diff --git a/src/ResourcesManager/SALOME_ResourcesManager.cxx b/src/ResourcesManager/SALOME_ResourcesManager.cxx
index 93e79d6c7ae517f9e8e2e14bdb7b1258525e8183..8edf5a264beacbb4a26ca634b34e3f8e4aef0a00 100644 (file)
--- a/src/ResourcesManager/SALOME_ResourcesManager.cxx
+++ b/src/ResourcesManager/SALOME_ResourcesManager.cxx
@@ -1,4 +1,4 @@
-#include "SALOME_ResourcesManager.hxx"
+ #include "SALOME_ResourcesManager.hxx"
 #include "SALOME_Container_i.hxx"
 #include "Utils_ExceptHandlers.hxx"
 #include "OpUtil.hxx"
@@ -220,12 +220,14 @@ string SALOME_ResourcesManager::BuildTempFileToLaunchRemoteContainer(const strin
   }
   tempOutputFile << (*(resInfo.ModulesPath.find("KERNEL"))).second << "/bin/salome/";
   if(params.isMPI){
+    cout << "PARALLELE" << endl;
     if(Engines_Container_i::isPythonContainer(params.container_name))
       tempOutputFile << "pyMPI SALOME_ContainerPy.py ";
     else
       tempOutputFile << "SALOME_MPIContainer ";
   }
   else{
+    cout << "SEQUENTIEL" << endl;
     if(Engines_Container_i::isPythonContainer(params.container_name))
       tempOutputFile << "SALOME_ContainerPy.py ";
     else
@@ -388,11 +390,12 @@ void SALOME_ResourcesManager::AddOmninamesParams(string& command) const
 {
   string omniORBcfg( getenv( "OMNIORB_CONFIG" ) ) ;
   ifstream omniORBfile( omniORBcfg.c_str() ) ;
-  char ORBInitRef[12] ;
+  char ORBInitRef[11] ;
+  char egal[3] ;
   char nameservice[132] ;
   omniORBfile >> ORBInitRef ;
-  command += ORBInitRef ;
-  command += " " ;
+  command += "ORBInitRef " ;
+  omniORBfile >> egal ;
   omniORBfile >> nameservice ;
   omniORBfile.close() ;
   char * bsn = strchr( nameservice , '\n' ) ;
@@ -406,11 +409,12 @@ void SALOME_ResourcesManager::AddOmninamesParams(ofstream& fileStream) const
 {
   string omniORBcfg( getenv( "OMNIORB_CONFIG" ) ) ;
   ifstream omniORBfile( omniORBcfg.c_str() ) ;
-  char ORBInitRef[12] ;
+  char ORBInitRef[11] ;
+  char egal[3] ;
   char nameservice[132] ;
   omniORBfile >> ORBInitRef ;
-  fileStream << ORBInitRef;
-  fileStream << " ";
+  fileStream << "ORBInitRef ";
+  omniORBfile >> egal ;
   omniORBfile >> nameservice ;
   omniORBfile.close() ;
   char * bsn = strchr( nameservice , '\n' ) ;