[cdftools] 139/228: JMM + PM : fix proposed by PM when using namelist system.

[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 68fd027127ea872bc47560d9c3a9de18a985e8ae
Author: molines <molines at 1055176f-818a-41d9-83e1-73fbe5b947c5>
Date:   Thu Apr 5 17:22:43 2012 +0000

    JMM + PM : fix proposed by PM when using namelist system.
    
    
    git-svn-id: http://servforge.legi.grenoble-inp.fr/svn/CDFTOOLS/trunk@587 1055176f-818a-41d9-83e1-73fbe5b947c5
---
 cdfio.f90 | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/cdfio.f90 b/cdfio.f90
index 7d65a8b..95cc4ae 100644
--- a/cdfio.f90
+++ b/cdfio.f90
@@ -921,7 +921,7 @@ CONTAINS
     IF (PRESENT(kimin) ) THEN
        imin=kimin
 
-       ipiglo=getdim(cdfile,'x', ldexact=.true.)
+       ipiglo=getdim(cdfile, cn_x, ldexact=.true.)
        IF (imin+kpi-1 > ipiglo ) THEN 
          llperio=.true.
          imax=kpi+1 +imin -ipiglo
@@ -1579,8 +1579,6 @@ CONTAINS
     REAL(KIND=4), DIMENSION(:,:), ALLOCATABLE :: z2d
     REAL(KIND=4), DIMENSION(kpk)              :: z1d
     CHARACTER(LEN=256), DIMENSION(jpdep )     :: cldept= (/'deptht ','depthu ','depthv ','depthw ','nav_lev','z      '/)
-
-!   CHARACTER(LEN=256), DIMENSION(jpdep )     :: cldept=(/'deptht','depthu','depthv','depthw','nav_lev','z'/)
     CHARACTER(LEN=256)                        :: cldep
     !!----------------------------------------------------------------------
     ALLOCATE ( z2d (kpi,kpj) )
@@ -1610,6 +1608,13 @@ 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