From: Cédric Aguerre <cedric.aguerre@edf.fr>
Date: Tue, 17 Feb 2015 09:16:58 +0000 (+0100)
Subject: using either --with-mpi-module option or SALOME_MPI_MODULE_NAME environment variable
X-Git-Tag: V7_6_0a1~19
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=9407c7b0e2322dc74dc99c25393a43a9fdb2372c;p=modules%2Fkernel.git

using either --with-mpi-module option or SALOME_MPI_MODULE_NAME environment variable
---

diff --git a/bin/salomeContext.py b/bin/salomeContext.py
index 7ea73cea3..5bafe404d 100644
--- a/bin/salomeContext.py
+++ b/bin/salomeContext.py
@@ -109,25 +109,32 @@ class SalomeContext:
         self.getLogger().warning("Unrecognized extension for configuration file: %s", filename)
   #
 
+  def __loadMPI(self, module_name):
+    print "Trying to load MPI module: %s..."%module_name,
+    try:
+      out, err = subprocess.Popen(["modulecmd", "python", "load", module_name], stdout=subprocess.PIPE).communicate()
+      exec out # define specific environment variables
+      print " OK"
+    except:
+      print " ** Failed **"
+      pass
+  #
+
   def runSalome(self, args):
+    import os
     # Run this module as a script, in order to use appropriate Python interpreter
     # according to current path (initialized from environment files).
-    mpi_module_option = "--with_mpi_module="
+    mpi_module_option = "--with-mpi-module="
     mpi_module = [x for x in args if x.startswith(mpi_module_option)]
     if mpi_module:
       mpi_module = mpi_module[0][len(mpi_module_option):]
-      print "Trying to load MPI module: %s..."%mpi_module,
-      try:
-        out, err = subprocess.call(["modulecmd", "python", "load", mpi_module]).communicate()
-        exec out # define specific environment variables
-        print " OK"
-      except:
-        print " ** Failed **"
-        pass
+      self.__loadMPI(mpi_module)
       args = [x for x in args if not x.startswith(mpi_module_option)]
-      pass
+    else:
+      mpi_module = os.getenv("SALOME_MPI_MODULE_NAME", None)
+      if mpi_module:
+        self.__loadMPI(mpi_module)
 
-    import os
     absoluteAppliPath = os.getenv('ABSOLUTE_APPLI_PATH','')
     env_copy = os.environ.copy()
     proc = subprocess.Popen(['python', os.path.join(absoluteAppliPath,"bin","salome","salomeContext.py"), pickle.dumps(self), pickle.dumps(args)], shell=False, close_fds=True, env=env_copy)