[cdftools] 103/228: JMM+PM : generalize namelist process in cdfio ( ie no more nav_lon, nav_lat hard coded in cdfio fix a bug in cdfmoyt (missing initialisation of cf_in.

[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 ffa7377201acb52f583bf020352b5555b97192e8
Author: molines <molines at 1055176f-818a-41d9-83e1-73fbe5b947c5>
Date:   Mon Sep 19 16:07:45 2011 +0000

    JMM+PM : generalize namelist process in cdfio ( ie no more nav_lon, nav_lat hard coded in cdfio
             fix a bug in cdfmoyt (missing initialisation of cf_in.
    
    
    git-svn-id: http://servforge.legi.grenoble-inp.fr/svn/CDFTOOLS/trunk@550 1055176f-818a-41d9-83e1-73fbe5b947c5
---
 cdfio.f90   | 24 ++++++++++++------------
 cdfmoyt.f90 |  1 +
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/cdfio.f90 b/cdfio.f90
index 0e5f6b1..7d65a8b 100644
--- a/cdfio.f90
+++ b/cdfio.f90
@@ -204,8 +204,8 @@ CONTAINS
     CHARACTER(LEN=256)            :: cldep, cldepref, cldepvar
     !!----------------------------------------------------------------------
     istatus = NF90_CREATE(cdfile,cmode=or(NF90_CLOBBER,NF90_64BIT_OFFSET), ncid=icout)
-    istatus = NF90_DEF_DIM(icout, 'x', kx, nid_x)
-    istatus = NF90_DEF_DIM(icout, 'y', ky, nid_y)
+    istatus = NF90_DEF_DIM(icout, cn_x, kx, nid_x)
+    istatus = NF90_DEF_DIM(icout, cn_y, ky, nid_y)
 
     IF ( kz /= 0 ) THEN
        ! try to find out the name I will use for depth dimension in the new file ...
@@ -214,7 +214,7 @@ CONTAINS
           idum=getdim(cdfilref,cldep,cldepref)   ! look for depth dimension name in ref file
          IF (cldepref =='unknown' ) cldepref=cdep
        ELSE 
-          idum=getdim(cdfilref,'depth',cldep   )   ! look for depth dimension name in ref file
+          idum=getdim(cdfilref,cn_z,cldep   )   ! look for depth dimension name in ref file
           cldepref=cldep
        ENDIF
        cldepvar=cldep
@@ -225,7 +225,7 @@ CONTAINS
     ENDIF
 
 
-    istatus = NF90_DEF_DIM(icout,'time_counter',NF90_UNLIMITED, nid_t)
+    istatus = NF90_DEF_DIM(icout,cn_t,NF90_UNLIMITED, nid_t)
 
     invdim(1) = nid_x ; invdim(2) = nid_y ; invdim(3) = nid_z ; invdim(4) = nid_t
 
@@ -237,18 +237,18 @@ CONTAINS
     ENDIF
 
     ! define variables and copy attributes
-    istatus = NF90_DEF_VAR(icout,'nav_lon',NF90_FLOAT,(/nid_x, nid_y/), nid_lon)
-    istatus = copyatt('nav_lon', nid_lon,incid,icout)
-    istatus = NF90_DEF_VAR(icout,'nav_lat',NF90_FLOAT,(/nid_x, nid_y/), nid_lat)
-    istatus = copyatt('nav_lat', nid_lat,incid,icout)
+    istatus = NF90_DEF_VAR(icout,cn_vlon2d,NF90_FLOAT,(/nid_x, nid_y/), nid_lon)
+    istatus = copyatt(cn_vlon2d, nid_lon,incid,icout)
+    istatus = NF90_DEF_VAR(icout,cn_vlat2d,NF90_FLOAT,(/nid_x, nid_y/), nid_lat)
+    istatus = copyatt(cn_vlat2d, nid_lat,incid,icout)
     IF ( kz /= 0 ) THEN
        istatus = NF90_DEF_VAR(icout,TRIM(cldepvar),NF90_FLOAT,(/nid_z/), nid_dep)
        ! JMM bug fix : if cdep present, then chose attribute from cldepref
        istatus = copyatt(TRIM(cldepvar), nid_dep,incid,icout)
     ENDIF
 
-    istatus = NF90_DEF_VAR(icout,'time_counter',NF90_FLOAT,(/nid_t/), nid_tim)
-    istatus = copyatt('time_counter', nid_tim,incid,icout)
+    istatus = NF90_DEF_VAR(icout,cn_vtimec,NF90_FLOAT,(/nid_t/), nid_tim)
+    istatus = copyatt(cn_vtimec, nid_tim,incid,icout)
 
     istatus = NF90_CLOSE(incid)
 
@@ -1588,14 +1588,14 @@ CONTAINS
     IF (PRESENT(pnavlon) ) THEN 
        z2d = pnavlon
     ELSE
-       z2d=getvar(cdfile,'nav_lon', 1,kpi,kpj)
+       z2d=getvar(cdfile,cn_vlon2d, 1,kpi,kpj)
     ENDIF
     istatus = putvar(kout, nid_lon,z2d,1,kpi,kpj)
 
     IF (PRESENT(pnavlat) ) THEN
        z2d = pnavlat
     ELSE
-       z2d=getvar(cdfile,'nav_lat', 1,kpi,kpj)
+       z2d=getvar(cdfile,cn_vlat2d, 1,kpi,kpj)
     ENDIF
 
     istatus = putvar(kout, nid_lat,z2d,1,kpi,kpj)
diff --git a/cdfmoyt.f90 b/cdfmoyt.f90
index d47870c..36d94a7 100644
--- a/cdfmoyt.f90
+++ b/cdfmoyt.f90
@@ -132,6 +132,7 @@ PROGRAM cdfmoyt
 
   IF ( chkfile (cf_list(1)) ) STOP ! missing file
 
+  cf_in  = cf_list(1)
   npiglo = getdim (cf_in,cn_x)
   npjglo = getdim (cf_in,cn_y)
   npk    = getdim (cf_in,cn_z, cdtrue=cv_dep, kstatus=ierr)

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