Added normal vector of secondary sources to arguments of various functions

spors · spors · commit 0827a44cfcee · 2015-03-23T15:48:01.000+01:00
diff --git a/examples/horizontal_plane_arrays.py b/examples/horizontal_plane_arrays.py
@@ -30,7 +30,7 @@ def compute_and_plot_soundfield(title):
     print('Computing ', title)
 
     twin = tapering(a, talpha)
-    p = sfs.mono.synthesized.generic(omega, x0, d * twin * a0, grid,
+    p = sfs.mono.synthesized.generic(omega, x0, n0, d * twin * a0, grid,
                                      source=sourcetype)
 
     plt.figure(figsize=(15, 15))
diff --git a/examples/sound_field_synthesis.py b/examples/sound_field_synthesis.py
@@ -72,7 +72,7 @@
 twin = sfs.tapering.tukey(a,.3)
 
 # === compute synthesized sound field ===
-p = sfs.mono.synthesized.generic(omega, x0, d * twin * a0 , grid,
+p = sfs.mono.synthesized.generic(omega, x0, n0, d * twin * a0 , grid,
                                  source=sfs.mono.source.point)
 
 
diff --git a/examples/soundfigures.py b/examples/soundfigures.py
@@ -43,7 +43,7 @@
 d = sfs.mono.soundfigure.wfs_3d_pw(omega, x0, n0, figure, npw=npw)
 
 # compute synthesized sound field
-p = sfs.mono.synthesized.generic(omega, x0, d * a0, grid,
+p = sfs.mono.synthesized.generic(omega, x0, n0, d * a0, grid,
                                  source=sfs.mono.source.point)
 
 # plot and save synthesized sound field
diff --git a/sfs/mono/source.py b/sfs/mono/source.py
@@ -2,7 +2,6 @@
 
 import numpy as np
 from scipy import special
-from numpy.core.umath_tests import inner1d  # element-wise inner product
 from .. import util
 
 
@@ -12,7 +11,7 @@ def point(omega, x0, n0, grid, c=None):
     ::
 
                     1  e^(-j w/c |x-x0|)
-      G(x-xs, w) = --- -----------------
+      G(x-x0, w) = --- -----------------
                    4pi      |x-x0|
 
     """
@@ -32,7 +31,7 @@ def line(omega, x0, n0, grid, c=None):
     ::
 
                          (2)
-      G(x-xs, w) = -j/4 H0  (w/c |x-x0|)
+      G(x-x0, w) = -j/4 H0  (w/c |x-x0|)
 
     """
     k = util.wavenumber(omega, c)
@@ -47,19 +46,27 @@ def line(omega, x0, n0, grid, c=None):
     if len(gridshape) > 2:
         p = np.tile(p, [1, 1, gridshape[2]])
     return np.squeeze(p)
-    
+
 
 def line_dipole(omega, x0, n0, grid, c=None):
     """Line source with dipole characteristics parallel to the z-axis.
 
+    Note: third component of x0 is ignored.
+
+    ::
+
+                         (2)
+      G(x-x0, w) = jk/4 H1  (w/c |x-x0|) cos(phi)
+
 
     """
     k = util.wavenumber(omega, c)
     x0 = util.asarray_1d(x0)
-    #x0 = x0[:2]  # ignore z-component
+    x0 = x0[:2]  # ignore z-component
+    n0 = n0[:2]
     grid = util.asarray_of_arrays(grid)
-    dx = grid - x0
-    r = np.linalg.norm(dx[:2])
+    dx = grid[:2] - x0
+    r = np.linalg.norm(dx)
     p = 1j*k/4 * special.hankel2(1, k * r) * np.inner(dx, n0) / r
     # If necessary, duplicate in z-direction:
     gridshape = np.broadcast(*grid).shape
