Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[10618] trunk/examples
|
From: <ai...@us...> - 2009-11-20 19:17:41
|
Revision: 10618
http://plplot.svn.sourceforge.net/plplot/?rev=10618&view=rev
Author: airwin
Date: 2009-11-20 19:17:35 +0000 (Fri, 20 Nov 2009)
Log Message:
-----------
Get rid of trailing semicolons on fortran statements. I guess all the
compilers we have tested accepted these, but traditional Fortran compilers
did not accept them. Furthermore, most of our example Fortran statements
don't have trailing semicolons so it is worth removing them simply for
consistent style.
Modified Paths:
--------------
trunk/examples/f77/x21f.fm4
trunk/examples/f77/x22f.fm4
trunk/examples/f77/x24f.fm4
trunk/examples/f77/x29f.fm4
trunk/examples/f77/x30f.fm4
trunk/examples/f95/x21f.f90
trunk/examples/f95/x22f.f90
trunk/examples/f95/x24f.f90
trunk/examples/f95/x29f.f90
trunk/examples/f95/x30f.f90
Modified: trunk/examples/f77/x21f.fm4
===================================================================
--- trunk/examples/f77/x21f.fm4 2009-11-20 00:29:03 UTC (rev 10617)
+++ trunk/examples/f77/x21f.fm4 2009-11-20 19:17:35 UTC (rev 10618)
@@ -69,7 +69,7 @@
real*8 xg(xp), yg(yp), zg(xp,yp)
real*8 zmin, zmax, lzmin, lzmax
integer i, j, k
- integer alg;
+ integer alg
character*80 title(6)
data title /'Cubic Spline Approximation',
& 'Delaunay Linear Interpolation',
@@ -95,11 +95,11 @@
ymax = 0.6d0
c call plMergeOpts(options, "x21c options", NULL);
- call plparseopts(PL_PARSE_FULL);
+ call plparseopts(PL_PARSE_FULL)
- opt(3) = wmin;
- opt(4) = dble(knn_order);
- opt(5) = threshold;
+ opt(3) = wmin
+ opt(4) = dble(knn_order)
+ opt(5) = threshold
c Initialize plplot
@@ -150,7 +150,7 @@
call plssub(3,2)
do k=1,2
- call pladv(0);
+ call pladv(0)
do alg=1,6
call plgriddata(x, y, z, pts, xg, xp, yg, yp, zg, alg,
@@ -219,7 +219,7 @@
if (k.eq.1) then
do i=1,nl
- clev(i) = lzmin + (lzmax-lzmin)/(nl-1.d0)*(i-1.d0);
+ clev(i) = lzmin + (lzmax-lzmin)/(nl-1.d0)*(i-1.d0)
enddo
call plenv0(xmin, xmax, ymin, ymax, 2, 0)
call plcol0(15)
@@ -230,7 +230,7 @@
else
do i = 1,nl
- clev(i) = lzmin + (lzmax-lzmin)/(nl-1.d0)*(i-1.d0);
+ clev(i) = lzmin + (lzmax-lzmin)/(nl-1.d0)*(i-1.d0)
enddo
call cmap1_init()
call plvpor(0.d0, 1.d0, 0.d0, 0.9d0)
Modified: trunk/examples/f77/x22f.fm4
===================================================================
--- trunk/examples/f77/x22f.fm4 2009-11-20 00:29:03 UTC (rev 10617)
+++ trunk/examples/f77/x22f.fm4 2009-11-20 19:17:35 UTC (rev 10618)
@@ -179,17 +179,17 @@
eps = 2.0d0
- q1 = 1.0d0;
- d1 = rmax/4.0d0;
+ q1 = 1.0d0
+ d1 = rmax/4.0d0
- q1i = - q1*rmax/d1;
- d1i = rmax**2.0d0/d1;
+ q1i = - q1*rmax/d1
+ d1i = rmax**2.0d0/d1
- q2 = -1.0d0;
- d2 = rmax/4.0d0;
+ q2 = -1.0d0
+ d2 = rmax/4.0d0
- q2i = - q2*rmax/d2;
- d2i = rmax**2.0d0/d2;
+ q2i = - q2*rmax/d2
+ d2i = rmax**2.0d0/d2
do i = 1, nr
r = 0.5 + dble(i-1)
Modified: trunk/examples/f77/x24f.fm4
===================================================================
--- trunk/examples/f77/x24f.fm4 2009-11-20 00:29:03 UTC (rev 10617)
+++ trunk/examples/f77/x24f.fm4 2009-11-20 19:17:35 UTC (rev 10618)
@@ -154,7 +154,7 @@
do 120 i = 1,4
- call plcol0 (i);
+ call plcol0 (i)
call plfill (4, px, py)
do 110 j = 1,4
Modified: trunk/examples/f77/x29f.fm4
===================================================================
--- trunk/examples/f77/x29f.fm4 2009-11-20 00:29:03 UTC (rev 10617)
+++ trunk/examples/f77/x29f.fm4 2009-11-20 19:17:35 UTC (rev 10618)
@@ -146,7 +146,7 @@
c "A Model Comparison for Daylength as a Function of Latitude and
c Day of the Year", 1995, Ecological Modelling, 80, pp 87-95.
do j=1,npts
- x(j) = (j-1)*60.0d0*60.0d0*24.0d0;
+ x(j) = (j-1)*60.0d0*60.0d0*24.0d0
p = asin(0.39795d0*cos(0.2163108d0 + 2.0d0*atan(0.9671396d0*
& tan(0.00860d0*(j-187)))))
d = 24.0d0 - (24.0d0/PI)*
@@ -182,7 +182,7 @@
integer i, npts
real*8 xmin, xmax, ymin, ymax
integer tstart, t1, t2
- real*8 toff;
+ real*8 toff
real*8 x(365), y(365), xerr1(365), xerr2(365), yerr1(365),
& yerr2(365)
common /plotdat/ x, y, xerr1, xerr2, yerr1, yerr2
@@ -255,10 +255,10 @@
character*100 xtitle
character*100 title
real*8 x(1001), y(1001)
- integer tai_year, tai_month, tai_day, tai_hour, tai_min;
- real*8 tai_sec, tai;
- integer utc_year, utc_month, utc_day, utc_hour, utc_min;
- real*8 utc_sec, utc;
+ integer tai_year, tai_month, tai_day, tai_hour, tai_min
+ real*8 tai_sec, tai
+ integer utc_year, utc_month, utc_day, utc_hour, utc_min
+ real*8 utc_sec, utc
c Use the definition given in http://en.wikipedia.org/wiki/Besselian_epoch
c B = 1900. + (JD -2415020.31352)/365.242198781
@@ -338,7 +338,7 @@
x(i+1) = xmin + i*(xmax-xmin)/(dble(npts-1))
call plconfigtime(scale, offset1, offset2, z'0', 0, 0, 0, 0,
1 0, 0, 0.d0)
- tai = x(i+1);
+ tai = x(i+1)
call plbtime(tai_year, tai_month, tai_day, tai_hour,
1 tai_min, tai_sec, tai)
call plconfigtime(scale, offset1, offset2, z'2', 0, 0, 0,
Modified: trunk/examples/f77/x30f.fm4
===================================================================
--- trunk/examples/f77/x30f.fm4 2009-11-20 00:29:03 UTC (rev 10617)
+++ trunk/examples/f77/x30f.fm4 2009-11-20 19:17:35 UTC (rev 10618)
@@ -121,7 +121,7 @@
c the transparencies back to completely opaque.
icol = mod(i-1,3) + 1
call plgcol0a (icol, r, g, b, a)
- call plscol0a (icol, r, g, b, 1.0d0);
+ call plscol0a (icol, r, g, b, 1.0d0)
call plcol0 (icol)
do j = 1, 5
c Set box y position and draw the box.
Modified: trunk/examples/f95/x21f.f90
===================================================================
--- trunk/examples/f95/x21f.f90 2009-11-20 00:29:03 UTC (rev 10617)
+++ trunk/examples/f95/x21f.f90 2009-11-20 19:17:35 UTC (rev 10618)
@@ -62,7 +62,7 @@
real(kind=plflt) xg(xp), yg(yp), zg(xp,yp)
real(kind=plflt) zmin, zmax, lzmin, lzmax
integer i, j, k
- integer alg;
+ integer alg
character*80 title(6)
data title /'Cubic Spline Approximation', &
'Delaunay Linear Interpolation', &
@@ -88,11 +88,11 @@
ymax = 0.6_plflt
! call plMergeOpts(options, "x21c options", NULL);
- call plparseopts(PL_PARSE_FULL);
+ call plparseopts(PL_PARSE_FULL)
- opt(3) = wmin;
- opt(4) = dble(knn_order);
- opt(5) = threshold;
+ opt(3) = wmin
+ opt(4) = dble(knn_order)
+ opt(5) = threshold
! Initialize plplot
@@ -143,7 +143,7 @@
call plssub(3,2)
do k=1,2
- call pladv(0);
+ call pladv(0)
do alg=1,6
call plgriddata(x, y, z, xg, yg, zg, alg, opt(alg))
@@ -211,7 +211,7 @@
if (k.eq.1) then
do i=1,nl
- clev(i) = lzmin + (lzmax-lzmin)/(nl-1._plflt)*(i-1._plflt);
+ clev(i) = lzmin + (lzmax-lzmin)/(nl-1._plflt)*(i-1._plflt)
enddo
call plenv0(xmin, xmax, ymin, ymax, 2, 0)
call plcol0(15)
@@ -222,7 +222,7 @@
else
do i = 1,nl
- clev(i) = lzmin + (lzmax-lzmin)/(nl-1._plflt)*(i-1._plflt);
+ clev(i) = lzmin + (lzmax-lzmin)/(nl-1._plflt)*(i-1._plflt)
enddo
call cmap1_init()
call plvpor(0._plflt, 1._plflt, 0._plflt, 0.9_plflt)
Modified: trunk/examples/f95/x22f.f90
===================================================================
--- trunk/examples/f95/x22f.f90 2009-11-20 00:29:03 UTC (rev 10617)
+++ trunk/examples/f95/x22f.f90 2009-11-20 19:17:35 UTC (rev 10618)
@@ -176,17 +176,17 @@
eps = 2.0_plflt
- q1 = 1.0_plflt;
- d1 = rmax/4.0_plflt;
+ q1 = 1.0_plflt
+ d1 = rmax/4.0_plflt
- q1i = - q1*rmax/d1;
- d1i = rmax**2.0_plflt/d1;
+ q1i = - q1*rmax/d1
+ d1i = rmax**2.0_plflt/d1
- q2 = -1.0_plflt;
- d2 = rmax/4.0_plflt;
+ q2 = -1.0_plflt
+ d2 = rmax/4.0_plflt
- q2i = - q2*rmax/d2;
- d2i = rmax**2.0_plflt/d2;
+ q2i = - q2*rmax/d2
+ d2i = rmax**2.0_plflt/d2
do i = 1, nr
r = 0.5 + dble(i-1)
Modified: trunk/examples/f95/x24f.f90
===================================================================
--- trunk/examples/f95/x24f.f90 2009-11-20 00:29:03 UTC (rev 10617)
+++ trunk/examples/f95/x24f.f90 2009-11-20 19:17:35 UTC (rev 10618)
@@ -154,7 +154,7 @@
do i = 1,4
- call plcol0 (i);
+ call plcol0 (i)
call plfill (px, py)
do j = 1,4
Modified: trunk/examples/f95/x29f.f90
===================================================================
--- trunk/examples/f95/x29f.f90 2009-11-20 00:29:03 UTC (rev 10617)
+++ trunk/examples/f95/x29f.f90 2009-11-20 19:17:35 UTC (rev 10618)
@@ -139,7 +139,7 @@
! "A Model Comparison for Daylength as a Function of Latitude and
! Day of the Year", 1995, Ecological Modelling, 80, pp 87-95.
do j=1,npts
- x(j) = (j-1)*60.0_plflt*60.0_plflt*24.0_plflt;
+ x(j) = (j-1)*60.0_plflt*60.0_plflt*24.0_plflt
p = asin(0.39795_plflt*cos(0.2163108_plflt + 2.0_plflt* &
atan(0.9671396_plflt*tan(0.00860_plflt*(j-187)))))
d = 24.0_plflt - (24.0_plflt/PI)* &
@@ -177,7 +177,7 @@
integer :: i, npts
real(kind=plflt) :: xmin, xmax, ymin, ymax
integer :: tstart, t1, t2
-! real(kind=plflt) :: toff;
+! real(kind=plflt) :: toff
real(kind=plflt), dimension(365) :: x, y, xerr1, xerr2, yerr1, yerr2
common /plotdat/ x, y, xerr1, xerr2, yerr1, yerr2
@@ -217,7 +217,7 @@
call plcol0(3)
call pllab("Date", "Hours of television watched", &
"@frPLplot Example 29 - Hours of television watched in " // &
- "Dec 2005 / Jan 2006");
+ "Dec 2005 / Jan 2006")
call plcol0(4)
@@ -247,10 +247,10 @@
character(len=100) :: xtitle
character(len=100) :: title
real(kind=plflt) :: x(1001), y(1001)
- integer :: tai_year, tai_month, tai_day, tai_hour, tai_min;
- real(kind=plflt) :: tai_sec, tai;
- integer :: utc_year, utc_month, utc_day, utc_hour, utc_min;
- real(kind=plflt) :: utc_sec, utc;
+ integer :: tai_year, tai_month, tai_day, tai_hour, tai_min
+ real(kind=plflt) :: tai_sec, tai
+ integer :: utc_year, utc_month, utc_day, utc_hour, utc_min
+ real(kind=plflt) :: utc_sec, utc
! Use the definition given in http://en.wikipedia.org/wiki/Besselian_epoch
! B = 1900. + (JD -2415020.31352)/365.242198781
@@ -330,7 +330,7 @@
x(i+1) = xmin + i*(xmax-xmin)/(dble(npts-1))
call plconfigtime(scale, offset1, offset2, z'0', 0, 0, 0, 0, &
0, 0, 0._plflt)
- tai = x(i+1);
+ tai = x(i+1)
call plbtime(tai_year, tai_month, tai_day, tai_hour, &
tai_min, tai_sec, tai)
call plconfigtime(scale, offset1, offset2, z'2', 0, 0, 0, &
Modified: trunk/examples/f95/x30f.f90
===================================================================
--- trunk/examples/f95/x30f.f90 2009-11-20 00:29:03 UTC (rev 10617)
+++ trunk/examples/f95/x30f.f90 2009-11-20 19:17:35 UTC (rev 10618)
@@ -119,7 +119,7 @@
! the transparencies back to completely opaque.
icol = mod(i-1,3) + 1
call plgcol0a (icol, r, g, b, a)
- call plscol0a (icol, r, g, b, 1.0_plflt);
+ call plscol0a (icol, r, g, b, 1.0_plflt)
call plcol0 (icol)
do j = 1, 5
! Set box y position and draw the box.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
