r24513 - in /branches/frame_order_cleanup: ./ specific_analyses/relax_disp/optimisation.py -- July 10, 2014 - 16:02

Author: bugman
Date: Thu Jul 10 16:02:58 2014
New Revision: 24513

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

........
  r24511 | bugman | 2014-07-10 16:02:25 +0200 (Thu, 10 Jul 2014) | 9 lines
  
  Fix for the relaxation dispersion analysis Monte Carlo simulation printouts 
on clusters.
  
  The multi-processor code was calling the print() function from the 
Slave_command.run() method,
  however this runs on the slave processor.  This has been shifted to the 
Results_command.run() method
  which runs on the master once the results have been returned via the 
Results_command.  Now the
  printout of the simulation number and cluster ID will be visible when 
running via OpenMPI on a
  cluster.
........

Modified:
    branches/frame_order_cleanup/   (props changed)
    branches/frame_order_cleanup/specific_analyses/relax_disp/optimisation.py

Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jul 10 16:02:58 2014
@@ -1 +1 @@
-/trunk:1-24506
+/trunk:1-24511

Modified: 
branches/frame_order_cleanup/specific_analyses/relax_disp/optimisation.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/relax_disp/optimisation.py?rev=24513&r1=24512&r2=24513&view=diff
==============================================================================
--- branches/frame_order_cleanup/specific_analyses/relax_disp/optimisation.py 
  (original)
+++ branches/frame_order_cleanup/specific_analyses/relax_disp/optimisation.py 
  Thu Jul 10 16:02:58 2014
@@ -765,10 +765,6 @@
             for i in range(len(param_vector)):
                 print("%-20s %25.15f" % (self.param_names[i], 
param_vector[i]*self.scaling_matrix[i, i]))
 
-        # Printout.
-        if self.sim_index != None:
-            print("Simulation %s, cluster %s" % (self.sim_index+1, 
self.spin_ids))
-
         # Create the result command object to send back to the master.
         processor.return_object(Disp_result_command(processor=processor, 
memo_id=self.memo_id, param_vector=param_vector, chi2=chi2, 
iter_count=iter_count, f_count=f_count, g_count=g_count, h_count=h_count, 
warning=warning, missing=self.missing, back_calc=model.back_calc, 
completed=False))
 
@@ -835,6 +831,10 @@
         @type memo:         memo
         """
 
+        # Printout.
+        if memo.sim_index != None:
+            print("Simulation %s, cluster %s" % (memo.sim_index+1, 
memo.spin_ids))
+
         # Scaling.
         if memo.scaling_matrix != None:
             param_vector = dot(memo.scaling_matrix, self.param_vector)