|
From: <and...@us...> - 2008-07-23 08:09:27
|
Revision: 8563
http://plplot.svn.sourceforge.net/plplot/?rev=8563&view=rev
Author: andrewross
Date: 2008-07-23 08:09:36 +0000 (Wed, 23 Jul 2008)
Log Message:
-----------
Fix f95 version of example 21. Enable the example in the ctest test suite. Produces
identical results to the C version with gfortran.
Modified Paths:
--------------
trunk/bindings/f95/sfstubsf95.f90
trunk/examples/f95/CMakeLists.txt
trunk/plplot_test/test_f95.sh.in
Modified: trunk/bindings/f95/sfstubsf95.f90
===================================================================
--- trunk/bindings/f95/sfstubsf95.f90 2008-07-23 03:17:46 UTC (rev 8562)
+++ trunk/bindings/f95/sfstubsf95.f90 2008-07-23 08:09:36 UTC (rev 8563)
@@ -506,19 +506,6 @@
end interface
interface
- function plrandd()
- use plplot_flt
- real (kind=plflt) :: plrandd
- end function plrandd
- end interface
-
- interface
- function plrandi()
- integer :: plrandi
- end function plrandi
- end interface
-
- interface
subroutine plreplot
end subroutine plreplot
end interface
@@ -1090,7 +1077,21 @@
enddo
call plpoly3f77( size(x), x, y, z, idraw, iifcc )
end subroutine plpoly3
+
+ real (kind=plflt) function plrandd()
+ external plranddf77
+ real(kind=plflt) :: plranddf77
+ plrandd = plranddf77()
+ end function plrandd
+
+ integer function plrandi()
+ external plrandif77
+ integer :: plrandif77
+
+ plrandi = plrandif77()
+ end function plrandi
+
subroutine plscmap0( r, g, b )
integer, dimension(:) :: r, g, b
Modified: trunk/examples/f95/CMakeLists.txt
===================================================================
--- trunk/examples/f95/CMakeLists.txt 2008-07-23 03:17:46 UTC (rev 8562)
+++ trunk/examples/f95/CMakeLists.txt 2008-07-23 08:09:36 UTC (rev 8563)
@@ -42,6 +42,7 @@
"18"
"19"
"20"
+"21"
"22"
"23"
"28"
Modified: trunk/plplot_test/test_f95.sh.in
===================================================================
--- trunk/plplot_test/test_f95.sh.in 2008-07-23 03:17:46 UTC (rev 8562)
+++ trunk/plplot_test/test_f95.sh.in 2008-07-23 08:09:36 UTC (rev 8563)
@@ -52,7 +52,7 @@
# skip 14, 17, and 20 because they are interactive, and 20 not implemented.
# skip 21 because it delivers variable results depending on computer timing
# and load (and not implemented yet).
- for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 15 16 18 19 22 23 28 29 30; do
+ for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 15 16 18 19 21 22 23 28 29 30; do
$f95dir/x${index}f -dev $device -o ${OUTPUT_DIR}/x${index}f95.$dsuffix $options 2> test.error
status_code=$?
cat test.error
@@ -93,7 +93,7 @@
# skip 14, 17, and 20 because they are interactive, and 20 not implemented.
# skip 21 because it delivers variable results depending on computer timing
# and load (and not implemented yet).
- for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 15 16 18 19 22 23 28 29 30; do
+ for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 15 16 18 19 21 22 23 28 29 30; do
$f95dir/x${index}f <<EOF 2> test.error
$device
${OUTPUT_DIR}/x${index}f95.$dsuffix
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|