Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[11503] trunk
|
From: <ai...@us...> - 2011-01-26 22:37:19
|
Revision: 11503
http://plplot.svn.sourceforge.net/plplot/?rev=11503&view=rev
Author: airwin
Date: 2011-01-26 22:23:15 +0000 (Wed, 26 Jan 2011)
Log Message:
-----------
Expand plplot_parameters.h so it can be used for examples 9 through 16
(and 16a) for f77.
Modified Paths:
--------------
trunk/bindings/f77/plplot_parameters.h
trunk/examples/f77/x09f.fm4
trunk/examples/f77/x10f.fm4
trunk/examples/f77/x11f.fm4
trunk/examples/f77/x12f.fm4
trunk/examples/f77/x13f.fm4
trunk/examples/f77/x14f.fm4
trunk/examples/f77/x15f.fm4
trunk/examples/f77/x16af.fm4
trunk/examples/f77/x16f.fm4
Modified: trunk/bindings/f77/plplot_parameters.h
===================================================================
--- trunk/bindings/f77/plplot_parameters.h 2011-01-26 22:01:08 UTC (rev 11502)
+++ trunk/bindings/f77/plplot_parameters.h 2011-01-26 22:23:15 UTC (rev 11503)
@@ -22,8 +22,9 @@
integer PL_PARSE_FULL
parameter(PL_PARSE_FULL = 1)
- real*8 PI
+ real*8 PI, TWOPI
parameter (PI = 3.1415926535897932384d0)
+ parameter (TWOPI = 2.d0*PI)
c flags used for position argument of both pllegend and plcolorbar
integer PL_POSITION_LEFT
Modified: trunk/examples/f77/x09f.fm4
===================================================================
--- trunk/examples/f77/x09f.fm4 2011-01-26 22:01:08 UTC (rev 11502)
+++ trunk/examples/f77/x09f.fm4 2011-01-26 22:23:15 UTC (rev 11503)
@@ -21,8 +21,7 @@
c Does several contour plots using different coordinate mappings.
implicit none
- real*8 PI
- parameter (PI = 3.1415926535897932384d0)
+ include 'plplot_parameters.h'
integer i, j, nptsx, nptsy, xdim, ydim
c xdim and ydim are the absolute static dimensions.
c nptsx, and nptsy are the (potentially dynamic) defined area of the 2D
@@ -39,8 +38,6 @@
data clevel /-1.d0, -0.8d0, -0.6d0, -0.4d0, -0.2d0,
& 0.d0, 0.2d0, 0.4d0, 0.6d0 ,0.8d0, 1.d0/
- integer PL_PARSE_FULL
- parameter(PL_PARSE_FULL = 1)
c Process command-line arguments
call plparseopts(PL_PARSE_FULL)
@@ -144,8 +141,7 @@
c polar contour plot example.
subroutine polar()
implicit none
- real*8 PI
- parameter (PI = 3.1415926535897932384d0)
+ include 'plplot_parameters.h'
integer PERIMETERPTS, RPTS, THETAPTS, NLEVEL, xdim, ydim
parameter(PERIMETERPTS = 100)
c xdim and ydim are the absolute static size of the 2D arrays.
@@ -200,7 +196,7 @@
& nlevel, ilevgt, ilevlt, nlevlt, nlevgt,
& ncollin, ncolbox, ncollab,
& nxsub, nysub, xdim, ydim
- real*8 TWOPI, r, theta, rmax, x0, y0, xmin, xmax, eps, q1, d1,
+ real*8 r, theta, rmax, x0, y0, xmin, xmax, eps, q1, d1,
& ymin, ymax,
& q1i, d1i, q2, d2, q2i, d2i, div1, div1i, div2, div2i,
& zmin, zmax, dz, xpmin, xpmax, ypmin, ypmax,
@@ -209,7 +205,7 @@
c NCX and NCY are associated with the part of the
c 2D arrays that are defined.
parameter (xdim=99, NCX=40, ydim=100, NCY=64, NPLT=100)
- parameter (TWOPI=6.2831853071795864768d0)
+ include 'plplot_parameters.h'
real*8 z(xdim, ydim), ztmp(xdim, ydim+1)
real*8 xg(xdim, ydim+1), yg(xdim, ydim+1), xtm(NPLT), ytm(NPLT)
Modified: trunk/examples/f77/x10f.fm4
===================================================================
--- trunk/examples/f77/x10f.fm4 2011-01-26 22:01:08 UTC (rev 11502)
+++ trunk/examples/f77/x10f.fm4 2011-01-26 22:23:15 UTC (rev 11503)
@@ -21,8 +21,7 @@
c Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
implicit none
- integer PL_PARSE_FULL
- parameter(PL_PARSE_FULL = 1)
+ include 'plplot_parameters.h'
c Process command-line arguments
call plparseopts(PL_PARSE_FULL)
Modified: trunk/examples/f77/x11f.fm4
===================================================================
--- trunk/examples/f77/x11f.fm4 2011-01-26 22:01:08 UTC (rev 11502)
+++ trunk/examples/f77/x11f.fm4 2011-01-26 22:23:15 UTC (rev 11503)
@@ -20,8 +20,7 @@
c Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
implicit none
- real*8 PI
- parameter (PI = 3.1415926535897932384d0)
+ include 'plplot_parameters.h'
integer i, j, k, ifshade, xpts, ypts
parameter (xpts=35, ypts=46)
@@ -32,29 +31,13 @@
integer opt(2)
data alt /33.0d0,17.0d0/
data az /24.0d0,115.0d0/
-c DRAW_LINEXY
+c DRAW_LINEXY = 3
data opt /2*3/
data title /'#frPLplot Example 11 - Alt=33, Az=24, Opt=3',
& '#frPLplot Example 11 - Alt=17, Az=115, Opt=3'/
integer nlevel
parameter (nlevel = 10)
real*8 zmin, zmax, step, clevel(nlevel)
-c Plotting options for 3d plots, see plplot.h for the C definitions
-c of these options.
- integer DRAW_LINEX, DRAW_LINEY, DRAW_LINEXY, MAG_COLOR,
- & BASE_CONT, TOP_CONT, SURF_CONT, DRAW_SIDES, FACETED, MESH
- parameter(DRAW_LINEX = 1)
- parameter(DRAW_LINEY = 2)
- parameter(DRAW_LINEXY = 3)
- parameter(MAG_COLOR = 4)
- parameter(BASE_CONT = 8)
- parameter(TOP_CONT = 16)
- parameter(SURF_CONT = 32)
- parameter(DRAW_SIDES = 64)
- parameter(FACETED = 128)
- parameter(MESH = 256)
- integer PL_PARSE_FULL
- parameter(PL_PARSE_FULL = 1)
c Process command-line arguments
call plparseopts(PL_PARSE_FULL)
Modified: trunk/examples/f77/x12f.fm4
===================================================================
--- trunk/examples/f77/x12f.fm4 2011-01-26 22:01:08 UTC (rev 11502)
+++ trunk/examples/f77/x12f.fm4 2011-01-26 22:23:15 UTC (rev 11503)
@@ -26,8 +26,7 @@
real*8 y0(10)
real*8 pos(5), rcoord(5), gcoord(5), bcoord(5)
integer rev(5)
- integer PL_PARSE_FULL
- parameter(PL_PARSE_FULL = 1)
+ include 'plplot_parameters.h'
data pos /0.0d0, 0.25d0, 0.5d0, 0.75d0, 1.0d0/
data rcoord /0.0d0, 0.25d0, 0.5d0, 1.0d0, 1.0d0/
Modified: trunk/examples/f77/x13f.fm4
===================================================================
--- trunk/examples/f77/x13f.fm4 2011-01-26 22:01:08 UTC (rev 11502)
+++ trunk/examples/f77/x13f.fm4 2011-01-26 22:23:15 UTC (rev 11503)
@@ -20,15 +20,12 @@
c Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
implicit none
- real*8 PI
- parameter (PI = 3.1415926535897932384d0)
+ include 'plplot_parameters.h'
real*8 just, dx, dy, x(500), y(500), per(5)
integer i, j, dthet, theta0, theta1, theta
character*20 text(5)
data text / 'Maurice', 'Geoffrey', 'Alan', 'Rafael', 'Vince'/
- integer PL_PARSE_FULL
- parameter(PL_PARSE_FULL = 1)
c Process command-line arguments
call plparseopts(PL_PARSE_FULL)
Modified: trunk/examples/f77/x14f.fm4
===================================================================
--- trunk/examples/f77/x14f.fm4 2011-01-26 22:01:08 UTC (rev 11502)
+++ trunk/examples/f77/x14f.fm4 2011-01-26 22:23:15 UTC (rev 11503)
@@ -42,8 +42,7 @@
c some fortran compilers demand typing of intrinsic lnblnk, and
c although this is not demanded on g77 it also works there.
integer lnblnk
- integer PL_PARSE_FULL
- parameter(PL_PARSE_FULL = 1)
+ include 'plplot_parameters.h'
real*8 xp0, yp0
integer xleng0, yleng0, xoff0, yoff0
logical valid_geometry
@@ -256,8 +255,7 @@
c and so do not use_ PLENV
implicit none
- real*8 PI
- parameter (PI = 3.1415926535897932384d0)
+ include 'plplot_parameters.h'
real*8 x(101), y(101)
real*8 xs(6), ys(6)
real*8 xscale, yscale, xoff, yoff
@@ -307,8 +305,7 @@
real*8 x0(0:360), y0(0:360)
real*8 x(0:360), y(0:360), dtr, theta, dx, dy, r
integer i, j, nsp
- real*8 PI
- parameter (PI = 3.1415926535897932384d0)
+ include 'plplot_parameters.h'
dtr = PI/180.0d0
do i=0,360
@@ -393,8 +390,7 @@
subroutine plot5()
implicit none
- real*8 PI
- parameter (PI = 3.1415926535897932384d0)
+ include 'plplot_parameters.h'
integer i, j, nptsx, nptsy, xdim, ydim
c xdim and ydim are the absolute static dimensions.
c nptsx, and nptsy are the (potentially dynamic) defined area of the 2D
Modified: trunk/examples/f77/x15f.fm4
===================================================================
--- trunk/examples/f77/x15f.fm4 2011-01-26 22:01:08 UTC (rev 11502)
+++ trunk/examples/f77/x15f.fm4 2011-01-26 22:23:15 UTC (rev 11503)
@@ -31,8 +31,7 @@
real*8 xx, yy
real*8 z(xdim, ydim), zmin, zmax
- integer PL_PARSE_FULL
- parameter(PL_PARSE_FULL = 1)
+ include 'plplot_parameters.h'
c Process command-line arguments
call plparseopts(PL_PARSE_FULL)
Modified: trunk/examples/f77/x16af.fm4
===================================================================
--- trunk/examples/f77/x16af.fm4 2011-01-26 22:01:08 UTC (rev 11502)
+++ trunk/examples/f77/x16af.fm4 2011-01-26 22:23:15 UTC (rev 11503)
@@ -22,8 +22,7 @@
implicit none
- integer PL_PARSE_FULL
- parameter(PL_PARSE_FULL = 1)
+ include 'plplot_parameters.h'
c Process command-line arguments
call plparseopts(PL_PARSE_FULL)
@@ -124,12 +123,11 @@
implicit none
integer xdim, ydim, NX, NY, NCONTR, NBDRY
- real*8 TWOPI
c xdim and ydim are the static dimensions of the 2D arrays while
c NX and NY are the defined area.
parameter (xdim = 99, NX = 40, ydim = 100, NY = 64)
parameter (NCONTR = 14, NBDRY=200)
- parameter (TWOPI=6.2831853071795864768d0)
+ include 'plplot_parameters.h'
real*8 z(xdim, ydim), ztmp(xdim, ydim+1)
real*8 xg(xdim, ydim+1), yg(xdim, ydim+1),
Modified: trunk/examples/f77/x16f.fm4
===================================================================
--- trunk/examples/f77/x16f.fm4 2011-01-26 22:01:08 UTC (rev 11502)
+++ trunk/examples/f77/x16f.fm4 2011-01-26 22:23:15 UTC (rev 11503)
@@ -20,8 +20,7 @@
c Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
implicit none
- real*8 PI
- parameter (PI = 3.1415926535897932384d0)
+ include 'plplot_parameters.h'
real*8 xx, yy, argx, argy, distort, r, t
integer NLEVEL, NX, NY, PERIMETERPTS, xdim, ydim
parameter(NLEVEL = 20)
@@ -41,8 +40,6 @@
real*8 tr(6)
common /plplot/tr
- integer PL_PARSE_FULL
- parameter(PL_PARSE_FULL = 1)
c Process command-line arguments
call plparseopts(PL_PARSE_FULL)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
