Changeset 301 for IO_handling


Ignore:
Timestamp:
29/11/04 17:06:48 (15 years ago)
Author:
jkettleb
Message:

Added support for arbitary number of dimensions that are external to the record
in cdunifpp_data.c
The trap for possibly missing records based on counting the number of records of
a particular variable has been lost from cdunifpp_data. It needs to be reinstated
in cdunifpp_process.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • IO_handling/trunk/ppio/cdat-4.0b3-ppio_v0.3.patch

    r294 r301  
    1 diff -Naur cdat-4.0b3/libcdms/configure cdat-4.0b3-pp/libcdms/configure 
     1diff -Naur cdat-4.0b3/libcdms/configure cdat-4.0b3-work/libcdms/configure 
    22--- cdat-4.0b3/libcdms/configure        2004-06-28 18:07:49.000000000 +0100 
    3 +++ cdat-4.0b3-pp/libcdms/configure     2004-11-04 16:57:55.000000000 +0000 
     3+++ cdat-4.0b3-work/libcdms/configure   2004-11-29 16:51:16.964853048 +0000 
    44@@ -18,6 +18,8 @@ 
    55 ac_help="$ac_help 
     
    566566 EOF 
    567567 cat >> $CONFIG_STATUS <<\EOF 
    568 diff -Naur cdat-4.0b3/libcdms/configure.in cdat-4.0b3-pp/libcdms/configure.in 
     568diff -Naur cdat-4.0b3/libcdms/configure.in cdat-4.0b3-work/libcdms/configure.in 
    569569--- cdat-4.0b3/libcdms/configure.in     2004-06-28 18:07:49.000000000 +0100 
    570 +++ cdat-4.0b3-pp/libcdms/configure.in  2004-11-04 16:57:55.000000000 +0000 
     570+++ cdat-4.0b3-work/libcdms/configure.in        2004-11-29 16:51:16.964853048 +0000 
    571571@@ -66,7 +66,26 @@ 
    572572 else 
     
    605605   src/db_util/Makefile dnl 
    606606   src/api/Makefile dnl 
    607 diff -Naur cdat-4.0b3/libcdms/include/cdunif.h cdat-4.0b3-pp/libcdms/include/cdunif.h 
     607diff -Naur cdat-4.0b3/libcdms/include/cdunif.h cdat-4.0b3-work/libcdms/include/cdunif.h 
    608608--- cdat-4.0b3/libcdms/include/cdunif.h 2004-06-28 18:07:49.000000000 +0100 
    609 +++ cdat-4.0b3-pp/libcdms/include/cdunif.h      2004-11-04 16:57:55.000000000 +0000 
     609+++ cdat-4.0b3-work/libcdms/include/cdunif.h    2004-11-29 16:51:16.974851528 +0000 
    610610@@ -90,7 +90,7 @@ 
    611611                                              * valid formats must begin at 0 and increase 
     
    617617  
    618618 typedef struct { 
    619 diff -Naur cdat-4.0b3/libcdms/include/cdunifint.h cdat-4.0b3-pp/libcdms/include/cdunifint.h 
     619diff -Naur cdat-4.0b3/libcdms/include/cdunifint.h cdat-4.0b3-work/libcdms/include/cdunifint.h 
    620620--- cdat-4.0b3/libcdms/include/cdunifint.h      2004-06-28 18:07:49.000000000 +0100 
    621 +++ cdat-4.0b3-pp/libcdms/include/cdunifint.h   2004-11-04 16:57:55.000000000 +0000 
     621+++ cdat-4.0b3-work/libcdms/include/cdunifint.h 2004-11-29 16:51:16.972851832 +0000 
    622622@@ -339,6 +339,16 @@ 
    623623 extern int cuopenread_stub_pop(const char* controlpath, const char* datapath); 
     
    637637  
    638638 extern int cuLastDrsErr;                    /* Most recent DRS error number */ 
    639 diff -Naur cdat-4.0b3/libcdms/include/cdunifpp/cdunifpp_frename.h cdat-4.0b3-pp/libcdms/include/cdunifpp/cdunifpp_frename.h 
     639diff -Naur cdat-4.0b3/libcdms/include/cdunifpp/cdunifpp_frename.h cdat-4.0b3-work/libcdms/include/cdunifpp/cdunifpp_frename.h 
    640640--- cdat-4.0b3/libcdms/include/cdunifpp/cdunifpp_frename.h      1970-01-01 01:00:00.000000000 +0100 
    641 +++ cdat-4.0b3-pp/libcdms/include/cdunifpp/cdunifpp_frename.h   2004-11-10 10:17:47.000000000 +0000 
     641+++ cdat-4.0b3-work/libcdms/include/cdunifpp/cdunifpp_frename.h 2004-11-29 16:51:16.975851376 +0000 
    642642@@ -0,0 +1,68 @@ 
    643643+/* 
     
    709709+#define swap_bytes pp_unwgdos__swap_bytes 
    710710+#define swapbytes_ pp_unwgdos__swapbytes_ 
    711 diff -Naur cdat-4.0b3/libcdms/include/cdunifpp/cdunifpp.h cdat-4.0b3-pp/libcdms/include/cdunifpp/cdunifpp.h 
     711diff -Naur cdat-4.0b3/libcdms/include/cdunifpp/cdunifpp.h cdat-4.0b3-work/libcdms/include/cdunifpp/cdunifpp.h 
    712712--- cdat-4.0b3/libcdms/include/cdunifpp/cdunifpp.h      1970-01-01 01:00:00.000000000 +0100 
    713 +++ cdat-4.0b3-pp/libcdms/include/cdunifpp/cdunifpp.h   2004-11-10 10:17:47.000000000 +0000 
     713+++ cdat-4.0b3-work/libcdms/include/cdunifpp/cdunifpp.h 2004-11-29 16:51:16.975851376 +0000 
    714714@@ -0,0 +1,719 @@ 
    715715+/* 
     
    14321432+ 
    14331433+#define D(x) {printf("debug: %d\n",x);} 
    1434 diff -Naur cdat-4.0b3/libcdms/include/cdunifpp/crayio.h cdat-4.0b3-pp/libcdms/include/cdunifpp/crayio.h 
     1434diff -Naur cdat-4.0b3/libcdms/include/cdunifpp/crayio.h cdat-4.0b3-work/libcdms/include/cdunifpp/crayio.h 
    14351435--- cdat-4.0b3/libcdms/include/cdunifpp/crayio.h        1970-01-01 01:00:00.000000000 +0100 
    1436 +++ cdat-4.0b3-pp/libcdms/include/cdunifpp/crayio.h     2004-11-04 16:57:55.000000000 +0000 
     1436+++ cdat-4.0b3-work/libcdms/include/cdunifpp/crayio.h   2004-11-29 16:51:16.976851224 +0000 
    14371437@@ -0,0 +1,396 @@ 
    14381438+#if !defined(COS_HDR) 
     
    18321832+ 
    18331833+#endif 
    1834 diff -Naur cdat-4.0b3/libcdms/include/cdunifpp/util.h cdat-4.0b3-pp/libcdms/include/cdunifpp/util.h 
     1834diff -Naur cdat-4.0b3/libcdms/include/cdunifpp/util.h cdat-4.0b3-work/libcdms/include/cdunifpp/util.h 
    18351835--- cdat-4.0b3/libcdms/include/cdunifpp/util.h  1970-01-01 01:00:00.000000000 +0100 
    1836 +++ cdat-4.0b3-pp/libcdms/include/cdunifpp/util.h       2004-11-04 16:57:55.000000000 +0000 
     1836+++ cdat-4.0b3-work/libcdms/include/cdunifpp/util.h     2004-11-29 16:51:16.976851224 +0000 
    18371837@@ -0,0 +1,251 @@ 
    18381838+#if !defined(UTIL_HDR) 
     
    20872087+ 
    20882088+#endif 
    2089 diff -Naur cdat-4.0b3/libcdms/include/cdunifpp/vardef.h cdat-4.0b3-pp/libcdms/include/cdunifpp/vardef.h 
     2089diff -Naur cdat-4.0b3/libcdms/include/cdunifpp/vardef.h cdat-4.0b3-work/libcdms/include/cdunifpp/vardef.h 
    20902090--- cdat-4.0b3/libcdms/include/cdunifpp/vardef.h        1970-01-01 01:00:00.000000000 +0100 
    2091 +++ cdat-4.0b3-pp/libcdms/include/cdunifpp/vardef.h     2004-11-04 16:57:55.000000000 +0000 
     2091+++ cdat-4.0b3-work/libcdms/include/cdunifpp/vardef.h   2004-11-29 16:51:16.976851224 +0000 
    20922092@@ -0,0 +1,67 @@ 
    20932093+#include "util.h" 
     
    21582158+#define INTEGER int 
    21592159+#endif 
    2160 diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunif.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunif.c 
     2160diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunif.c cdat-4.0b3-work/libcdms/src/cdunif/cdunif.c 
    21612161--- cdat-4.0b3/libcdms/src/cdunif/cdunif.c      2004-06-28 18:07:49.000000000 +0100 
    2162 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunif.c   2004-11-04 16:57:55.000000000 +0000 
     2162+++ cdat-4.0b3-work/libcdms/src/cdunif/cdunif.c 2004-11-29 16:51:16.939856848 +0000 
    21632163@@ -289,6 +289,38 @@ 
    21642164        cuattname_stub, 
     
    22002200 }; 
    22012201  
    2202 diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifint.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifint.c 
     2202diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifint.c cdat-4.0b3-work/libcdms/src/cdunif/cdunifint.c 
    22032203--- cdat-4.0b3/libcdms/src/cdunif/cdunifint.c   2004-06-28 18:07:49.000000000 +0100 
    2204 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifint.c        2004-11-04 16:57:55.000000000 +0000 
     2204+++ cdat-4.0b3-work/libcdms/src/cdunif/cdunifint.c      2004-11-29 16:51:16.937857152 +0000 
    22052205@@ -431,7 +431,17 @@ 
    22062206                fclose(fd); 
     
    22222222   error: 
    22232223        if(feof(fd)) 
    2224 diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_attribute.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_attribute.c 
     2224diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_attribute.c cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_attribute.c 
    22252225--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_attribute.c 1970-01-01 01:00:00.000000000 +0100 
    2226 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_attribute.c      2004-11-09 17:01:47.000000000 +0000 
     2226+++ cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_attribute.c    2004-11-29 16:51:16.946855784 +0000 
    22272227@@ -0,0 +1,134 @@ 
    22282228+/* 
     
    23602360+} 
    23612361+#endif 
    2362 diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_axisvals.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_axisvals.c 
     2362diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_axisvals.c cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_axisvals.c 
    23632363--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_axisvals.c  1970-01-01 01:00:00.000000000 +0100 
    2364 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_axisvals.c       2004-11-09 17:01:47.000000000 +0000 
     2364+++ cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_axisvals.c     2004-11-29 16:51:16.941856544 +0000 
    23652365@@ -0,0 +1,327 @@ 
    23662366+/* 
     
    26912691+ 
    26922692+#endif 
    2693 diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp.c 
     2693diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp.c cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp.c 
    26942694--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp.c   1970-01-01 01:00:00.000000000 +0100 
    2695 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp.c        2004-11-09 17:01:47.000000000 +0000 
     2695+++ cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp.c      2004-11-29 16:51:16.946855784 +0000 
    26962696@@ -0,0 +1,143 @@ 
    26972697+/* 
     
    28382838+ 
    28392839+#endif 
    2840 diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_check.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_check.c 
     2840diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_check.c cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_check.c 
    28412841--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_check.c     1970-01-01 01:00:00.000000000 +0100 
    2842 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_check.c  2004-11-09 17:01:47.000000000 +0000 
     2842+++ cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_check.c        2004-11-29 16:51:16.945855936 +0000 
    28432843@@ -0,0 +1,31 @@ 
    28442844+/* 
     
    28732873+ 
    28742874+#endif 
    2875 diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_compare.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_compare.c 
     2875diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_compare.c cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_compare.c 
    28762876--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_compare.c   1970-01-01 01:00:00.000000000 +0100 
    2877 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_compare.c        2004-11-09 17:01:47.000000000 +0000 
     2877+++ cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_compare.c      2004-11-29 16:51:16.941856544 +0000 
    28782878@@ -0,0 +1,225 @@ 
    28792879+/* 
     
    31023102+ 
    31033103+#endif 
    3104 diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_data.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_data.c 
     3104diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_data.c cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_data.c 
    31053105--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_data.c      1970-01-01 01:00:00.000000000 +0100 
    3106 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_data.c   2004-11-10 15:32:23.000000000 +0000 
    3107 @@ -0,0 +1,185 @@ 
     3106+++ cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_data.c 2004-11-29 16:53:18.511375168 +0000 
     3107@@ -0,0 +1,215 @@ 
    31083108+/* 
    31093109+ * 
     
    31273127+ * okay, maybe no more than 2d, but n-dimensional problem is not particularly more difficult) 
    31283128+ * 
    3129 + * pp_data_read currently handles just the 4d case; if n-dimensional was ever required, then  
    3130 + * still need to treat the fastest varying two dimensions (longitude, latitude) as a 
    3131 + * special case (a pp record), but instead of hard-code looping over height and time could 
    3132 + * treat the higher dimensions using the N-dim code. 
     3129+ * pp_data_read handles general n-dimensional case in a similar way 
     3130+ * 
    31333131+ */ 
    31343132 
     
    32163214+} 
    32173215+ 
    3218 + 
    32193216+int pp_data_read(const CuFile *file, const CuVar *var, const long start[], const long count[], void *values) 
    32203217+{ 
     
    32233220+  const PPvar *ppvar; 
    32243221+  int startrec, endrec, nrec, recno; 
    3225 +  int nx,ny,nz,nt,cx,cy,cz,ct,sx,sy,sz,st,iy,iz,it; 
     3222+  int cx,cy,sx,sy,iy; 
    32263223+  const void *src; 
    32273224+  void *data, *ptr, *dest; 
    3228 + 
    3229 +  /* shouldn't have got this far unless variable is 4d */ 
    3230 +  if (var->ndims != 4) goto err; 
    3231 + 
     3225+  int nx,ny, ndim; 
     3226+  int idim; 
     3227+  int *indices, *size; 
     3228+  int carryout; 
     3229+  int destoffset; 
     3230+ 
     3231+  ndim=var->ndims; 
     3232+ 
     3233+  if (ndim < 2) goto err; 
     3234+     
    32323235+  ppfile = file->internp; 
    32333236+  ppvar = var->internp; 
     
    32383241+  nrec = endrec - startrec + 1; 
    32393242+ 
    3240 +  nx = file->dims[var->dims[3]].len; 
    3241 +  ny = file->dims[var->dims[2]].len; 
    3242 +  nz = file->dims[var->dims[1]].len; 
    3243 +  nt = file->dims[var->dims[0]].len; 
    3244 + 
    3245 +  cx = count[3]; 
    3246 +  cy = count[2]; 
    3247 +  cz = count[1]; 
    3248 +  ct = count[0]; 
    3249 + 
    3250 +  sx = start[3]; 
    3251 +  sy = start[2]; 
    3252 +  sz = start[1]; 
    3253 +  st = start[0]; 
    3254 + 
    3255 +  if (sx<0 || sy<0 || sz<0 || st<0 || cx<0 || cy<0 || cz<0 || ct<0 || sx+cx>nx || sy+cy>ny || sz+cz>nz || st+ct>nt) 
    3256 +    return CU_EINVALCOORDS;     
    3257 + 
    3258 +  if (nrec != nz * nt) { 
    3259 +    CuError(CU_EINVALCOORDS,"refusing to read variable which has missing combinations of z,t"); 
    3260 +    return CU_EINVALCOORDS; 
     3243+  if((   size=pp_malloc(ndim*sizeof(int),heaplist)   )==NULL) goto err; 
     3244+  /* last two items in indices aren't actually used but define for completeness */ 
     3245+  if((   indices=pp_malloc(ndim*sizeof(int),heaplist)   )==NULL) goto err; 
     3246+ 
     3247+  for (idim=0; idim<ndim; idim++) { 
     3248+    size[idim] = file->dims[var->dims[idim]].len; 
     3249+    indices[idim]=0; 
     3250+ 
     3251+    if (start[idim]<0 || count[idim]<0 || start[idim]+count[idim]>size[idim]) 
     3252+      return CU_EINVALCOORDS;     
     3253+ 
    32613254+  } 
     3255+ 
     3256+  /* some constants for use later */ 
     3257+  nx=size[ndim-1]; 
     3258+  ny=size[ndim-2]; 
     3259+  cx=count[ndim-1]; 
     3260+  cy=count[ndim-2]; 
     3261+  sx=start[ndim-1]; 
     3262+  sy=start[ndim-2]; 
    32623263 
     3264+  /* 
     3265+   * JAK this needs moving to pp_process 
     3266+   *  if (nrec != nz * nt) { 
     3267+   * CuError(CU_EINVALCOORDS,"refusing to read variable which has missing combinations of z,t"); 
     3268+   * return CU_EINVALCOORDS; 
     3269+   *} 
     3270+  */  
    32633271+  /* we can now assume that the records loop over correct times and levels 
    32643272+   * (loop over time is the more slowly varying dimension because that's 
     
    32663274+   */ 
    32673275+ 
    3268 +  for (it=0; it<ct; it++) { 
    3269 +    for (iz=0; iz<cz; iz++) { 
    3270 +      recno = startrec + (st+it)*nz + (sz+iz); 
    3271 +      ptr = (char*) values + (it*cz + iz) * cy * cx * wordsize; 
     3276+  carryout=0; 
     3277+  while (!carryout) { 
     3278+ 
     3279+    recno=0; 
     3280+    destoffset=0;  
     3281+ 
     3282+    for (idim=0; idim < ndim-2 ; idim++) { /* treat inner 2 dim as record dims */ 
     3283+      recno *= size[idim]; 
     3284+      destoffset *= count[idim]; 
     3285+ 
     3286+      recno += indices[idim]+start[idim]; 
     3287+      destoffset += indices[idim]; 
    32723288+       
    3273 +      if((   data=pp_read_data_record(ppfile->recs[recno],ppfile,heaplist)   )==NULL) goto err; 
    3274 +       
    3275 +      for (iy=0; iy<cy; iy++) { 
    3276 +        
    3277 +       src = (char*) data + ((sy+iy)*nx + sx) * wordsize; 
    3278 +       dest = (char*) ptr + (iy*cx) * wordsize;         
    3279 +       memcpy(dest,src,cx*wordsize); 
    3280 +      } 
    3281 +      pp_free(data,heaplist); 
    32823289+    } 
     3290+ 
     3291+    recno=startrec+recno; 
     3292+    ptr=(char*)values+destoffset*wordsize*cx*cy; 
     3293+ 
     3294+    if((   data=pp_read_data_record(ppfile->recs[recno],ppfile,heaplist)   )==NULL) goto err; 
     3295+     
     3296+    for (iy=0; iy<cy; iy++) { 
     3297+      src = (char*) data + ((sy+iy)*nx + sx) * wordsize; 
     3298+      dest = (char*) ptr + (iy*cx) * wordsize;  
     3299+      memcpy(dest,src,cx*wordsize); 
     3300+    } 
     3301+ 
     3302+    pp_free(data,heaplist); 
     3303+    /* increment indices */ 
     3304+    for (idim=ndim-2-1 ; idim>=0; idim--) { 
     3305+      indices[idim]++; 
     3306+      if (indices[idim]==count[idim]) 
     3307+       indices[idim]=0; /* carry, so keep looping */ 
     3308+      else 
     3309+       break; /* no internal carry */ 
     3310+    } 
     3311+    if (idim<0) 
     3312+      carryout=1; 
    32833313+  } 
    32843314 
     
    32913321+ 
    32923322+#endif 
    3293 diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_debug.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_debug.c 
     3323diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_debug.c cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_debug.c 
    32943324--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_debug.c     1970-01-01 01:00:00.000000000 +0100 
    3295 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_debug.c  2004-11-09 17:01:47.000000000 +0000 
     3325+++ cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_debug.c        2004-11-29 16:51:16.946855784 +0000 
    32963326@@ -0,0 +1,209 @@ 
    32973327+/* 
     
    35043534+ 
    35053535+#endif 
    3506 diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_error.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_error.c 
     3536diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_error.c cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_error.c 
    35073537--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_error.c     1970-01-01 01:00:00.000000000 +0100 
    3508 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_error.c  2004-11-09 17:01:47.000000000 +0000 
     3538+++ cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_error.c        2004-11-29 16:51:16.948855480 +0000 
    35093539@@ -0,0 +1,44 @@ 
    35103540+/* 
     
    35523582+ 
    35533583+#endif 
    3554 diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_filetype.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_filetype.c 
     3584diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_filetype.c cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_filetype.c 
    35553585--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_filetype.c  1970-01-01 01:00:00.000000000 +0100 
    3556 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_filetype.c       2004-11-09 17:01:47.000000000 +0000 
     3586+++ cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_filetype.c     2004-11-29 16:51:16.946855784 +0000 
    35573587@@ -0,0 +1,226 @@ 
    35583588+/* 
     
    37823812+ 
    37833813+#endif 
    3784 diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_linklist.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_linklist.c 
     3814diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_linklist.c cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_linklist.c 
    37853815--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_linklist.c  1970-01-01 01:00:00.000000000 +0100 
    3786 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_linklist.c       2004-11-09 17:01:47.000000000 +0000 
     3816+++ cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_linklist.c     2004-11-29 16:51:16.949855328 +0000 
    37873817@@ -0,0 +1,181 @@ 
    37883818+/* 
     
    39673997+ 
    39683998+#endif 
    3969 diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_malloc.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_malloc.c 
     3999diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_malloc.c cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_malloc.c 
    39704000--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_malloc.c    1970-01-01 01:00:00.000000000 +0100 
    3971 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_malloc.c 2004-11-09 17:01:47.000000000 +0000 
     4001+++ cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_malloc.c       2004-11-29 16:51:16.941856544 +0000 
    39724002@@ -0,0 +1,114 @@ 
    39734003+/* 
     
    40854115+ 
    40864116+#endif 
    4087 diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_ppcode.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_ppcode.c 
     4117diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_ppcode.c cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_ppcode.c 
    40884118--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_ppcode.c    1970-01-01 01:00:00.000000000 +0100 
    4089 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_ppcode.c 2004-11-09 17:01:47.000000000 +0000 
     4119+++ cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_ppcode.c       2004-11-29 16:51:16.940856696 +0000 
    40904120@@ -0,0 +1,1902 @@ 
    40914121+/* 
     
    59916021+ 
    59926022+#endif 
    5993 diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_process.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_process.c 
     6023diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_process.c cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_process.c 
    59946024--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_process.c   1970-01-01 01:00:00.000000000 +0100 
    5995 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_process.c        2004-11-09 17:01:47.000000000 +0000 
     6025+++ cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_process.c      2004-11-29 16:51:16.947855632 +0000 
    59966026@@ -0,0 +1,932 @@ 
    59976027+/* 
     
    69276957+ 
    69286958+#endif 
    6929 diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_read.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_read.c 
     6959diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_read.c cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_read.c 
    69306960--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_read.c      1970-01-01 01:00:00.000000000 +0100 
    6931 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_read.c   2004-11-09 17:01:47.000000000 +0000 
     6961+++ cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_read.c 2004-11-29 16:51:16.948855480 +0000 
    69326962@@ -0,0 +1,912 @@ 
    69336963+/* 
     
    78437873+ 
    78447874+#endif 
    7845 diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_stash2pp.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_stash2pp.c 
     7875diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_stash2pp.c cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_stash2pp.c 
    78467876--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_stash2pp.c  1970-01-01 01:00:00.000000000 +0100 
    7847 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_stash2pp.c       2004-11-09 17:01:47.000000000 +0000 
     7877+++ cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_stash2pp.c     2004-11-29 16:51:16.945855936 +0000 
    78487878@@ -0,0 +1,1897 @@ 
    78497879+/* 
     
    97449774+ 
    97459775+#endif 
    9746 diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_stashname.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_stashname.c 
     9776diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_stashname.c cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_stashname.c 
    97479777--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_stashname.c 1970-01-01 01:00:00.000000000 +0100 
    9748 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_stashname.c      2004-11-09 17:01:47.000000000 +0000 
     9778+++ cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_stashname.c    2004-11-29 16:51:16.944856088 +0000 
    97499779@@ -0,0 +1,1885 @@ 
    97509780+/* 
     
    1163311663+ 
    1163411664+#endif 
    11635 diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_struct.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_struct.c 
     11665diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_struct.c cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_struct.c 
    1163611666--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_struct.c    1970-01-01 01:00:00.000000000 +0100 
    11637 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_struct.c 2004-11-09 17:01:47.000000000 +0000 
     11667+++ cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_struct.c       2004-11-29 16:51:16.947855632 +0000 
    1163811668@@ -0,0 +1,83 @@ 
    1163911669+/* 
     
    1172011750+ 
    1172111751+#endif 
    11722 diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_unwgdoswrap.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_unwgdoswrap.c 
     11752diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_unwgdoswrap.c cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_unwgdoswrap.c 
    1172311753--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_unwgdoswrap.c       1970-01-01 01:00:00.000000000 +0100 
    11724 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_unwgdoswrap.c    2004-11-09 17:01:47.000000000 +0000 
     11754+++ cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_unwgdoswrap.c  2004-11-29 16:51:16.948855480 +0000 
    1172511755@@ -0,0 +1,58 @@ 
    1172611756+/* 
     
    1178211812+ 
    1178311813+#endif 
    11784 diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_varinfo.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_varinfo.c 
     11814diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_varinfo.c cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_varinfo.c 
    1178511815--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_varinfo.c   1970-01-01 01:00:00.000000000 +0100 
    11786 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_varinfo.c        2004-11-09 17:01:47.000000000 +0000 
     11816+++ cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_varinfo.c      2004-11-29 16:51:16.944856088 +0000 
    1178711817@@ -0,0 +1,260 @@ 
    1178811818+/* 
     
    1204612076+ 
    1204712077+#endif 
    12048 diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/Makefile cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/Makefile 
     12078diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/Makefile cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/Makefile 
    1204912079--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/Makefile     1970-01-01 01:00:00.000000000 +0100 
    12050 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/Makefile  2004-11-05 18:34:37.000000000 +0000 
     12080+++ cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/Makefile        2004-11-29 16:51:16.939856848 +0000 
    1205112081@@ -0,0 +1,61 @@ 
    1205212082+# Generated automatically from Makefile.in by configure. 
     
    1211112141+       $(CC) $(CFLAGS) $(EXTRAHDR) -c $< 
    1211212142+ 
    12113 diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/Makefile.in cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/Makefile.in 
     12143diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/Makefile.in cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/Makefile.in 
    1211412144--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/Makefile.in  1970-01-01 01:00:00.000000000 +0100 
    12115 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/Makefile.in       2004-11-04 16:57:55.000000000 +0000 
     12145+++ cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/Makefile.in     2004-11-29 16:51:16.945855936 +0000 
    1211612146@@ -0,0 +1,60 @@ 
    1211712147+# makefile for cdunifpp 
     
    1217512205+       $(CC) $(CFLAGS) $(EXTRAHDR) -c $< 
    1217612206+ 
    12177 diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/unwgdos.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/unwgdos.c 
     12207diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/unwgdos.c cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/unwgdos.c 
    1217812208--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/unwgdos.c    1970-01-01 01:00:00.000000000 +0100 
    12179 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/unwgdos.c 2004-11-10 10:16:30.000000000 +0000 
     12209+++ cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/unwgdos.c       2004-11-29 16:51:16.942856392 +0000 
    1218012210@@ -0,0 +1,570 @@ 
    1218112211+ 
     
    1274912779+} 
    1275012780+#endif 
    12751 diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/unwgdos_crayio.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/unwgdos_crayio.c 
     12781diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/unwgdos_crayio.c cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/unwgdos_crayio.c 
    1275212782--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/unwgdos_crayio.c     1970-01-01 01:00:00.000000000 +0100 
    12753 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/unwgdos_crayio.c  2004-11-10 10:16:49.000000000 +0000 
     12783+++ cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/unwgdos_crayio.c        2004-11-29 16:51:16.942856392 +0000 
    1275412784@@ -0,0 +1,2112 @@ 
    1275512785+#include <stdio.h> 
     
    1486514895+} 
    1486614896+#endif 
    14867 diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifstub.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifstub.c 
     14897diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifstub.c cdat-4.0b3-work/libcdms/src/cdunif/cdunifstub.c 
    1486814898--- cdat-4.0b3/libcdms/src/cdunif/cdunifstub.c  2004-06-28 18:07:50.000000000 +0100 
    14869 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifstub.c       2004-11-04 16:57:55.000000000 +0000 
     14899+++ cdat-4.0b3-work/libcdms/src/cdunif/cdunifstub.c     2004-11-29 16:51:16.924859128 +0000 
    1487014900@@ -57,6 +57,10 @@ 
    1487114901        CuError(CU_EBADFORM,"POP I/O routines not available, file %s.",controlpath); 
     
    1487914909        CuError(CU_EBADFORM,"Stub called, file %s",file->controlpath); 
    1488014910        return -1; 
    14881 diff -Naur cdat-4.0b3/libcdms/src/cdunif/Makefile.in cdat-4.0b3-pp/libcdms/src/cdunif/Makefile.in 
     14911diff -Naur cdat-4.0b3/libcdms/src/cdunif/Makefile.in cdat-4.0b3-work/libcdms/src/cdunif/Makefile.in 
    1488214912--- cdat-4.0b3/libcdms/src/cdunif/Makefile.in   2004-06-28 18:07:49.000000000 +0100 
    14883 +++ cdat-4.0b3-pp/libcdms/src/cdunif/Makefile.in        2004-11-04 16:57:55.000000000 +0000 
     14913+++ cdat-4.0b3-work/libcdms/src/cdunif/Makefile.in      2004-11-29 16:51:16.925858976 +0000 
    1488414914@@ -48,7 +48,7 @@ 
    1488514915  
     
    1490714937 distclean: clean 
    1490814938  
    14909 diff -Naur cdat-4.0b3/libcdms/src/cdunif/test/Makefile.in cdat-4.0b3-pp/libcdms/src/cdunif/test/Makefile.in 
     14939diff -Naur cdat-4.0b3/libcdms/src/cdunif/test/Makefile.in cdat-4.0b3-work/libcdms/src/cdunif/test/Makefile.in 
    1491014940--- cdat-4.0b3/libcdms/src/cdunif/test/Makefile.in      2004-06-28 18:07:50.000000000 +0100 
    14911 +++ cdat-4.0b3-pp/libcdms/src/cdunif/test/Makefile.in   2004-11-04 16:57:55.000000000 +0000 
     14941+++ cdat-4.0b3-work/libcdms/src/cdunif/test/Makefile.in 2004-11-29 16:51:16.898863080 +0000 
    1491214942@@ -43,7 +43,7 @@ 
    1491314943  
     
    1494614976+       -rm -f cdfile cudump cuget testnc testgrib testdrs testslab testpp 
    1494714977+ 
    14948 diff -Naur cdat-4.0b3/libcdms/src/cdunif/test/testpp.c cdat-4.0b3-pp/libcdms/src/cdunif/test/testpp.c 
     14978diff -Naur cdat-4.0b3/libcdms/src/cdunif/test/testpp.c cdat-4.0b3-work/libcdms/src/cdunif/test/testpp.c 
    1494914979--- cdat-4.0b3/libcdms/src/cdunif/test/testpp.c 1970-01-01 01:00:00.000000000 +0100 
    14950 +++ cdat-4.0b3-pp/libcdms/src/cdunif/test/testpp.c      2004-11-04 16:57:55.000000000 +0000 
     14980+++ cdat-4.0b3-work/libcdms/src/cdunif/test/testpp.c    2004-11-29 16:51:16.897863232 +0000 
    1495114981@@ -0,0 +1,113 @@ 
    1495214982+/* Test cdunif/PP: 
Note: See TracChangeset for help on using the changeset viewer.