r4827 - in /1.3/maths_fns: jw_mf.py jw_mf_comps.py ri_comps.py weights.py -- January 17, 2008 - 16:34

Author: semor
Date: Thu Jan 17 16:34:33 2008
New Revision: 4827

URL: http://svn.gna.org/viewcvs/relax?rev=4827&view=rev
Log:
Converted more maths_fns modules from Numeric to numpy.


Modified:
    1.3/maths_fns/jw_mf.py
    1.3/maths_fns/jw_mf_comps.py
    1.3/maths_fns/ri_comps.py
    1.3/maths_fns/weights.py

Modified: 1.3/maths_fns/jw_mf.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/maths_fns/jw_mf.py?rev=4827&r1=4826&r2=4827&view=diff
==============================================================================
--- 1.3/maths_fns/jw_mf.py (original)
+++ 1.3/maths_fns/jw_mf.py Thu Jan 17 16:34:33 2008
@@ -21,7 +21,7 @@
 
###############################################################################
 
 # Python module imports.
-from Numeric import sum
+from numpy import sum
 
 
 ############################

Modified: 1.3/maths_fns/jw_mf_comps.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/maths_fns/jw_mf_comps.py?rev=4827&r1=4826&r2=4827&view=diff
==============================================================================
--- 1.3/maths_fns/jw_mf_comps.py (original)
+++ 1.3/maths_fns/jw_mf_comps.py Thu Jan 17 16:34:33 2008
@@ -21,8 +21,7 @@
 
###############################################################################
 
 # Python module imports.
-from Numeric import Float64, zeros
-
+from numpy import float64, zeros
 
 
 ############################

Modified: 1.3/maths_fns/ri_comps.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/maths_fns/ri_comps.py?rev=4827&r1=4826&r2=4827&view=diff
==============================================================================
--- 1.3/maths_fns/ri_comps.py (original)
+++ 1.3/maths_fns/ri_comps.py Thu Jan 17 16:34:33 2008
@@ -248,7 +248,7 @@
 
 # Python module imports.
 from math import pi
-from Numeric import Float64, zeros
+from numpy import float64, zeros
 
 
 # The main functions for the calculation of the Ri components.

Modified: 1.3/maths_fns/weights.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/maths_fns/weights.py?rev=4827&r1=4826&r2=4827&view=diff
==============================================================================
--- 1.3/maths_fns/weights.py (original)
+++ 1.3/maths_fns/weights.py Thu Jan 17 16:34:33 2008
@@ -22,7 +22,7 @@
 
 # Python module imports.
 from math import sqrt
-from Numeric import outerproduct
+from numpy import outer
 
 
 ##########
@@ -135,7 +135,7 @@
     """
 
     # Outer product.
-    op = outerproduct(data.ddz_dO, data.ddz_dO)
+    op = outer(data.ddz_dO, data.ddz_dO)
 
     # Hessian.
     data.d2ci[2:, 2:, 0] = 3.0 * ((9.0 * data.dz**2 - 1.0) * op  +  data.dz 
* data.three_dz2_one * data.d2dz_dO2)
@@ -758,18 +758,18 @@
     ###############################
 
     # Outer products.
-    op_xx = outerproduct(data.ddx_dO, data.ddx_dO)
-    op_yy = outerproduct(data.ddy_dO, data.ddy_dO)
-    op_zz = outerproduct(data.ddz_dO, data.ddz_dO)
-
-    op_xy = outerproduct(data.ddx_dO, data.ddy_dO)
-    op_yx = outerproduct(data.ddy_dO, data.ddx_dO)
-
-    op_xz = outerproduct(data.ddx_dO, data.ddz_dO)
-    op_zx = outerproduct(data.ddz_dO, data.ddx_dO)
-
-    op_yz = outerproduct(data.ddy_dO, data.ddz_dO)
-    op_zy = outerproduct(data.ddz_dO, data.ddy_dO)
+    op_xx = outer(data.ddx_dO, data.ddx_dO)
+    op_yy = outer(data.ddy_dO, data.ddy_dO)
+    op_zz = outer(data.ddz_dO, data.ddz_dO)
+
+    op_xy = outer(data.ddx_dO, data.ddy_dO)
+    op_yx = outer(data.ddy_dO, data.ddx_dO)
+
+    op_xz = outer(data.ddx_dO, data.ddz_dO)
+    op_zx = outer(data.ddz_dO, data.ddx_dO)
+
+    op_yz = outer(data.ddy_dO, data.ddz_dO)
+    op_zy = outer(data.ddz_dO, data.ddy_dO)
 
     # Components.
     x_comp = data.dx * data.d2dx_dO2 + op_xx