r24214 - /branches/disp_spin_speed/lib/dispersion/ns_mmq_3site.py -- June 20, 2014 - 17:43

Author: tlinnet
Date: Fri Jun 20 17:43:00 2014
New Revision: 24214

URL: http://svn.gna.org/viewcvs/relax?rev=24214&view=rev
Log:
Removed the complex64 to be used as dtype in matrix exponential. Fix for 
missing "_i" in variable.

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_mmq_3site.py

Modified: branches/disp_spin_speed/lib/dispersion/ns_mmq_3site.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/ns_mmq_3site.py?rev=24214&r1=24213&r2=24214&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/ns_mmq_3site.py     (original)
+++ branches/disp_spin_speed/lib/dispersion/ns_mmq_3site.py     Fri Jun 20 
17:43:00 2014
@@ -337,8 +337,8 @@
     m2_mat = rmmq_3site_rankN(R20A=R20A, R20B=R20B, R20C=R20C, dw_AB=-dw_AB, 
dw_AC=-dw_AC, k_AB=k_AB, k_BA=k_BA, k_BC=k_BC, k_CB=k_CB, k_AC=k_AC, 
k_CA=k_CA, tcp=tcp)
 
     # The A+/- matrices.
-    A_pos_mat = matrix_exponential_rankN(m1_mat, dtype=complex64)
-    A_neg_mat = matrix_exponential_rankN(m2_mat, dtype=complex64)
+    A_pos_mat = matrix_exponential_rankN(m1_mat)
+    A_neg_mat = matrix_exponential_rankN(m2_mat)
 
     # Loop over spins.
     for si in range(NS):
@@ -356,7 +356,7 @@
                     A_neg_i = A_neg_mat[si, mi, oi, i]
 
                     # The evolution for one n.
-                    evol_block = dot(A_pos, dot(A_neg, dot(A_neg, A_pos)))
+                    evol_block = dot(A_pos_i, dot(A_neg_i, dot(A_neg_i, 
A_pos_i)))
 
                     # The full evolution.
                     evol = square_matrix_power(evol_block, power[si, mi, oi, 
i])