[Plplot-cvs] SF.net SVN: plplot:[8599] trunk/examples

[<and...@us...>]

Revision: 8599
          http://plplot.svn.sourceforge.net/plplot/?rev=8599&view=rev
Author:   andrewross
Date:     2008-07-31 12:40:03 +0000 (Thu, 31 Jul 2008)

Log Message:
-----------
Change function name from isnan to myisnan to avoid confusion with 
intrinsic on some compilers. Also remove logical from function 
definition since some compilers don't like this (gfortran didn't 
complain but an old version of ifort did).

Modified Paths:
--------------
    trunk/examples/f77/x21f.fm4
    trunk/examples/f95/x21f.f90

Modified: trunk/examples/f77/x21f.fm4
===================================================================
--- trunk/examples/f77/x21f.fm4	2008-07-30 21:28:06 UTC (rev 8598)
+++ trunk/examples/f77/x21f.fm4	2008-07-31 12:40:03 UTC (rev 8599)
@@ -45,8 +45,8 @@
       external plrandd
       real*8 plrandd
 
-      external isnan
-      logical isnan
+      external myisnan
+      logical myisnan
 
       integer pts, xp, yp, nl, knn_order, randn, rosen
       real*8 threshold, wmin
@@ -166,7 +166,7 @@
                
                do i=1,xp
                   do j=1,yp
-                     if (isnan(zg(i,j))) then
+                     if (myisnan(zg(i,j))) then
 c     average (IDW) over the 8 neighbors
                         
                         zg(i,j) = 0.d0
@@ -177,7 +177,7 @@
                            jj = j-1
                            do while ((jj.le.j+1).and.(jj.le.yp))
                               if ((ii.ge.1) .and. (jj.ge.1) .and.
-     &                             (.not.isnan(zg(ii,jj))) ) then
+     &                             (.not.myisnan(zg(ii,jj))) ) then
                                  if (abs(ii-i) + abs(jj-j) .eq. 1) then
                                     d = 1.d0
                                  else
@@ -272,13 +272,13 @@
       end subroutine
 
 
-      logical function isnan(x)
+      function myisnan(x)
       implicit none
       
-      logical isnan
+      logical myisnan
       real*8 x
 
-      isnan = (x.ne.x)
+      myisnan = (x.ne.x)
       return
       end function
 

Modified: trunk/examples/f95/x21f.f90
===================================================================
--- trunk/examples/f95/x21f.f90	2008-07-30 21:28:06 UTC (rev 8598)
+++ trunk/examples/f95/x21f.f90	2008-07-31 12:40:03 UTC (rev 8599)
@@ -1,4 +1,4 @@
-!      $Id:$
+!      $Id$
 !      Grid data demo.
 !
 !      Copyright (C) 2004  Joao Cardoso
@@ -40,8 +40,8 @@
       parameter(MAG_COLOR = 4)
       parameter(BASE_CONT = 8)
       
-      external isnan
-      logical isnan
+      external myisnan
+      logical myisnan
 
       integer pts, xp, yp, nl, knn_order, randn, rosen
       real(kind=plflt) threshold, wmin
@@ -160,7 +160,7 @@
                
                do i=1,xp
                   do j=1,yp
-                     if (isnan(zg(i,j))) then
+                     if (myisnan(zg(i,j))) then
 !     average (IDW) over the 8 neighbors
                         
                         zg(i,j) = 0._plflt
@@ -171,7 +171,7 @@
                            jj = j-1
                            do while ((jj.le.j+1).and.(jj.le.yp))
                               if ((ii.ge.1) .and. (jj.ge.1) .and. &
-                                   (.not.isnan(zg(ii,jj))) ) then
+                                   (.not.myisnan(zg(ii,jj))) ) then
                                  if (abs(ii-i) + abs(jj-j) .eq. 1) then
                                     d = 1._plflt
                                  else
@@ -267,16 +267,16 @@
       end subroutine cmap1_init
 
 
-      logical function isnan(x)
+      function myisnan(x)
         use plplot
         implicit none
         
-        logical isnan
+        logical myisnan
         real(kind=plflt) x
         
-        isnan = (x.ne.x)
+        myisnan = (x.ne.x)
         return
-      end function isnan
+      end function myisnan
 
 
 !----------------------------------------------------------------------------


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