Changeset 3246 for trunk

Timestamp:

01/12/12 13:47:29 (4 months ago)

Author:

jos

Message:

Run mpi programs directly in the --info case

Location:

trunk/src/mcrun2

Files:

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

trunk/src/mcrun2/main.py

@@ -263 +263 @@
     LOG.info('===')
 
+    if options.info:
+        print 'info!'
+        mcstas.run(override_mpi=False)
+        exit()
+
     # Set fixed parameters
     for key, value in fixed_params.items():

trunk/src/mcrun2/mcstas.py

@@ -117 +117 @@
         Process(options.cc).run(args)
 
-    def run(self, pipe=False, extra_opts=None):
+    def run(self, pipe=False, extra_opts=None, override_mpi=None):
         ''' Run simulation '''
         args = []
@@ -147 +147 @@
                  for key, value in self.params.items()]
 
-        return self.runMPI(args, pipe)
-
-    def runMPI(self, args, pipe=False):
+        return self.runMPI(args, pipe, override_mpi)
+
+    def runMPI(self, args, pipe=False, override_mpi=None):
         """ Run McStas, possible via mpi """
         binpath = self.binpath
         mpi = self.options.use_mpi
-        if mpi:
+        if override_mpi or override_mpi is None and mpi:
             LOG.debug('Running via MPI: %s', self.binpath)
             binpath = self.options.mpirun