[Plplot-cvs] SF.net SVN: plplot:[8718] trunk

[<ai...@us...>]

Revision: 8718
          http://plplot.svn.sourceforge.net/plplot/?rev=8718&view=rev
Author:   airwin
Date:     2008-08-28 00:49:23 +0000 (Thu, 28 Aug 2008)

Log Message:
-----------
AWI for Hezekiah M. Carty.  Add standard example 22.  No differences with C
version results.

Modified Paths:
--------------
    trunk/examples/ocaml/CMakeLists.txt
    trunk/examples/ocaml/Makefile.examples.in
    trunk/plplot_test/test_ocaml.sh.in

Added Paths:
-----------
    trunk/examples/ocaml/x22.ml

Modified: trunk/examples/ocaml/CMakeLists.txt
===================================================================
--- trunk/examples/ocaml/CMakeLists.txt	2008-08-27 13:30:41 UTC (rev 8717)
+++ trunk/examples/ocaml/CMakeLists.txt	2008-08-28 00:49:23 UTC (rev 8718)
@@ -38,6 +38,7 @@
   "18"
   "19"
   "21"
+  "22"
   "24"
   "25"
   "26"

Modified: trunk/examples/ocaml/Makefile.examples.in
===================================================================
--- trunk/examples/ocaml/Makefile.examples.in	2008-08-27 13:30:41 UTC (rev 8717)
+++ trunk/examples/ocaml/Makefile.examples.in	2008-08-28 00:49:23 UTC (rev 8718)
@@ -45,6 +45,7 @@
 		 x18$(EXEEXT) \
 		 x19$(EXEEXT) \
 		 x21$(EXEEXT) \
+		 x22$(EXEEXT) \
 		 x24$(EXEEXT) \
 		 x25$(EXEEXT) \
 		 x26$(EXEEXT) \

