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

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

Revision: 11509
          http://plplot.svn.sourceforge.net/plplot/?rev=11509&view=rev
Author:   airwin
Date:     2011-01-27 03:42:04 +0000 (Thu, 27 Jan 2011)

Log Message:
-----------
Expand plplot_parameters.h to include PL_NOTSET and include/use that file
for f77 examples 27-31.

Modified Paths:
--------------
    trunk/bindings/f77/plplot_parameters.h
    trunk/examples/f77/x27f.fm4
    trunk/examples/f77/x28f.fm4
    trunk/examples/f77/x29f.fm4
    trunk/examples/f77/x30f.fm4
    trunk/examples/f77/x31f.fm4

Modified: trunk/bindings/f77/plplot_parameters.h
===================================================================
--- trunk/bindings/f77/plplot_parameters.h	2011-01-27 02:53:21 UTC (rev 11508)
+++ trunk/bindings/f77/plplot_parameters.h	2011-01-27 03:42:04 UTC (rev 11509)
@@ -26,6 +26,8 @@
       real*8 PI, TWOPI
       parameter (PI = 3.1415926535897932384d0)
       parameter (TWOPI = 2.d0*PI)
+      real*8 PL_NOTSET
+      parameter(PL_NOTSET = -42.0d0)
 
 c flags used for plgriddata()
       integer GRID_CSA, GRID_DTLI, GRID_NNI, GRID_NNIDW, GRID_NNLI, 

Modified: trunk/examples/f77/x27f.fm4
===================================================================
--- trunk/examples/f77/x27f.fm4	2011-01-27 02:53:21 UTC (rev 11508)
+++ trunk/examples/f77/x27f.fm4	2011-01-27 03:42:04 UTC (rev 11509)
@@ -34,8 +34,7 @@
 
       implicit none
 
-      integer PL_PARSE_FULL
-      parameter(PL_PARSE_FULL = 1)
+      include 'plplot_parameters.h'
 
 c     R, r, p, N
 

Modified: trunk/examples/f77/x28f.fm4
===================================================================
--- trunk/examples/f77/x28f.fm4	2011-01-27 02:53:21 UTC (rev 11508)
+++ trunk/examples/f77/x28f.fm4	2011-01-27 03:42:04 UTC (rev 11509)
@@ -24,6 +24,7 @@
       program x28f
 
       implicit none
+      include 'plplot_parameters.h'
 
       integer XPTS, YPTS, NREVOLUTION, NROTATION, NSHEAR
       parameter(XPTS = 2)
@@ -32,8 +33,6 @@
       parameter(NROTATION = 8)
       parameter(NSHEAR = 8)
       real*8 x(XPTS), y(YPTS), z(XPTS,YPTS)
-      real*8 PI
-      parameter (PI = 3.1415926535897932384d0)
       real*8 xmin, xmax, xmid, xrange
       parameter(xmin = 0.d0)
       parameter(xmax = 1.d0)
@@ -68,10 +67,6 @@
       integer i, j
       real*8 radius, pitch, xpos, ypos, zpos
       integer lnblnk
-      integer PL_PARSE_FULL
-      parameter(PL_PARSE_FULL = 1)
-      integer DRAW_LINEXY
-      parameter(DRAW_LINEXY = 3)
 
       character*80 pstring
       pstring =

Modified: trunk/examples/f77/x29f.fm4
===================================================================
--- trunk/examples/f77/x29f.fm4	2011-01-27 02:53:21 UTC (rev 11508)
+++ trunk/examples/f77/x29f.fm4	2011-01-27 03:42:04 UTC (rev 11509)
@@ -24,14 +24,12 @@
       program x29f
 
       implicit none
+      include 'plplot_parameters.h'
 
       real*8 x(365), y(365), xerr1(365), xerr2(365), yerr1(365), 
      &     yerr2(365)
       common /plotdat/ x, y, xerr1, xerr2, yerr1, yerr2
 
-      integer PL_PARSE_FULL
-      parameter(PL_PARSE_FULL = 1)
-
       call plparseopts(PL_PARSE_FULL)
 
       call plinit()
@@ -53,6 +51,7 @@
 c     
       subroutine plot1()
       implicit none
+      include 'plplot_parameters.h'
 
       real*8 x(365), y(365), xerr1(365), xerr2(365), yerr1(365), 
      &     yerr2(365)
@@ -67,9 +66,6 @@
       parameter(ymin = 10.0d0)
       parameter(ymax = 20.0d0)
 
-      real*8 PI
-      parameter (PI = 3.1415926535897932384d0)
-      
       do i = 1,npts
       	 x(i) = xmax*(dble(i-1)/dble(npts))
          y(i) = 15.0d0 - 5.0d0*cos(2.0d0*PI*dble(i-1)/dble(npts))
@@ -120,6 +116,7 @@
 c
       subroutine plot2() 
       implicit none
+      include 'plplot_parameters.h'
       
       integer j, npts
       real*8 xmin, xmax, ymin, ymax
@@ -139,9 +136,6 @@
       parameter(ymin = 0)
       parameter(ymax = 24)
 
-      real*8 PI
-      parameter (PI = 3.1415926535897932384d0)
-  
 c     Formula for hours of daylight from 
 c     "A Model Comparison for Daylength as a Function of Latitude and 
 c     Day of the Year", 1995, Ecological Modelling, 80, pp 87-95.
@@ -178,6 +172,7 @@
 c
       subroutine plot3()
       implicit none
+      include 'plplot_parameters.h'
       
       integer i, npts
       real*8 xmin, xmax, ymin, ymax
@@ -187,9 +182,6 @@
      &     yerr2(365)
       common /plotdat/ x, y, xerr1, xerr2, yerr1, yerr2
 
-      real*8 PI
-      parameter (PI = 3.1415926535897932384d0)
-  
 c     integer tm(9)
 
       parameter (npts = 62)

Modified: trunk/examples/f77/x30f.fm4
===================================================================
--- trunk/examples/f77/x30f.fm4	2011-01-27 02:53:21 UTC (rev 11508)
+++ trunk/examples/f77/x30f.fm4	2011-01-27 03:42:04 UTC (rev 11509)
@@ -25,6 +25,7 @@
       program x30f
 
       implicit none
+      include 'plplot_parameters.h'
 
       integer red(4), green(4), blue(4)
       real*8 alpha(4), px(4), py(4)
@@ -50,9 +51,6 @@
 
       character*1 defined
 
-      integer PL_PARSE_FULL
-      parameter(PL_PARSE_FULL = 1)
-
       call plparseopts(PL_PARSE_FULL)
 
       call plinit()

Modified: trunk/examples/f77/x31f.fm4
===================================================================
--- trunk/examples/f77/x31f.fm4	2011-01-27 02:53:21 UTC (rev 11508)
+++ trunk/examples/f77/x31f.fm4	2011-01-27 03:42:04 UTC (rev 11509)
@@ -27,6 +27,7 @@
 c--------------------------------------------------------------------------
 
       implicit none
+      include 'plplot_parameters.h'
       real*8 xmin, xmax, ymin, ymax, zxmin, zxmax, zymin, zymax
       real*8 xmid, ymid, wx, wy
       real*8 mar, aspect, jx, jy, ori
@@ -50,11 +51,6 @@
 
 c     Parse and process command line arguments
 
-      integer PL_PARSE_FULL
-      parameter(PL_PARSE_FULL = 1)
-      real*8 PL_NOTSET
-      parameter(PL_NOTSET = -42.0d0)
-      
       status = 0
       stderr = 0
 


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