[cdftools] 203/228: JMM : fix bugs in cdf2levitusgrid2d.f90 and related action in cdfio for time attribute

[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 10ed6a6008b32fb669887fcd82c40d8ef91b6fb3
Author: molines <molines at 1055176f-818a-41d9-83e1-73fbe5b947c5>
Date:   Mon Apr 15 20:54:23 2013 +0000

    JMM : fix bugs in cdf2levitusgrid2d.f90 and related action in cdfio for time attribute
    
    
    git-svn-id: http://servforge.legi.grenoble-inp.fr/svn/CDFTOOLS/trunk@651 1055176f-818a-41d9-83e1-73fbe5b947c5
---
 cdf2levitusgrid2d.f90 |  4 ++--
 cdfio.f90             | 20 +++++++++++++++-----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/cdf2levitusgrid2d.f90 b/cdf2levitusgrid2d.f90
index 8082ecf..c489e56 100644
--- a/cdf2levitusgrid2d.f90
+++ b/cdf2levitusgrid2d.f90
@@ -151,8 +151,8 @@ PROGRAM cdf2levitusgrid2d
       IF ( TRIM(cv_names(jk)) == TRIM(cv_nam) ) THEN
          ipkout(ii) = ipk(jk)
          stypvarout(ii) = stypvar(jk)
-         stypvarout(ji)%rmissing_value=getspval ( cf_in, TRIM(cv_nam) )
-         PRINT*, 'rmissing_value = ', stypvarout(ji)%rmissing_value
+         stypvarout(ii)%rmissing_value=getspval ( cf_in, TRIM(cv_nam) )
+         PRINT*, 'rmissing_value = ', stypvarout(ii)%rmissing_value
          nvarsout = ii
          numvar0 = jk
       ENDIF
diff --git a/cdfio.f90 b/cdfio.f90
index d255d3d..9aa15c0 100644
--- a/cdfio.f90
+++ b/cdfio.f90
@@ -410,19 +410,27 @@ CONTAINS
   END FUNCTION getvaratt
 
 
-  INTEGER(KIND=4) FUNCTION gettimeatt (cdfile, cdvartime, ctcalendar, cttitle, ctlong_name, ctaxis, ctunits, cttime_origin )
+  INTEGER(KIND=4) FUNCTION gettimeatt (cdfile, cdvartime, ctcalendar, cttitle, &
+        &                            ctlong_name, ctaxis, ctunits, cttime_origin )
     !!---------------------------------------------------------------------
     !!                  ***  FUNCTION gettimeatt  ***
     !!
     !! ** Purpose : Get specific attributes for time variable
     !!
     !!----------------------------------------------------------------------
-    CHARACTER(LEN=256), INTENT(in)  :: cdfile
-    CHARACTER(LEN=20),  INTENT(in)  :: cdvartime
-    CHARACTER(LEN=256), INTENT(out) :: ctcalendar, cttitle, ctlong_name, ctaxis, ctunits, cttime_origin
+    CHARACTER(LEN=*), INTENT(in)  :: cdfile
+    CHARACTER(LEN=*), INTENT(in)  :: cdvartime
+    CHARACTER(LEN=*), INTENT(out) :: ctcalendar, cttitle, ctlong_name, ctaxis, ctunits, cttime_origin
 
     INTEGER(KIND=4) :: istatus
     INTEGER(KIND=4) :: incid, ivarid
+    !!----------------------------------------------------------------------
+    ctcalendar    = 'unknown'
+    cttitle       = 'unknown'
+    ctlong_name   = 'unknown'
+    ctaxis        = 'unknown'
+    ctunits       = 'unknown'
+    cttime_origin = 'unknown'
 
     istatus = NF90_OPEN(cdfile, NF90_NOWRITE, incid)
     istatus = NF90_INQ_VARID(incid, cdvartime, ivarid)
@@ -439,7 +447,8 @@ CONTAINS
 
   END FUNCTION gettimeatt
 
-  INTEGER(KIND=4) FUNCTION puttimeatt (kout, cdvartime, ctcalendar, cttitle, ctlong_name, ctaxis, ctunits, cttime_origin )
+  INTEGER(KIND=4) FUNCTION puttimeatt (kout, cdvartime, ctcalendar, cttitle, &
+        &                          ctlong_name, ctaxis, ctunits, cttime_origin )
     !!---------------------------------------------------------------------
     !!                  ***  FUNCTION puttimeatt  ***
     !!
@@ -451,6 +460,7 @@ CONTAINS
     CHARACTER(LEN=256), INTENT(out) :: ctcalendar, cttitle, ctlong_name, ctaxis, ctunits, cttime_origin
 
     INTEGER(KIND=4) :: ivarid
+    !!----------------------------------------------------------------------
 
     puttimeatt=NF90_INQ_VARID(kout, cdvartime, ivarid)
     IF (puttimeatt /= 0 ) THEN 

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