Mercurial > jwe > octave
changeset 27813:d7dfab7045d9
Make "streameuler2d" and "streameuler3d" internal functions.
* stream-euler.cc (F__streameuler2d__, F__stremeuler3d__): Surround function
names with double underscores "__" to mark them as internal.
* stream2.m, stream3.m: Change uses.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Thu, 12 Dec 2019 20:08:35 +0100 |
parents | 1626e50fa8ee |
children | b6db1c7c4595 |
files | libinterp/corefcn/stream-euler.cc scripts/plot/draw/stream2.m scripts/plot/draw/stream3.m |
diffstat | 3 files changed, 9 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/corefcn/stream-euler.cc Thu Dec 12 19:44:32 2019 +0100 +++ b/libinterp/corefcn/stream-euler.cc Thu Dec 12 20:08:35 2019 +0100 @@ -500,32 +500,32 @@ return octave_value (xyz); } -DEFUN (streameuler2d, args, , +DEFUN (__streameuler2d__, args, , doc: /* -*- texinfo -*- -@deftypefn {} {} streameuler2d (@var{U}, @var{V}, @var{TX}, @var{TY}, @var{ZETA}, @var{XI}, @var{H}, @var{MAXNVERTS}) +@deftypefn {} {} __streameuler2d__ (@var{U}, @var{V}, @var{TX}, @var{TY}, @var{ZETA}, @var{XI}, @var{H}, @var{MAXNVERTS}) Calculates the streamline in a vector field [@var{U}, @var{V}] starting from a seed point at position [@var{ZETA}, @var{XI}]. The integrator used is Heun's Scheme. The step size can be controlled by @var{H}. The Jacobian matrix can be defined for each grid cell by [@var{TX}, @var{TY}]. -@seealso{streamline, stream2, stream3, streameuler3d} +@seealso{streamline, stream2, stream3, __streameuler3d__} @end deftypefn */) { return streameuler2d_internal (args); } -DEFUN (streameuler3d, args, , +DEFUN (__streameuler3d__, args, , doc: /* -*- texinfo -*- -@deftypefn {} {} streameuler3d (@var{U}, @var{V}, @var{W}, @var{TX}, @var{TY}, @var{TZ}, @var{ZETA}, @var{XI}, @var{RHO}, @var{H}, @var{MAXNVERTS}) +@deftypefn {} {} __streameuler3d__ (@var{U}, @var{V}, @var{W}, @var{TX}, @var{TY}, @var{TZ}, @var{ZETA}, @var{XI}, @var{RHO}, @var{H}, @var{MAXNVERTS}) Calculates the streamline in a vector field [@var{U}, @var{V}, @var{W}] starting from a seed point at position [@var{ZETA}, @var{XI}, @var{RHO}]. The integrator used is Heun's Scheme. The step size can be controlled by @var{H}. The Jacobian matrix can be defined for each grid cell by [@var{TX}, @var{TY}, @var{TZ}]. -@seealso{streamline, stream2, stream3, streameuler2d} +@seealso{streamline, stream2, stream3, __streameuler2d__} @end deftypefn */) { - return streameuler3d_internal (args, "streameuler3d"); + return streameuler3d_internal (args, "__streameuler3d__"); }
--- a/scripts/plot/draw/stream2.m Thu Dec 12 19:44:32 2019 +0100 +++ b/scripts/plot/draw/stream2.m Thu Dec 12 20:08:35 2019 +0100 @@ -165,7 +165,7 @@ zeta = (idx - 1) + (xp - gx(idx)) * tx(idx); xi = (idy - 1) + (yp - gy(idy)) * ty(idy); - C = streameuler2d (u, v, tx, ty, zeta, xi, h, maxnverts); + C = __streameuler2d__ (u, v, tx, ty, zeta, xi, h, maxnverts); ## Transform from C coordinates to P coordinates idu = floor (C(:,1));
--- a/scripts/plot/draw/stream3.m Thu Dec 12 19:44:32 2019 +0100 +++ b/scripts/plot/draw/stream3.m Thu Dec 12 20:08:35 2019 +0100 @@ -180,8 +180,7 @@ xi = (idy - 1) + (yp - gy(idy)) * ty(idy); rho = (idz - 1) + (zp - gz(idz)) * tz(idz); - C = streameuler3d (u, v, w, tx, ty, tz, zeta, xi, rho, ... - h, maxnverts); + C = __streameuler3d__ (u, v, w, tx, ty, tz, zeta, xi, rho, h, maxnverts); ## Transform from C coordinates to P coordinates idu = floor (C(:, 1));