Changeset 3241 for trunk

Timestamp:

01/06/12 14:59:32 (5 months ago)

Author:

jos

Message:

Always use mpi run when running an mpi binary

Files:

• trunk/src/mcrun2/mcstas.py (modified) (2 diffs)

trunk/src/mcrun2/mcstas.py

@@ -123 +123 @@
 
         options = self.options
-        mpi = self.options.use_mpi
 
         # Handle proxy options with values
@@ -148 +147 @@
                  for key, value in self.params.items()]
 
-        # Run McStas
-        if not mpi:
-            LOG.debug('Running: %s', self.binpath)
-            return Process(self.binpath).run(args, pipe=pipe)
-        else:
+        return self.runMPI(args, pipe)
+
+    def runMPI(self, args, pipe=False):
+        """ Run McStas, possible via mpi """
+        binpath = self.binpath
+        mpi = self.options.use_mpi
+        if mpi:
             LOG.debug('Running via MPI: %s', self.binpath)
-            mpi_args = ['-np', str(options.mpi), self.binpath]
-            mpi_args += args
-            return Process(options.mpirun).run(mpi_args, pipe=pipe)
+            binpath = self.options.mpirun
+            args = ['-np', str(self.options.mpi), self.binpath] + args
+        return Process(binpath).run(args, pipe=pipe)
 
     def get_info(self):
-        return McStasInfo(Process(self.binpath).run(['--info'], pipe=True))
+        return McStasInfo(self.runMPI(['--info'], pipe=True))
 
     def cleanup(self):