Added: trunk/examples/ocaml/x22.ml
===================================================================
--- trunk/examples/ocaml/x22.ml	                        (rev 0)
+++ trunk/examples/ocaml/x22.ml	2008-08-28 00:49:23 UTC (rev 8718)
@@ -0,0 +1,262 @@
+(* $Id$
+
+    Simple vector plot example
+    Copyright (C) 2004 Andrew Ross <and...@us...>
+    Copyright (C) 2004  Rafael Laboissiere
+    Copyright (C) 2008 Hezekiah M. Carty
+
+
+    This file is part of PLplot.
+
+    PLplot is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Library Public License as published
+    by the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    PLplot is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with PLplot; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+*)
+
+open Plplot
+
+let pi = atan 1.0 *. 4.0
+
+(* Pairs of points making the line segments used to plot the user defined
+   arrow. *)
+let arrow_x = [|-0.5; 0.5; 0.3; 0.5; 0.3; 0.5|]
+let arrow_y = [|0.0; 0.0; 0.2; 0.0; -0.2; 0.0|]
+let arrow2_x = [|-0.5; 0.3; 0.3; 0.5; 0.3; 0.3|]
+let arrow2_y = [|0.0; 0.0; 0.2; 0.0; -0.2; 0.0|]
+
+(*--------------------------------------------------------------------------*\
+ * Generates several simple vector plots.
+ \*--------------------------------------------------------------------------*)
+
+(*
+ * Vector plot of the circulation about the origin
+ *)
+let circulation () =
+  let nx = 20 in
+  let ny = 20 in
+  let dx = 1.0 in
+  let dy = 1.0 in
+
+  let xmin = -. float_of_int nx /. 2.0 *. dx in
+  let xmax = float_of_int nx /. 2.0 *. dx in
+  let ymin = -. float_of_int ny /. 2.0 *. dy in
+  let ymax = float_of_int ny /. 2.0 *. dy in
+
+  let xg = Array.make_matrix nx ny 0.0 in
+  let yg = Array.make_matrix nx ny 0.0 in
+  let u = Array.make_matrix nx ny 0.0 in
+  let v = Array.make_matrix nx ny 0.0 in
+
+  (* Create data - circulation around the origin. *)
+  for i = 0 to nx - 1 do
+    let x = (float_of_int i -. float_of_int nx /. 2.0 +. 0.5) *. dx in
+    for j = 0 to ny - 1 do
+      let y = (float_of_int j -. float_of_int ny /. 2.0 +. 0.5) *. dy in
+      xg.(i).(j) <- x;
+      yg.(i).(j) <- y;
+      u.(i).(j) <- y;
+      v.(i).(j) <- -. x;
+    done
+  done;
+
+  (* Plot vectors with default arrows *)
+  plenv xmin xmax ymin ymax 0 0;
+  pllab "(x)" "(y)" "#frPLplot Example 22 - circulation";
+  plcol0 2;
+  set_pltr (fun x y -> pltr2 x y xg yg);
+  plvect u v 0.0;
+  plcol0 1;
+  ()
+
+(*
+ * Vector plot of flow through a constricted pipe
+ *)
+let constriction () =
+  let nx = 20 in
+  let ny = 20 in
+  let dx = 1.0 in
+  let dy = 1.0 in
+
+  let xmin = -. float_of_int nx /. 2.0 *. dx in
+  let xmax = float_of_int nx /. 2.0 *. dx in
+  let ymin = -. float_of_int ny /. 2.0 *. dy in
+  let ymax = float_of_int ny /. 2.0 *. dy in
+
+  let xg = Array.make_matrix nx ny 0.0 in
+  let yg = Array.make_matrix nx ny 0.0 in
+  let u = Array.make_matrix nx ny 0.0 in
+  let v = Array.make_matrix nx ny 0.0 in
+
+  let q = 2.0 in
+  for i = 0 to nx - 1 do
+    let x = (float_of_int i -. float_of_int nx /. 2.0 +. 0.5) *. dx in
+    for j = 0 to ny - 1 do
+      let y = (float_of_int j -. float_of_int ny /. 2.0 +. 0.5) *. dy in
+      xg.(i).(j) <- x;
+      yg.(i).(j) <- y;
+      let b = ymax /. 4.0 *. (3.0 -. cos (pi *. x /. xmax)) in
+      if abs_float y < b then (
+        let dbdx = ymax /. 4.0 *. sin (pi *. x /. xmax) *. y /. b in
+        u.(i).(j) <- q *. ymax /. b;
+        v.(i).(j) <- dbdx *. u.(i).(j);
+      )
+      else (
+        u.(i).(j) <- 0.0;
+        v.(i).(j) <- 0.0;
+      )
+    done
+  done;
+
+  plenv xmin xmax ymin ymax 0 0;
+  pllab "(x)" "(y)" "#frPLplot Example 22 - constriction";
+  plcol0 2;
+  set_pltr (fun x y -> pltr2 x y xg yg);
+  plvect u v (-0.5);
+  plcol0 1;
+  ()
+
+let f2mnmx f =
+  let fmax = ref f.(0).(0) in
+  let fmin = ref f.(0).(0) in
+
+  for i = 0 to Array.length f - 1 do
+    for j = 0 to Array.length f.(i) - 1 do
+      fmax := max !fmax f.(i).(j);
+      fmin := min !fmin f.(i).(j);
+    done
+  done;
+  !fmin, !fmax
+
+(*
+ * Vector plot of the gradient of a shielded potential (see example 9)
+ *)
+let potential () =
+  let nper = 100 in
+  let nlevel = 10 in
+  let nr = 20 in
+  let ntheta = 20 in
+
+  (* Potential inside a conducting cylinder (or sphere) by method of images.
+     Charge 1 is placed at (d1, d1), with image charge at (d2, d2).
+     Charge 2 is placed at (d1, -d1), with image charge at (d2, -d2).
+     Also put in smoothing term at small distances. *)
+
+  let rmax = float_of_int nr in
+
+  let eps = 2.0 in
+
+  let q1 = 1.0 in
+  let d1 = rmax /. 4.0 in
+
+  let q1i = -. q1 *. rmax /. d1 in
+  let d1i = rmax**2.0 /. d1 in
+
+  let q2 = -1.0 in
+  let d2 = rmax /. 4.0 in
+
+  let q2i = -. q2 *. rmax /. d2 in
+  let d2i = rmax**2.0 /. d2 in
+
+  let xg = Array.make_matrix nr ntheta 0.0 in
+  let yg = Array.make_matrix nr ntheta 0.0 in
+  let u = Array.make_matrix nr ntheta 0.0 in
+  let v = Array.make_matrix nr ntheta 0.0 in
+  let z = Array.make_matrix nr ntheta 0.0 in
+
+  for i = 0 to nr - 1 do
+    let r = 0.5 +. float_of_int i in
+    for j = 0 to ntheta - 1 do
+      let theta =
+        2.0 *. pi /. float_of_int (ntheta - 1) *. (0.5 +. float_of_int j)
+    in
+    let x = r *. cos theta in
+    let y = r *. sin theta in
+    xg.(i).(j) <- x;
+    yg.(i).(j) <- y;
+    let div1 = sqrt ((x -. d1)**2.0 +. (y -. d1)**2.0 +. eps**2.0) in
+    let div1i = sqrt ((x -. d1i)**2.0 +. (y -. d1i)**2.0 +. eps**2.0) in
+    let div2 = sqrt ((x -. d2)**2.0 +. (y +. d2)**2.0 +. eps**2.0) in
+    let div2i = sqrt ((x -. d2i)**2.0 +. (y +. d2i)**2.0 +. eps**2.0) in
+    z.(i).(j) <- q1 /. div1 +. q1i /. div1i +. q2 /. div2 +. q2i /. div2i;
+    u.(i).(j) <-
+      ~-. q1 *. (x -. d1) /. div1**3.0 -. q1i *. (x -. d1i) /. div1i**3.0
+      -. q2 *. (x -. d2) /. div2**3.0 -. q2i *. (x -. d2i) /. div2i**3.0;
+    v.(i).(j) <-
+      ~-. q1 *. (y -. d1) /. div1**3.0 -. q1i *. (y -. d1i) /. div1i**3.0
+      -. q2 *. (y +. d2) /. div2**3.0 -. q2i *. (y +. d2i) /. div2i**3.0;
+    done
+  done;
+
+  let xmin, xmax = f2mnmx xg in
+  let ymin, ymax = f2mnmx yg in
+  let zmin, zmax = f2mnmx z in
+
+  plenv xmin xmax ymin ymax 0 0;
+  pllab "(x)" "(y)" "#frPLplot Example 22 - potential gradient vector plot";
+  (* Plot contours of the potential *)
+  let dz = (zmax -. zmin) /. float_of_int nlevel in
+  let clevel =
+    Array.init nlevel (fun i -> zmin +. (float_of_int i +. 0.5) *. dz)
+  in
+  plcol0 3;
+  pllsty 2;
+  set_pltr (fun x y -> pltr2 x y xg yg);
+  plcont z 1 nr 1 ntheta clevel;
+  pllsty 1;
+  plcol0 1;
+
+  (* Plot the vectors of the gradient of the potential *)
+  plcol0 2;
+  plvect u v 25.0;
+  plcol0 1;
+
+  let px = Array.make nper 0.0 in
+  let py = Array.make nper 0.0 in
+  (* Plot the perimeter of the cylinder *)
+  for  i=0 to nper - 1 do
+    let theta = (2.0 *. pi /. float_of_int (nper - 1)) *. float_of_int i in
+    px.(i) <- rmax *. cos theta;
+    py.(i) <- rmax *. sin theta;
+  done;
+  plline px py;
+  ()
+
+let () =
+  (* Parse and process command line arguments *)
+  ignore (plparseopts Sys.argv [|PL_PARSE_FULL|]);
+
+  (* Initialize plplot *)
+  plinit ();
+
+  circulation ();
+
+  let narr = 6 in
+  let fill = 0 in
+
+  (* Set arrow style using arrow_x and arrow_y then
+     plot using these arrows. *)
+  plsvect arrow_x arrow_y fill;
+  constriction ();
+
+  (* Set arrow style using arrow2_x and arrow2_y then
+     plot using these filled arrows. *)
+  let fill = 1 in
+  plsvect arrow2_x arrow2_y fill;
+  constriction ();
+
+  potential ();
+
+  plend ();
+  ()
+


Property changes on: trunk/examples/ocaml/x22.ml
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: trunk/plplot_test/test_ocaml.sh.in
===================================================================
--- trunk/plplot_test/test_ocaml.sh.in	2008-08-27 13:30:41 UTC (rev 8717)
+++ trunk/plplot_test/test_ocaml.sh.in	2008-08-28 00:49:23 UTC (rev 8718)
@@ -23,7 +23,7 @@
 # $options, and possibly $verbose_test defined.
 
 # Do the standard non-interactive examples.
-for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 15 18 19 21 24 25 26 27 30; do
+for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 15 18 19 21 22 24 25 26 27 30; do
   if [ "$verbose_test" ]; then
     echo "x${index}ocaml"
   fi


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.