r10762 - /branches/multi_processor_merge/specific_fns/model_free/mf_minimise.py -- February 18, 2010 - 23:37

Author: bugman
Date: Thu Feb 18 23:37:36 2010
New Revision: 10762

URL: http://svn.gna.org/viewcvs/relax?rev=10762&view=rev
Log:
Only the minimal amount of info is being passed into MF_split_grid_memo.

The other info can be passed in through a command.store_data() call.  This 
mimics the current
MF_memo operation.


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=10762&r1=10761&r2=10762&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 Thu 
Feb 18 23:37:36 2010
@@ -1591,13 +1591,8 @@
                 full_grid_info = Grid_info(lower=opt_params.lower, 
upper=opt_params.upper, inc=opt_params.inc, n=num_params)
                 sub_grid_list = 
full_grid_info.sub_divide(processor.processor_size())
 
-                # Set up the constrained super grid memo.
-                if constraints:
-                    super_grid_memo = MF_split_grid_memo(model_free=self, 
index=index, sim_index=sim_index, model_type=data_store.model_type, 
scaling=scaling, scaling_matrix=data_store.scaling_matrix, full_output=True, 
verbosity=verbosity, print_prefix="", grid_size=self.grid_size, A=A, b=b)
-
-                # Set up the unconstrained super grid memo.
-                else:
-                    super_grid_memo = MF_split_grid_memo(model_free=self, 
index=index, sim_index=sim_index, model_type=data_store.model_type, 
scaling=scaling, scaling_matrix=data_store.scaling_matrix, full_output=True, 
verbosity=verbosity, print_prefix="", grid_size=self.grid_size)
+                # Set up split grid memo.
+                super_grid_memo = MF_split_grid_memo(model_free=self, 
model_type=data_store.model_type, spin=spin, sim_index=sim_index, 
scaling=scaling, scaling_matrix=data_store.scaling_matrix)
 
                 # Loop over each grid sub-division.
                 for sub_grid_index, sub_grid_info in 
enumerate(sub_grid_list):