r24913 - /trunk/lib/dispersion/matrix_exponential.py -- August 01, 2014 - 18:20

Author: tlinnet
Date: Fri Aug  1 18:20:01 2014
New Revision: 24913

URL: http://svn.gna.org/viewcvs/relax?rev=24913&view=rev
Log:
Fixes for numpy version under 1.8, when striding through data.

Modified:
    trunk/lib/dispersion/matrix_exponential.py

Modified: trunk/lib/dispersion/matrix_exponential.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/lib/dispersion/matrix_exponential.py?rev=24913&r1=24912&r2=24913&view=diff
==============================================================================
--- trunk/lib/dispersion/matrix_exponential.py  (original)
+++ trunk/lib/dispersion/matrix_exponential.py  Fri Aug  1 18:20:01 2014
@@ -132,7 +132,7 @@
 
     else:
         # Extract shapes from data.
-        NS, NM, NO, ND, Ros, Col = data_array.shape
+        NS, NM, NO, ND, Row, Col = data_array.shape
 
         # Set NE to 1.
         NE = 1
@@ -251,10 +251,12 @@
 
             # Save results.
             # Extract index from index_view.
-            ei, si, mi, oi, di = index_i
-
-            # Store the result.
-            eA[ei, si, mi, oi, di, :] = eA_i
+            if NE != None:
+                ei, si, mi, oi, di = index_i
+                eA[ei, si, mi, oi, di, :] = eA_i
+            else:
+                si, mi, oi, di = index_i
+                eA[si, mi, oi, di, :] = eA_i
 
     else:
         # The eigenvalue decomposition.