[cdftools] 127/228: JMM : fixes in cdfnan to make compilation on vargas feasable fixes in Makefile and macro.vargas to make compilation of cdfnamelist feasable

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch master
in repository cdftools.

commit 914a0ec8de59ca4508240f67c06898510d665700
Author: molines <molines at 1055176f-818a-41d9-83e1-73fbe5b947c5>
Date:   Mon Jan 9 16:57:40 2012 +0000

    JMM : fixes in cdfnan to make compilation on vargas feasable
          fixes in Makefile and macro.vargas to make compilation of cdfnamelist feasable
    
    
    git-svn-id: http://servforge.legi.grenoble-inp.fr/svn/CDFTOOLS/trunk@575 1055176f-818a-41d9-83e1-73fbe5b947c5
---
 Macrolib/macro.vargas | 3 ++-
 Makefile              | 2 +-
 cdfnan.f90            | 6 +++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Macrolib/macro.vargas b/Macrolib/macro.vargas
index 42aeff6..ee0c0d1 100644
--- a/Macrolib/macro.vargas
+++ b/Macrolib/macro.vargas
@@ -4,11 +4,12 @@
 # !!  $Id: macro.zahir 82 2007-07-17 08:24:09Z molines $
 # !!--------------------------------------------------------------
 #
-NCDF= -I/usr/local/pub/NetCDF/3.5.1/include -L/usr/local/pub/NetCDF/3.5.1/lib -lnetcdf
+NCDF= -lnetcdf
 
 F90=xlf90
 MPF90=mpxlf90_r
 #FFLAGS= -O4  -qsuffix=f=f90   $(NCDF)  -q64 -qsave
+FDATE_FLAG= -brename:.fdate,.fdate_
 FFLAGS= -O4  -qsuffix=f=f90   $(NCDF)  -q64 
 
 INSTALL=./
diff --git a/Makefile b/Makefile
index 90d1686..c731c5d 100644
--- a/Makefile
+++ b/Makefile
@@ -382,7 +382,7 @@ cdffixtime: cdfio.o  cdffixtime.f90
 	$(F90)  cdffixtime.f90  -o $(BINDIR)/cdffixtime cdfio.o modcdfnames.o $(FFLAGS)
 
 cdfnamelist: modcdfnames.o  cdfnamelist.f90
-	$(F90)  cdfnamelist.f90  -o $(BINDIR)/cdfnamelist  modcdfnames.o $(FFLAGS)
+	$(F90)  cdfnamelist.f90  -o $(BINDIR)/cdfnamelist  modcdfnames.o $(FFLAGS) $(FDATE_FLAG)
 
 # OLD bimg/dimg stuff: use by the trpsig monitoring....
 cdfsections: eos.o cdfsections.f90
diff --git a/cdfnan.f90 b/cdfnan.f90
index b74216a..33dbcb9 100644
--- a/cdfnan.f90
+++ b/cdfnan.f90
@@ -137,7 +137,11 @@ PROGRAM cdfnan
               DO jt=1,npt
                  DO jk = 1, ipk(jvar) 
                     tab(:,:) = getvar(cf_inout, cv_names(jvar), jk, npiglo, npjglo, ktime=jt )
-                    WHERE( isnan(tab(:,:)) ) tab(:,:) = zspval
+!                   WHERE( isnan(tab(:,:)) ) tab(:,:) = zspval
+                    ! isnan function is not available on xlf90 compiler
+                    ! we replace it by the following test that gives the same results
+                    ! reference : http://www.unixguide.net/ibm/faq/faq3.03.shtml
+                    WHERE( tab(:,:) /= tab(:,:) ) tab(:,:) = zspval
                     ierr = putvar(ncid, id_var(jvar), tab, jk, npiglo, npjglo, ktime=jt)
                  ENDDO
               END DO

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cdftools.git