r10765 - /branches/multi_processor_merge/specific_fns/model_free/mf_minimise.py -- February 19, 2010 - 00:00

Author: bugman
Date: Fri Feb 19 00:00:55 2010
New Revision: 10765

URL: http://svn.gna.org/viewcvs/relax?rev=10765&view=rev
Log:
MF_grid_memo is being used to for the parallel grid sub-elements.

This was how the original code worked, not sure why this changed?


Modified:
    branches/multi_processor_merge/specific_fns/model_free/mf_minimise.py

Modified: 
branches/multi_processor_merge/specific_fns/model_free/mf_minimise.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/multi_processor_merge/specific_fns/model_free/mf_minimise.py?rev=10765&r1=10764&r2=10765&view=diff
==============================================================================
--- branches/multi_processor_merge/specific_fns/model_free/mf_minimise.py 
(original)
+++ branches/multi_processor_merge/specific_fns/model_free/mf_minimise.py Fri 
Feb 19 00:00:55 2010
@@ -37,7 +37,7 @@
 from generic_fns.mol_res_spin import count_spins, exists_mol_res_spin_data, 
return_spin_from_index, spin_loop
 from maths_fns.mf import Mf
 from multi.processor import Processor_box
-from multi_processor_commands import MF_grid_command, MF_memo, 
MF_minimise_command, MF_split_grid_command, MF_split_grid_memo
+from multi_processor_commands import MF_grid_command, MF_grid_memo, MF_memo, 
MF_minimise_command, MF_split_grid_command, MF_split_grid_memo
 from physical_constants import h_bar, mu0, return_gyromagnetic_ratio
 from relax_errors import RelaxError, RelaxInfError, RelaxLenError, 
RelaxNaNError, RelaxNoModelError, RelaxNoPdbError, RelaxNoResError, 
RelaxNoSequenceError, RelaxNoTensorError, RelaxNoValueError, 
RelaxNoVectorsError, RelaxNucleusError, RelaxProtonTypeError, 
RelaxSpinTypeError
 from relax_warnings import RelaxWarning
@@ -1603,7 +1603,7 @@
                     command.store_data(deepcopy(data_store), 
deepcopy(opt_params))
 
                     # Set up the model-free memo and add it to the processor 
queue.
-                    memo = MF_memo(super_grid_memo)
+                    memo = MF_grid_memo(super_grid_memo)
                     processor.add_to_queue(command, memo)
 
                 # Exit this method.