Changeset 673

Timestamp:

10/15/09 19:03:56 (6 weeks ago)

Author:

kgao

Message:

add ncdump tag -V

Location:

trunk/src/utils/ncdump

Files:

• ncdump.c (modified) (7 diffs)
• ncdump.h (modified) (1 diff)

trunk/src/utils/ncdump/ncdump.c

@@ -359 +359 @@
     vnode* vlist = 0;           /* list for vars specified with -v option */
     int ncmpi_status;           /* return from netcdf calls */
+    int NC_mode;
+    int NC_version;
 
     ncmpi_status = ncmpi_open(MPI_COMM_WORLD, path, NC_NOWRITE, MPI_INFO_NULL, &ncid);
@@ -364 +366 @@
         error("%s: %s", path, ncmpi_strerror(ncmpi_status));
     }
+
     /*
      * If any vars were specified with -v option, get list of associated
@@ -381 +384 @@
     }
 
+    ncmpi_inq_version(ncid, &NC_mode);
+    if (specp->version) {
+        if (NC_mode == 0x1000) 
+           Printf ("%s file format: CDF-5 (big variables)\n", specp->name);
+        else if (NC_mode == 0x0200) 
+              Printf ("%s file format: CDF-2 (large file)\n", specp->name);
+            else Printf ("%s file format: CDF-1\n", specp->name);
+    } else {
+
     Printf ("netcdf %s {\n", specp->name);
+
+    if (NC_mode == 0x1000) 
+       Printf ("// file format: CDF-5 (big variables)\n");
+    else if (NC_mode == 0x0200) 
+           Printf ("// file format: CDF-2 (large file)\n");
+         else Printf ("// file format: CDF-1\n");
     /*
      * get number of dimensions, number of variables, number of global
@@ -514 +532 @@
         }
     }
-    
     Printf ("}\n");
+    }
     NC_CHECK(
         ncmpi_close(ncid) );
@@ -631 +649 @@
           0,                    /* construct netcdf name from file name */
           false,                /* print header info only, no data? */
+          false,                /* print CDF version, no data, no header */
           false,                /* just print coord vars? */
           false,                /* brief  comments in data section? */
@@ -649 +668 @@
     set_formats(FLT_DIGITS, DBL_DIGITS); /* default for float, double data */
 
-    while ((c = getopt(argc, argv, "b:cf:hl:n:v:d:p:")) != EOF)
+    while ((c = getopt(argc, argv, "b:cf:hVl:n:v:d:p:")) != EOF)
       switch(c) {
         case 'h':               /* dump header only, no data */
           fspec.header_only = true;
+          break;
+        case 'V':               /* dump CDF version, no data, no header */
+          fspec.version = true;
           break;
         case 'c':               /* header, data only for coordinate dims */
@@ -720 +742 @@
     do {                
         if (!nameopt) fspec.name = (char *)0;
-        if (argc > 0)
+        if (argc > 0){
           do_ncdump(argv[i], &fspec);
+        }
     } while (++i < argc);
 

trunk/src/utils/ncdump/ncdump.h

@@ -52 +52 @@
     boolean header_only;        /* if true, don't print any variable data */
 
+    boolean version;           /* if true, print version*/
+
     boolean coord_vals;         /* if true, print header and coordinate
                                  * dimension values (values of variables