r21016 - in /branches/relax_disp: ./ pipe_control/minimise.py -- October 07, 2013 - 21:57

Author: bugman
Date: Mon Oct  7 21:57:17 2013
New Revision: 21016

URL: http://svn.gna.org/viewcvs/relax?rev=21016&view=rev
Log:
Merged revisions 21015 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r21015 | bugman | 2013-10-07 21:54:45 +0200 (Mon, 07 Oct 2013) | 8 lines
  
  Fix for the Monte Carlo simulation parallisation.
  
  The processor.run_queue() method needs to be executed for all the 
optimisation user function of
  relax (at the end of both the grid_search() and the calc() functions).  
Otherwise when removing the
  processor.run_queue() call from the specific_analyses code results in a 
failure of the grid search
  or back-calculation to be run until the minimise() user function call, 
which will be too late.
........

Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/pipe_control/minimise.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Oct  7 21:57:17 2013
@@ -1,1 +1,1 @@
-/trunk:1-21012
+/trunk:1-21015

Modified: branches/relax_disp/pipe_control/minimise.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/pipe_control/minimise.py?rev=21016&r1=21015&r2=21016&view=diff
==============================================================================
--- branches/relax_disp/pipe_control/minimise.py (original)
+++ branches/relax_disp/pipe_control/minimise.py Mon Oct  7 21:57:17 2013
@@ -81,6 +81,13 @@
     else:
         calculate(verbosity=verbosity)
 
+    # Get the Processor box singleton (it contains the Processor instance) 
and alias the Processor.
+    processor_box = Processor_box() 
+    processor = processor_box.processor
+
+    # Execute any queued commands.
+    processor.run_queue()
+
 
 def grid_search(lower=None, upper=None, inc=None, constraints=True, 
verbosity=1):
     """The grid search function.
@@ -139,6 +146,13 @@
     # Grid search.
     else:
         grid_search(lower=lower, upper=upper, inc=inc, 
constraints=constraints, verbosity=verbosity)
+
+    # Get the Processor box singleton (it contains the Processor instance) 
and alias the Processor.
+    processor_box = Processor_box() 
+    processor = processor_box.processor
+
+    # Execute any queued commands.
+    processor.run_queue()
 
 
 def minimise(min_algor=None, line_search=None, hessian_mod=None, 
hessian_type=None, func_tol=None, grad_tol=None, max_iter=None, 
constraints=True, scaling=True, verbosity=1, sim_index=None):