r24193 - in /branches/disp_spin_speed/lib: dispersion/ns_mmq_2site.py linear_algebra/matrix_exponential.py -- June 20, 2014 - 09:52

Author: tlinnet
Date: Fri Jun 20 09:52:13 2014
New Revision: 24193

URL: http://svn.gna.org/viewcvs/relax?rev=24193&view=rev
Log:
Fix for an extra axis inserted in eye function, when dimensionality is only 
[NS][NM][NO][ND].

This also fixes the index in the lib function of ns_mmq_2site_mq.

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_2site.py
    branches/disp_spin_speed/lib/linear_algebra/matrix_exponential.py

Modified: branches/disp_spin_speed/lib/dispersion/ns_mmq_2site.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/ns_mmq_2site.py?rev=24193&r1=24192&r2=24193&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/ns_mmq_2site.py     (original)
+++ branches/disp_spin_speed/lib/dispersion/ns_mmq_2site.py     Fri Jun 20 
09:52:13 2014
@@ -241,15 +241,15 @@
                 for i in range(num_points_i):
                     # The M1 and M2 matrices.
                     # Equivalent to D+.
-                    M1_i = M1_mat[0, si, mi, oi, i]
+                    M1_i = M1_mat[si, mi, oi, i]
                     # Equivalent to Z-.
-                    M2_i = M1_mat[0, si, mi, oi, i]
+                    M2_i = M1_mat[si, mi, oi, i]
 
                     # The complex conjugates M1* and M2*
                     # Equivalent to D+*.
-                    M1_star_i = M1_mat_star[0, si, mi, oi, i]
+                    M1_star_i = M1_mat_star[si, mi, oi, i]
                     # Equivalent to Z-*.
-                    M2_star_i = M1_mat_star[0, si, mi, oi, i]
+                    M2_star_i = M1_mat_star[si, mi, oi, i]
 
                     # Repetitive dot products (minimised for speed).
                     M1_M2 = dot(M1_i, M2_i)

Modified: branches/disp_spin_speed/lib/linear_algebra/matrix_exponential.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/linear_algebra/matrix_exponential.py?rev=24193&r1=24192&r2=24193&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/linear_algebra/matrix_exponential.py   
(original)
+++ branches/disp_spin_speed/lib/linear_algebra/matrix_exponential.py   Fri 
Jun 20 09:52:13 2014
@@ -97,7 +97,7 @@
 
     # Make a eye matrix, with Shape [NE][NS][NM][NO][ND][X][X]
     if NE == None:
-        eye_mat = tile(eye(Row)[newaxis, newaxis, newaxis, newaxis, newaxis, 
...], (NS, NM, NO, ND, 1, 1) )
+        eye_mat = tile(eye(Row)[newaxis, newaxis, newaxis, newaxis, ...], 
(NS, NM, NO, ND, 1, 1) )
     else:
         eye_mat = tile(eye(Row)[newaxis, newaxis, newaxis, newaxis, newaxis, 
...], (NE, NS, NM, NO, ND, 1, 1) )