r10830 - /branches/multi_processor_merge/specific_fns/model_free/mf_minimise.py -- February 22, 2010 - 22:22

Author: bugman
Date: Mon Feb 22 22:22:31 2010
New Revision: 10830

URL: http://svn.gna.org/viewcvs/relax?rev=10830&view=rev
Log:
Switched from using Grid_info to minfx.grid.grid_split().

The model-free grid search 'command' will need to be modified to utilise this.


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=10830&r1=10829&r2=10830&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 Mon 
Feb 22 22:22:31 2010
@@ -23,6 +23,7 @@
 # Python module imports.
 from copy import deepcopy
 from math import pi
+from minfx.grid import grid_split
 from numpy import float64, array, dot, zeros
 from numpy.linalg import inv
 from re import match, search
@@ -33,7 +34,6 @@
 from float import isNaN, isInf
 from generic_fns import diffusion_tensor, pipes
 from generic_fns.diffusion_tensor import diff_data_exists
-from generic_fns.subdivide_grid import Grid_info
 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
@@ -1590,12 +1590,11 @@
                 # Print out.
                 print("Parallelised diffusion tensor grid search.")
 
-                # Split up the grid into chunks for each processor.
-                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())
-
-                # Loop over each grid sub-division.
-                for sub_grid_index, sub_grid_info in 
enumerate(sub_grid_list):
+                # Loop over each grid subdivision.
+                for subdivision in 
grid_split(divisions=processor.processor_size(), lower=opt_params.lower, 
upper=opt_params.upper, inc=opt_params.inc):
+                    # Set the points.
+                    opt_params.subdivision = subdivision
+
                     # Grid search initialisation.
                     command = MF_grid_command()