Author: tlinnet Date: Thu Jun 19 21:05:49 2014 New Revision: 24172 URL: http://svn.gna.org/viewcvs/relax?rev=24172&view=rev Log: Made the returned multidimensional rr1rho_3d_rankN, be of float64 type. Task #7807 (https://gna.org/task/index.php?7807): Speed-up of dispersion models for Clustered analysis. Modified: branches/disp_spin_speed/lib/dispersion/ns_matrices.py Modified: branches/disp_spin_speed/lib/dispersion/ns_matrices.py URL: http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/ns_matrices.py?rev=24172&r1=24171&r2=24172&view=diff ============================================================================== --- branches/disp_spin_speed/lib/dispersion/ns_matrices.py (original) +++ branches/disp_spin_speed/lib/dispersion/ns_matrices.py Thu Jun 19 21:05:49 2014 @@ -525,7 +525,7 @@ [0.0, 0.0, 0.0, 0.0, 0.0, 0.0], [0.0, 0.0, 0.0, -1.0, 0.0, 0.0], [0.0, 0.0, 0.0, 0.0, -1.0, 0.0], - [0.0, 0.0, 0.0, 0.0, 0.0, 0.0], ]) + [0.0, 0.0, 0.0, 0.0, 0.0, 0.0], ], float64) m_wA = array([ [0.0, -1.0, 0.0, 0.0, 0.0, 0.0], @@ -533,7 +533,7 @@ [0.0, 0.0, 0.0, 0.0, 0.0, 0.0], [0.0, 0.0, 0.0, 0.0, 0.0, 0.0], [0.0, 0.0, 0.0, 0.0, 0.0, 0.0], - [0.0, 0.0, 0.0, 0.0, 0.0, 0.0], ]) + [0.0, 0.0, 0.0, 0.0, 0.0, 0.0], ], float64) m_wB = array([ [0.0, 0.0, 0.0, 0.0, 0.0, 0.0], @@ -541,7 +541,7 @@ [0.0, 0.0, 0.0, 0.0, 0.0, 0.0], [0.0, 0.0, 0.0, 0.0, -1.0, 0.0], [0.0, 0.0, 0.0, 1.0, 0.0, 0.0], - [0.0, 0.0, 0.0, 0.0, 0.0, 0.0], ]) + [0.0, 0.0, 0.0, 0.0, 0.0, 0.0], ], float64) m_w1 = array([ [0.0, 0.0, 0.0, 0.0, 0.0, 0.0], @@ -549,7 +549,7 @@ [0.0, 1.0, 0.0, 0.0, 0.0, 0.0], [0.0, 0.0, 0.0, 0.0, 0.0, 0.0], [0.0, 0.0, 0.0, 0.0, 0.0, -1.0], - [0.0, 0.0, 0.0, 0.0, 1.0, 0.0], ]) + [0.0, 0.0, 0.0, 0.0, 1.0, 0.0], ], float64) m_k_AB = array([ [-1.0, 0.0, 0.0, 0.0, 0.0, 0.0], @@ -557,7 +557,7 @@ [0.0, 0.0, -1.0, 0.0, 0.0, 0.0], [1.0, 0.0, 0.0, 0.0, 0.0, 0.0], [0.0, 1.0, 0.0, 0.0, 0.0, 0.0], - [0.0, 0.0, 1.0, 0.0, 0.0, 0.0], ]) + [0.0, 0.0, 1.0, 0.0, 0.0, 0.0], ], float64) m_k_BA = array([ [0.0, 0.0, 0.0, 1.0, 0.0, 0.0], @@ -565,7 +565,7 @@ [0.0, 0.0, 0.0, 0.0, 0.0, 1.0], [0.0, 0.0, 0.0, -1.0, 0.0, 0.0], [0.0, 0.0, 0.0, 0.0, -1.0, 0.0], - [0.0, 0.0, 0.0, 0.0, 0.0, -1.0], ]) + [0.0, 0.0, 0.0, 0.0, 0.0, -1.0], ], float64) m_R1 = array([ [0.0, 0.0, 0.0, 0.0, 0.0, 0.0], @@ -573,7 +573,7 @@ [0.0, 0.0, -1.0, 0.0, 0.0, 0.0], [0.0, 0.0, 0.0, 0.0, 0.0, 0.0], [0.0, 0.0, 0.0, 0.0, 0.0, 0.0], - [0.0, 0.0, 0.0, 0.0, 0.0, -1.0], ]) + [0.0, 0.0, 0.0, 0.0, 0.0, -1.0], ], float64) # Multiply and expand. mat_r1rho_prime = multiply.outer( r1rho_prime * relax_time, m_r1rho_prime )