Changeset 3271

Timestamp:

01/26/12 21:06:56 (4 months ago)

Author:

erkn

Message:

Refactor: piping is now optional

Location:

branches/mcxtrace-1.0/src/mcrun2

Files:

• main.py (modified) (1 diff)
• mcstas.py (modified) (3 diffs)

branches/mcxtrace-1.0/src/mcrun2/main.py

@@ -168 +168 @@
         options.use_mpi = True
         options.cc = 'mpicc'
+        options.mpirun = 'mpirun'
     else:
         options.use_mpi = False

branches/mcxtrace-1.0/src/mcrun2/mcstas.py

@@ -37 +37 @@
         self.executable = executable
 
-    def run(self, args=None):
+    def run(self, args=None, pipe=False):
         ''' Run external process with args '''
 
+        # Unsafe to use [] as default (reference)
         if args is None:
             args = []
+
+        # Redirect stdout and stderr?
+        pipe = pipe and PIPE or None
 
         # Run executable
         LOG.debug('CMD: %s %s' % (self.executable, args))
         fid = Popen([self.executable] + args,
-                    stdout=None,
-                    stderr=None)
+                    stdout=pipe,
+                    stderr=pipe)
         stdout, stderr = fid.communicate()
 
@@ -109 +113 @@
 
 
-    def run(self):
+    def run(self, pipe=False):
         ''' Run simulation '''
         args = []
         options = self.options
-        print repr(options)
-
         mpi = self.options.use_mpi
 
@@ -138 +140 @@
         if not mpi:
             LOG.info('Running: %s' % self.binpath)
-            Process(self.binpath).run(args)
+            Process(self.binpath).run(args, pipe=pipe)
         else:
             LOG.info('Running via MPI: %s' % self.binpath)
             mpi_args = ['-np', str(options.mpi), self.binpath]
             mpi_args += args
-            Process('mpirun').run(mpi_args)
+            Process(options.mpirun).run(mpi_args, pipe=pipe)