Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[10708] trunk/examples
|
From: <ai...@us...> - 2009-12-08 03:03:25
|
Revision: 10708
http://plplot.svn.sourceforge.net/plplot/?rev=10708&view=rev
Author: airwin
Date: 2009-12-08 03:03:06 +0000 (Tue, 08 Dec 2009)
Log Message:
-----------
Propagate C changes to example 28 to the corresponding f77 and f95 examples.
Modified Paths:
--------------
trunk/examples/f77/x28f.fm4
trunk/examples/f95/x28f.f90
Modified: trunk/examples/f77/x28f.fm4
===================================================================
--- trunk/examples/f77/x28f.fm4 2009-12-08 00:05:05 UTC (rev 10707)
+++ trunk/examples/f77/x28f.fm4 2009-12-08 03:03:06 UTC (rev 10708)
@@ -49,8 +49,19 @@
parameter(zmax = 1.d0)
parameter(zmid = 0.5d0*(zmax+zmin))
parameter(zrange = zmax-zmin)
-
-
+ real*8 ysmin, ysmax, ysrange, dysrot, dysshear
+ parameter(ysmin = ymin + 0.1 * yrange)
+ parameter(ysmax = ymax - 0.1 * yrange)
+ parameter(ysrange = ysmax - ysmin)
+ parameter(dysrot = ysrange / ( NROTATION - 1 ))
+ parameter(dysshear = ysrange / ( NSHEAR - 1 ))
+ real*8 zsmin, zsmax, zsrange, dzsrot, dzsshear
+ parameter(zsmin = zmin + 0.1 * zrange)
+ parameter(zsmax = zmax - 0.1 * zrange)
+ parameter(zsrange = zsmax - zsmin)
+ parameter(dzsrot = zsrange / ( NROTATION - 1 ))
+ parameter(dzsshear = zsrange / ( NSHEAR - 1 ))
+ real*8 ys, zs
real*8 x_inclination, y_inclination, z_inclination,
& x_shear, y_shear, z_shear,
& omega, sin_omega, cos_omega, domega
@@ -184,10 +195,9 @@
cos_omega = cos(omega)
y_shear = 0.5d0*yrange*sin_omega
z_shear = 0.5d0*zrange*cos_omega
+ zs = zsmax - dzsrot * dble(i-1)
call plptex3(
- & xmid,
- & ymax,
- & zmax -(zmax-0.2d0)*(dble(i-1)/dble(NROTATION-1)),
+ & xmid, ymax, zs,
& x_inclination, y_inclination, z_inclination,
& x_shear, y_shear, z_shear,
& 0.5d0, "rotation for y = y#dmax#u")
@@ -205,10 +215,9 @@
cos_omega = cos(omega)
x_shear = 0.5d0*xrange*sin_omega
z_shear = 0.5d0*zrange*cos_omega
+ zs = zsmax - dzsrot * dble(i-1)
call plptex3(
- & xmax,
- & ymid,
- & zmax -(zmax-0.2d0)*(dble(i-1)/dble(NROTATION-1)),
+ & xmax, ymid, zs,
& x_inclination, y_inclination, z_inclination,
& x_shear, y_shear, z_shear,
& 0.5d0, "rotation for x = x#dmax#u")
@@ -226,10 +235,9 @@
cos_omega = cos(omega)
y_shear = 0.5d0*yrange*cos_omega
z_shear = 0.5d0*zrange*sin_omega
+ ys = ysmax - dysrot * dble(i-1)
call plptex3(
- & xmid,
- & ymax -(zmax-0.2d0)*(dble(i-1)/dble(NROTATION-1)),
- & zmin,
+ & xmid, ys, zmin,
& x_inclination, y_inclination, z_inclination,
& x_shear, y_shear, z_shear,
& 0.5d0, "rotation for z = z#dmin#u")
@@ -266,10 +274,9 @@
cos_omega = cos(omega)
x_shear = 0.5d0*xrange*sin_omega
z_shear = 0.5d0*zrange*cos_omega
+ zs = zsmax - dzsshear * dble(i-1)
call plptex3(
- & xmid,
- & ymax,
- & zmax -(zmax-0.2d0)*(dble(i-1)/dble(NSHEAR-1)),
+ & xmid, ymax, zs,
& x_inclination, y_inclination, z_inclination,
& x_shear, y_shear, z_shear,
& 0.5d0, "shear for y = y#dmax#u")
@@ -287,10 +294,9 @@
cos_omega = cos(omega)
y_shear = -0.5d0*yrange*sin_omega
z_shear = 0.5d0*zrange*cos_omega
+ zs = zsmax - dzsshear * dble(i-1)
call plptex3(
- & xmax,
- & ymid,
- & zmax -(zmax-0.2d0)*(dble(i-1)/dble(NSHEAR-1)),
+ & xmax, ymid, zs,
& x_inclination, y_inclination, z_inclination,
& x_shear, y_shear, z_shear,
& 0.5d0, "shear for x = x#dmax#u")
@@ -308,10 +314,9 @@
cos_omega = cos(omega)
y_shear = 0.5d0*yrange*cos_omega
x_shear = 0.5d0*xrange*sin_omega
+ ys = ysmax - dysshear * dble(i-1)
call plptex3(
- & xmid,
- & ymax -(ymax-0.2d0)*(dble(i-1)/dble(NSHEAR-1)),
- & zmin,
+ & xmid, ys, zmin,
& x_inclination, y_inclination, z_inclination,
& x_shear, y_shear, z_shear,
& 0.5d0, "shear for z = z#dmin#u")
Modified: trunk/examples/f95/x28f.f90
===================================================================
--- trunk/examples/f95/x28f.f90 2009-12-08 00:05:05 UTC (rev 10707)
+++ trunk/examples/f95/x28f.f90 2009-12-08 03:03:06 UTC (rev 10708)
@@ -39,7 +39,18 @@
xmid = 0.5*(xmax + xmin), xrange = xmax - xmin, &
ymin=0., ymax=1.0, ymid = 0.5*(ymax + ymin), yrange = ymax - ymin, &
zmin=0., zmax=1.0, zmid = 0.5*(zmax + zmin), zrange = zmax - zmin
- real(PLFLT) :: y_location, z_location, &
+ real(PLFLT), parameter :: &
+ ysmin = ymin + 0.1 * yrange, &
+ ysmax = ymax - 0.1 * yrange, &
+ ysrange = ysmax - ysmin, &
+ dysrot = ysrange / ( NROTATION - 1 ), &
+ dysshear = ysrange / ( NSHEAR - 1 ), &
+ zsmin = zmin + 0.1 * zrange, &
+ zsmax = zmax - 0.1 * zrange, &
+ zsrange = zsmax - zsmin, &
+ dzsrot = zsrange / ( NROTATION - 1 ), &
+ dzsshear = zsrange / ( NSHEAR - 1 )
+ real(PLFLT) :: ys, zs, &
x_inclination, y_inclination, z_inclination, &
x_shear, y_shear, z_shear, &
omega, sin_omega, cos_omega, domega
@@ -183,9 +194,9 @@
cos_omega = cos(omega)
y_shear = 0.5*yrange*sin_omega
z_shear = 0.5*zrange*cos_omega
- z_location = zmax -(zmax-0.2)*(dble(i-1)/dble(NROTATION-1))
+ zs = zsmax - dzsrot * dble(i-1)
call plptex3( &
- xmid, ymax, z_location, &
+ xmid, ymax, zs, &
x_inclination, y_inclination, z_inclination, &
x_shear, y_shear, z_shear, &
0.5_plflt, "rotation for y = y#dmax#u")
@@ -203,9 +214,9 @@
cos_omega = cos(omega)
x_shear = 0.5*xrange*sin_omega
z_shear = 0.5*zrange*cos_omega
- z_location = zmax -(zmax-0.2)*((i-1)/dble(NROTATION-1))
+ zs = zsmax - dzsrot * dble(i-1)
call plptex3( &
- xmax, ymid, z_location, &
+ xmax, ymid, zs, &
x_inclination, y_inclination, z_inclination, &
x_shear, y_shear, z_shear, &
0.5_plflt, "rotation for x = x#dmax#u")
@@ -223,9 +234,9 @@
cos_omega = cos(omega)
y_shear = 0.5*yrange*cos_omega
z_shear = 0.5*zrange*sin_omega
- y_location = ymax -(ymax-0.2)*(dble(i-1)/dble(NROTATION-1))
+ ys = ysmax - dysrot * dble(i-1)
call plptex3( &
- xmid, y_location, zmin, &
+ xmid, ys, zmin, &
x_inclination, y_inclination, z_inclination, &
x_shear, y_shear, z_shear, &
0.5_plflt, "rotation for z = z#dmin#u")
@@ -261,9 +272,9 @@
cos_omega = cos(omega)
x_shear = 0.5*xrange*sin_omega
z_shear = 0.5*zrange*cos_omega
- z_location = zmax -(zmax-0.2)*(dble(i-1)/dble(NSHEAR-1))
+ zs = zsmax - dzsshear * dble(i-1)
call plptex3( &
- xmid, ymax, z_location, &
+ xmid, ymax, zs, &
x_inclination, y_inclination, z_inclination, &
x_shear, y_shear, z_shear, &
0.5_plflt, "shear for y = y#dmax#u")
@@ -281,9 +292,9 @@
cos_omega = cos(omega)
y_shear = -0.5*yrange*sin_omega
z_shear = 0.5*zrange*cos_omega
- z_location = zmax -(zmax-0.2)*((i-1)/dble(NSHEAR-1))
+ zs = zsmax - dzsshear * dble(i-1)
call plptex3( &
- xmax, ymid, z_location, &
+ xmax, ymid, zs, &
x_inclination, y_inclination, z_inclination, &
x_shear, y_shear, z_shear, &
0.5_plflt, "shear for x = x#dmax#u")
@@ -301,9 +312,9 @@
cos_omega = cos(omega)
y_shear = 0.5*yrange*cos_omega
x_shear = 0.5*xrange*sin_omega
- y_location = ymax -(ymax-0.2)*(dble(i-1)/dble(NSHEAR-1))
+ ys = ysmax - dysshear * dble(i-1)
call plptex3( &
- xmid, y_location, zmin, &
+ xmid, ys, zmin, &
x_inclination, y_inclination, z_inclination, &
x_shear, y_shear, z_shear, &
0.5_plflt, "shear for z = z#dmin#u")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
