[cdftools] 143/228: JMM : correction in putheadervar for standard depth name. Previous fix introuduced a bug !

[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 e4772fbcf662a223dbd918e98f246c637d675b36
Author: molines <molines at 1055176f-818a-41d9-83e1-73fbe5b947c5>
Date:   Fri Apr 13 22:24:09 2012 +0000

    JMM : correction in putheadervar for standard depth name. Previous fix introuduced a bug !
    
    
    git-svn-id: http://servforge.legi.grenoble-inp.fr/svn/CDFTOOLS/trunk@591 1055176f-818a-41d9-83e1-73fbe5b947c5
---
 cdfio.f90 | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/cdfio.f90 b/cdfio.f90
index 52aa185..fe0cf02 100644
--- a/cdfio.f90
+++ b/cdfio.f90
@@ -1580,6 +1580,8 @@ CONTAINS
     CHARACTER(LEN=256)                        :: cldep
     !!----------------------------------------------------------------------
     ALLOCATE ( z2d (kpi,kpj) )
+    
+    cldept = (/cn_vdeptht, cn_vdepthu, cn_vdepthv, cn_vdepthw,'nav_lev','z      '/)
 
     IF (PRESENT(pnavlon) ) THEN 
        z2d = pnavlon
@@ -1606,13 +1608,6 @@ CONTAINS
              z1d=getvar1d(cdfile,cdep,kpk,idep)
           ENDIF
 
-          ! Test name specified in the namelist (P.M.)
-          z1d=getvar1d(cdfile,cn_vdeptht,kpk,idep)
-          IF ( idep /= NF90_NOERR ) z1d=getvar1d(cdfile,cn_vdepthu,kpk,idep)
-          IF ( idep /= NF90_NOERR ) z1d=getvar1d(cdfile,cn_vdepthv,kpk,idep)
-          IF ( idep /= NF90_NOERR ) z1d=getvar1d(cdfile,cn_vdepthw,kpk,idep)
-          ! End (P.M.)
-
           IF ( .NOT. PRESENT(cdep) .OR. idep /= NF90_NOERR ) THEN  ! look for standard dep name
              DO jj = 1,jpdep
                 cldep=cldept(jj)

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