r21112 - in /branches/relax_disp: ./ lib/linear_algebra/matrix_exponential.py -- October 15, 2013 - 13:22

Author: bugman
Date: Tue Oct 15 13:22:50 2013
New Revision: 21112

URL: http://svn.gna.org/viewcvs/relax?rev=21112&view=rev
Log:
Merged revisions 21111 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r21111 | bugman | 2013-10-15 13:20:25 +0200 (Tue, 15 Oct 2013) | 5 lines
  
  Fix for the new lib.linear_algebra.matrix_exponential.matrix_exponential() 
function.
  
  This function now returns a numpy array type rather than matrix type.
........

Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/lib/linear_algebra/matrix_exponential.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Oct 15 13:22:50 2013
@@ -1,1 +1,1 @@
-/trunk:1-21109
+/trunk:1-21111

Modified: branches/relax_disp/lib/linear_algebra/matrix_exponential.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/lib/linear_algebra/matrix_exponential.py?rev=21112&r1=21111&r2=21112&view=diff
==============================================================================
--- branches/relax_disp/lib/linear_algebra/matrix_exponential.py (original)
+++ branches/relax_disp/lib/linear_algebra/matrix_exponential.py Tue Oct 15 
13:22:50 2013
@@ -23,7 +23,7 @@
 """Module for the calculation of the matrix exponential."""
 
 # Python module imports.
-from numpy import diag, dot, exp, iscomplex
+from numpy import array, diag, dot, exp, iscomplex
 from numpy.linalg import eig, inv
 
 # relax module imports.
@@ -50,8 +50,8 @@
 
     # Return the complex matrix.
     if complex_flag:
-        return eA
+        return array(eA)
 
     # Return only the real part.
     else:
-        return eA.real
+        return array(eA.real)