[cdftools] 151/228: JMM : fix details for rapid option in cdfmoc ( for time_counter correct 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 24244255e7955525da34d8734c93981a77c6a60a
Author: molines <molines at 1055176f-818a-41d9-83e1-73fbe5b947c5>
Date:   Wed May 9 06:33:43 2012 +0000

    JMM : fix details for rapid option in cdfmoc ( for time_counter correct attribute.)
    
    
    git-svn-id: http://servforge.legi.grenoble-inp.fr/svn/CDFTOOLS/trunk@599 1055176f-818a-41d9-83e1-73fbe5b947c5
---
 cdfmoc.f90 | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/cdfmoc.f90 b/cdfmoc.f90
index d7f97e9..7981227 100644
--- a/cdfmoc.f90
+++ b/cdfmoc.f90
@@ -681,6 +681,8 @@ CONTAINS
     REAL(KIND=8), DIMENSION (:),     ALLOCATABLE :: e1rapid            !
     REAL(KIND=4)            :: zmin, zmax, zbot, zalpha
     !!----------------------------------------------------------------------
+    npk    = getdim (cf_vfil,cn_z)
+    npt    = getdim (cf_vfil,cn_t)
     ! 1) look for integer indices corresponding to the section characteristics
     CALL cdf_findij ( rp_lonw_rapid,  rp_lone_rapid, rp_lat_rapid, rp_lat_rapid, &
        &              iiw          ,  iie          , ijrapid,      idum   ,      &
@@ -698,8 +700,6 @@ CONTAINS
     npiglo =  iie -iiw+1 ! size of the rapid section
     npigs  =  iigs-iiw+1 ! size of the rapid section
     !  1.1 ) read vertical slabs corresponding to ijrapid
-    npk    = getdim (cf_vfil,cn_z)
-    npt    = getdim (cf_vfil,cn_t)
     ALLOCATE ( vrapid(npiglo , npk), e3vrapid(npiglo, npk) )
     ALLOCATE ( zwk(npiglo, 1), e1rapid(npiglo) )
     ALLOCATE ( damocrapid(1,1,npk), gdepw(npk), e31d(npk)  )
@@ -769,13 +769,13 @@ CONTAINS
     stypvar(7)%clong_name     = 'Overturning contrib of Bottom Waters'
     stypvar(7)%cshort_name    = 'tr_BW'
 
-    ncout = create      ( cf_moc,  'none',    1, 1, npk, cdep=cn_vdepthw )
-    ierr  = createvar   ( ncout,   stypvar,   nvarout,   ipk, id_varout                                   )
-    ierr  = putheadervar( ncout,   cf_vfil,   1, 1, npk, pnavlon=rdumlon, pnavlat=rdumlat, pdep=gdepw)
+    ncout = create      ( cf_moc, 'none',  1, 1, npk, cdep=cn_vdepthw )
+    ierr  = createvar   ( ncout,  stypvar, nvarout,   ipk, id_varout                              )
+    ierr  = putheadervar( ncout,  cf_vfil, 1, 1, npk, pnavlon=rdumlon, pnavlat=rdumlat, pdep=gdepw)
 
     DO jt = 1, npt
       DO jk = 1 , npk
-         zwk(:,:) = getvar(cf_vfil,cn_vomecrty,jk,npiglo,1,kimin=iiw,kjmin=ijrapid, ktime = jt, ldiom=.TRUE.)
+         zwk(:,:) = getvar(cf_vfil,cn_vomecrty,jk,npiglo,1,kimin=iiw,kjmin=ijrapid, ktime = jt )
          vrapid(:,jk) = zwk(:,1)
       ENDDO
       ! 2) compute the amoc at 26.5 N, traditional way ( from top to bottom as in MOCHA)

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