[cdftools] 95/228: RD: cdfbottom fix chkfile cdfcoloc fix ctype compiler option gfortran

[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 cdbf9d47e817dad37ff1d2eb6f5144bc92b5724c
Author: dussin <dussin at 1055176f-818a-41d9-83e1-73fbe5b947c5>
Date:   Wed Jul 13 17:12:10 2011 +0000

    RD: cdfbottom fix chkfile
        cdfcoloc fix ctype
        compiler option gfortran
    
    
    git-svn-id: http://servforge.legi.grenoble-inp.fr/svn/CDFTOOLS/trunk@541 1055176f-818a-41d9-83e1-73fbe5b947c5
---
 Macrolib/macro.gfortran | 5 +++--
 cdfbottom.f90           | 2 +-
 cdfcoloc.f90            | 9 +++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Macrolib/macro.gfortran b/Macrolib/macro.gfortran
index e898ff7..59f8561 100644
--- a/Macrolib/macro.gfortran
+++ b/Macrolib/macro.gfortran
@@ -6,9 +6,10 @@
 #NCDF = -I/usr/local/include -L/usr/local/lib -lnetcdf
 NCDF = -I/usr/include -lnetcdff -lnetcdf
 
-F90=gfortran -v
+#F90=gfortran -v
+F90=gfortran 
 MPF90=
-FFLAGS= -O  $(NCDF)  -fno-second-underscore
+FFLAGS= -O  $(NCDF)  -fno-second-underscore -ffree-line-length-256
 LMPI=-lmpich
 
 INSTALL=$(HOME)/bin
diff --git a/cdfbottom.f90 b/cdfbottom.f90
index 4461a62..be0c7b0 100644
--- a/cdfbottom.f90
+++ b/cdfbottom.f90
@@ -78,7 +78,7 @@ PROGRAM cdfbottom
   ijarg = 1
   CALL getarg (ijarg, cf_in) ; ijarg = ijarg + 1
 
-  IF ( chkfile(cf_in) /= 0 ) STOP  ! missing files
+  IF ( chkfile(cf_in) ) STOP  ! missing files
 
   npiglo = getdim (cf_in,cn_x)
   npjglo = getdim (cf_in,cn_y)
diff --git a/cdfcoloc.f90 b/cdfcoloc.f90
index 92f2ea9..3dc0b16 100644
--- a/cdfcoloc.f90
+++ b/cdfcoloc.f90
@@ -91,8 +91,9 @@ PROGRAM cdfcoloc
   CALL ReadCdfNames()
 
   ! exhaustive list of supported field     
-  ctype    = (/'T','S','SSH','CFCINV','CFCCONC','PENDEP',   &
-     &        'MXL','MXL01','MXLT02','ISOTHICK','U ','V ','Sx','Sy','H ','etopo'/)
+  ctype    = (/'T       ','S       ','SSH     ','CFCINV  ','CFCCONC ','PENDEP  ',   &
+     &        'MXL     ','MXL01   ','MXLT02  ','ISOTHICK','U       ','V       ', &
+     &        'Sx      ','Sy      ','H       ','etopo   '/)
   ctmplst0 = 'U,V,Sx,Sy,H'                 ! default list
   !!  Read command line and output usage message if not compliant.
   narg= iargc()
@@ -534,7 +535,7 @@ CONTAINS
     ! check if all fields are supported:
     DO jtyp=1, ntyp
        DO jt =1 , jptyp
-          IF ( cltype(jtyp) == ctype(jt) )  EXIT
+          IF ( cltype(jtyp) == TRIM(ctype(jt)) )  EXIT
        ENDDO
        IF ( jt == jptyp + 1 ) THEN
           PRINT *, 'ERROR in field list :', TRIM(cltype(jtyp) ),' not supported'
@@ -626,7 +627,7 @@ CONTAINS
           &       ' -b etopo ' /)
 
     DO jtyp=1, jptyp
-      PRINT '( 12a,x,24a,x,10a)', ctype(jtyp), comments(jtyp), crequired(jtyp)
+      PRINT '( 12a,x,24a,x,10a)', TRIM(ctype(jtyp)), comments(jtyp), crequired(jtyp)
     ENDDO
     STOP
 

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