Changeset 305 for IO_handling


Ignore:
Timestamp:
24/02/05 16:35:23 (15 years ago)
Author:
jkettleb
Message:

Added #define to allow stop pp header scan on hitting the first invalid pp header. This is needed to speed up the reading of fields files with 1000000 headers in them.

File:
1 edited

Legend:

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

    r304 r305  
    11diff -Naur cdat-4.0b3/libcdms/configure cdat-4.0b3-pp/libcdms/configure 
    22--- cdat-4.0b3/libcdms/configure        2004-06-28 18:07:49.000000000 +0100 
    3 +++ cdat-4.0b3-pp/libcdms/configure     2005-01-28 17:05:06.682907488 +0000 
     3+++ cdat-4.0b3-pp/libcdms/configure     2005-02-11 19:02:42.627374136 +0000 
    44@@ -18,6 +18,8 @@ 
    55 ac_help="$ac_help 
     
    568568diff -Naur cdat-4.0b3/libcdms/configure.in cdat-4.0b3-pp/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  2005-01-28 17:05:06.684907184 +0000 
     570+++ cdat-4.0b3-pp/libcdms/configure.in  2005-02-11 19:02:42.628373984 +0000 
    571571@@ -66,7 +66,26 @@ 
    572572 else 
     
    607607diff -Naur cdat-4.0b3/libcdms/include/cdunif.h cdat-4.0b3-pp/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      2005-01-28 17:05:06.685907032 +0000 
     609+++ cdat-4.0b3-pp/libcdms/include/cdunif.h      2005-02-11 19:02:42.630373680 +0000 
    610610@@ -90,7 +90,7 @@ 
    611611                                              * valid formats must begin at 0 and increase 
     
    619619diff -Naur cdat-4.0b3/libcdms/include/cdunifint.h cdat-4.0b3-pp/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   2005-01-28 17:05:06.687906728 +0000 
     621+++ cdat-4.0b3-pp/libcdms/include/cdunifint.h   2005-02-11 19:02:42.632373376 +0000 
    622622@@ -339,6 +339,16 @@ 
    623623 extern int cuopenread_stub_pop(const char* controlpath, const char* datapath); 
     
    639639diff -Naur cdat-4.0b3/libcdms/include/cdunifpp/cdunifpp_frename.h cdat-4.0b3-pp/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   2005-01-28 17:05:06.688906576 +0000 
     641+++ cdat-4.0b3-pp/libcdms/include/cdunifpp/cdunifpp_frename.h   2005-02-11 19:02:42.633373224 +0000 
    642642@@ -0,0 +1,68 @@ 
    643643+/* 
     
    711711diff -Naur cdat-4.0b3/libcdms/include/cdunifpp/cdunifpp.h cdat-4.0b3-pp/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   2005-01-28 17:22:22.437448864 +0000 
     713+++ cdat-4.0b3-pp/libcdms/include/cdunifpp/cdunifpp.h   2005-02-11 19:02:42.667368056 +0000 
    714714@@ -0,0 +1,818 @@ 
    715715+/* 
     
    15331533diff -Naur cdat-4.0b3/libcdms/include/cdunifpp/crayio.h cdat-4.0b3-pp/libcdms/include/cdunifpp/crayio.h 
    15341534--- cdat-4.0b3/libcdms/include/cdunifpp/crayio.h        1970-01-01 01:00:00.000000000 +0100 
    1535 +++ cdat-4.0b3-pp/libcdms/include/cdunifpp/crayio.h     2005-01-28 17:05:06.694905664 +0000 
     1535+++ cdat-4.0b3-pp/libcdms/include/cdunifpp/crayio.h     2005-02-11 19:02:42.685365320 +0000 
    15361536@@ -0,0 +1,396 @@ 
    15371537+#if !defined(COS_HDR) 
     
    19331933diff -Naur cdat-4.0b3/libcdms/include/cdunifpp/util.h cdat-4.0b3-pp/libcdms/include/cdunifpp/util.h 
    19341934--- cdat-4.0b3/libcdms/include/cdunifpp/util.h  1970-01-01 01:00:00.000000000 +0100 
    1935 +++ cdat-4.0b3-pp/libcdms/include/cdunifpp/util.h       2005-01-28 17:05:06.696905360 +0000 
     1935+++ cdat-4.0b3-pp/libcdms/include/cdunifpp/util.h       2005-02-11 19:02:42.700363040 +0000 
    19361936@@ -0,0 +1,251 @@ 
    19371937+#if !defined(UTIL_HDR) 
     
    21882188diff -Naur cdat-4.0b3/libcdms/include/cdunifpp/vardef.h cdat-4.0b3-pp/libcdms/include/cdunifpp/vardef.h 
    21892189--- cdat-4.0b3/libcdms/include/cdunifpp/vardef.h        1970-01-01 01:00:00.000000000 +0100 
    2190 +++ cdat-4.0b3-pp/libcdms/include/cdunifpp/vardef.h     2005-01-28 17:05:06.697905208 +0000 
     2190+++ cdat-4.0b3-pp/libcdms/include/cdunifpp/vardef.h     2005-02-11 19:02:42.702362736 +0000 
    21912191@@ -0,0 +1,67 @@ 
    21922192+#include "util.h" 
     
    22592259diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunif.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunif.c 
    22602260--- cdat-4.0b3/libcdms/src/cdunif/cdunif.c      2004-06-28 18:07:49.000000000 +0100 
    2261 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunif.c   2005-01-28 17:05:06.698905056 +0000 
     2261+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunif.c   2005-02-11 19:02:42.704362432 +0000 
    22622262@@ -289,6 +289,38 @@ 
    22632263        cuattname_stub, 
     
    23012301diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifint.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifint.c 
    23022302--- cdat-4.0b3/libcdms/src/cdunif/cdunifint.c   2004-06-28 18:07:49.000000000 +0100 
    2303 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifint.c        2005-01-28 17:05:06.700904752 +0000 
     2303+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifint.c        2005-02-11 19:02:42.708361824 +0000 
    23042304@@ -431,7 +431,17 @@ 
    23052305                fclose(fd); 
     
    23232323diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_attribute.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_attribute.c 
    23242324--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_attribute.c 1970-01-01 01:00:00.000000000 +0100 
    2325 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_attribute.c      2004-11-30 09:44:01.000000000 +0000 
     2325+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_attribute.c      2005-02-11 19:02:42.710361520 +0000 
    23262326@@ -0,0 +1,134 @@ 
    23272327+/* 
     
    24612461diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_axisvals.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_axisvals.c 
    24622462--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_axisvals.c  1970-01-01 01:00:00.000000000 +0100 
    2463 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_axisvals.c       2005-01-28 16:25:33.427697000 +0000 
     2463+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_axisvals.c       2005-02-11 19:02:42.712361216 +0000 
    24642464@@ -0,0 +1,348 @@ 
    24652465+/* 
     
    28132813diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp.c 
    28142814--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp.c   1970-01-01 01:00:00.000000000 +0100 
    2815 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp.c        2005-01-14 14:29:06.000000000 +0000 
     2815+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp.c        2005-02-11 19:02:42.713361064 +0000 
    28162816@@ -0,0 +1,143 @@ 
    28172817+/* 
     
    29602960diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_check.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_check.c 
    29612961--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_check.c     1970-01-01 01:00:00.000000000 +0100 
    2962 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_check.c  2004-11-30 09:44:01.000000000 +0000 
     2962+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_check.c  2005-02-11 19:02:42.722359696 +0000 
    29632963@@ -0,0 +1,31 @@ 
    29642964+/* 
     
    29952995diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_compare.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_compare.c 
    29962996--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_compare.c   1970-01-01 01:00:00.000000000 +0100 
    2997 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_compare.c        2005-01-28 16:13:24.062577000 +0000 
     2997+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_compare.c        2005-02-11 19:02:42.724359392 +0000 
    29982998@@ -0,0 +1,249 @@ 
    29992999+/* 
     
    32483248diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_data.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_data.c 
    32493249--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_data.c      1970-01-01 01:00:00.000000000 +0100 
    3250 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_data.c   2005-01-14 18:39:01.000000000 +0000 
     3250+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_data.c   2005-02-11 19:02:42.726359088 +0000 
    32513251@@ -0,0 +1,216 @@ 
    32523252+/* 
     
    34683468diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_debug.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_debug.c 
    34693469--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_debug.c     1970-01-01 01:00:00.000000000 +0100 
    3470 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_debug.c  2004-11-30 09:44:01.000000000 +0000 
     3470+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_debug.c  2005-02-11 19:02:42.728358784 +0000 
    34713471@@ -0,0 +1,209 @@ 
    34723472+/* 
     
    36813681diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_error.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_error.c 
    36823682--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_error.c     1970-01-01 01:00:00.000000000 +0100 
    3683 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_error.c  2005-01-14 17:21:56.000000000 +0000 
     3683+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_error.c  2005-02-11 19:02:42.729358632 +0000 
    36843684@@ -0,0 +1,53 @@ 
    36853685+/* 
     
    37383738diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_filetype.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_filetype.c 
    37393739--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_filetype.c  1970-01-01 01:00:00.000000000 +0100 
    3740 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_filetype.c       2004-11-30 09:44:01.000000000 +0000 
     3740+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_filetype.c       2005-02-11 19:02:42.731358328 +0000 
    37413741@@ -0,0 +1,226 @@ 
    37423742+/* 
     
    39683968diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_genaxis.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_genaxis.c 
    39693969--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_genaxis.c   1970-01-01 01:00:00.000000000 +0100 
    3970 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_genaxis.c        2005-01-28 16:31:40.654870000 +0000 
     3970+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_genaxis.c        2005-02-11 19:02:42.734357872 +0000 
    39713971@@ -0,0 +1,608 @@ 
    39723972+#ifdef HAVE_PP 
     
    45804580diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_linklist.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_linklist.c 
    45814581--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_linklist.c  1970-01-01 01:00:00.000000000 +0100 
    4582 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_linklist.c       2004-11-30 09:44:01.000000000 +0000 
     4582+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_linklist.c       2005-02-11 19:02:42.735357720 +0000 
    45834583@@ -0,0 +1,181 @@ 
    45844584+/* 
     
    47654765diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_malloc.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_malloc.c 
    47664766--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_malloc.c    1970-01-01 01:00:00.000000000 +0100 
    4767 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_malloc.c 2004-11-30 09:44:01.000000000 +0000 
     4767+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_malloc.c 2005-02-11 19:02:42.737357416 +0000 
    47684768@@ -0,0 +1,114 @@ 
    47694769+/* 
     
    48834883diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_ppcode.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_ppcode.c 
    48844884--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_ppcode.c    1970-01-01 01:00:00.000000000 +0100 
    4885 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_ppcode.c 2004-11-30 09:44:01.000000000 +0000 
     4885+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_ppcode.c 2005-02-11 19:02:42.758354224 +0000 
    48864886@@ -0,0 +1,1902 @@ 
    48874887+/* 
     
    67896789diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_process.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_process.c 
    67906790--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_process.c   1970-01-01 01:00:00.000000000 +0100 
    6791 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_process.c        2005-01-19 15:06:28.000000000 +0000 
     6791+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_process.c        2005-02-11 19:02:42.763353464 +0000 
    67926792@@ -0,0 +1,769 @@ 
    67936793+/* 
     
    75627562diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_read.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_read.c 
    75637563--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_read.c      1970-01-01 01:00:00.000000000 +0100 
    7564 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_read.c   2005-01-27 13:42:29.000000000 +0000 
    7565 @@ -0,0 +1,1023 @@ 
     7564+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_read.c   2005-02-11 19:03:09.616271200 +0000 
     7565@@ -0,0 +1,1032 @@ 
    75667566+/* 
    75677567+ * 
     
    75757575+#include "cdunifpp.h" 
    75767576+ 
     7577+#define BREAKATFIRSTINVALID 1 
    75777578+ 
    75787579+/*--------------------------------------------------------- 
     
    80068007+{ 
    80078008+  FILE *fh; 
    8008 +  int rec,nrec,recsize, filerec; 
     8009+  int rec, nrec, recsize, filerec, nlrec; 
    80098010+  void *hdr; 
    80108011+  PPfile *ppfile; 
     
    81138114+ 
    81148115+    for (filerec=0; filerec<nlookup2; filerec++) { 
     8116+      valid[filerec]=0; 
    81158117+      if(   fseek(fh, hdr_start + filerec * hdr_size + lbbegin_offset, SEEK_SET)   !=0) goto err; 
    81168118+      if(   pp_read_words(&lbbegin, 1,  convert_int, ppfile)   !=1) goto err; 
     
    81218123+       nrec++; 
    81228124+      } else { 
     8125+#ifdef BREAKATFIRSTINVALID 
     8126+        break; 
     8127+#endif 
    81238128+       valid[filerec]=0; 
    81248129+      } 
     
    81358140+ 
    81368141+    datapos = (start_data-1) * ppfile->wordsize; 
    8137 + 
    8138 +    for (filerec=0; filerec<nlookup2 ; filerec++) { 
     8142+#ifdef BREAKATFIRSTINVALID 
     8143+      nlrec=nrec; 
     8144+#else 
     8145+      nlrec=nlookup2; 
     8146+#endif 
     8147+    for (filerec=0; filerec<nlrec ; filerec++) { 
    81398148+      if (valid[filerec]) { 
    81408149+ 
     
    85898598diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_stash2pp.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_stash2pp.c 
    85908599--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_stash2pp.c  1970-01-01 01:00:00.000000000 +0100 
    8591 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_stash2pp.c       2004-11-30 09:44:01.000000000 +0000 
     8600+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_stash2pp.c       2005-02-11 19:02:42.777351336 +0000 
    85928601@@ -0,0 +1,1897 @@ 
    85938602+/* 
     
    1049010499diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_stashname.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_stashname.c 
    1049110500--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_stashname.c 1970-01-01 01:00:00.000000000 +0100 
    10492 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_stashname.c      2004-11-30 09:44:01.000000000 +0000 
     10501+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_stashname.c      2005-02-11 19:02:42.794348752 +0000 
    1049310502@@ -0,0 +1,1885 @@ 
    1049410503+/* 
     
    1237912388diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_struct.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_struct.c 
    1238012389--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_struct.c    1970-01-01 01:00:00.000000000 +0100 
    12381 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_struct.c 2004-11-30 09:44:01.000000000 +0000 
     12390+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_struct.c 2005-02-11 19:02:42.795348600 +0000 
    1238212391@@ -0,0 +1,83 @@ 
    1238312392+/* 
     
    1246612475diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_unwgdoswrap.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_unwgdoswrap.c 
    1246712476--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_unwgdoswrap.c       1970-01-01 01:00:00.000000000 +0100 
    12468 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_unwgdoswrap.c    2004-11-30 09:44:01.000000000 +0000 
     12477+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_unwgdoswrap.c    2005-02-11 19:02:42.796348448 +0000 
    1246912478@@ -0,0 +1,58 @@ 
    1247012479+/* 
     
    1252812537diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_varinfo.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_varinfo.c 
    1252912538--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_varinfo.c   1970-01-01 01:00:00.000000000 +0100 
    12530 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_varinfo.c        2005-01-14 14:28:26.000000000 +0000 
     12539+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_varinfo.c        2005-02-11 19:02:42.798348144 +0000 
    1253112540@@ -0,0 +1,260 @@ 
    1253212541+/* 
     
    1279212801diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/Makefile cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/Makefile 
    1279312802--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/Makefile     1970-01-01 01:00:00.000000000 +0100 
    12794 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/Makefile  2005-01-28 16:36:41.964064000 +0000 
     12803+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/Makefile  2005-02-11 19:02:42.799347992 +0000 
    1279512804@@ -0,0 +1,62 @@ 
    1279612805+# Generated automatically from Makefile.in by configure. 
     
    1285812867diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/Makefile.in cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/Makefile.in 
    1285912868--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/Makefile.in  1970-01-01 01:00:00.000000000 +0100 
    12860 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/Makefile.in       2005-01-10 14:39:58.000000000 +0000 
     12869+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/Makefile.in       2005-02-11 19:02:42.800347840 +0000 
    1286112870@@ -0,0 +1,61 @@ 
    1286212871+# makefile for cdunifpp 
     
    1292312932diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/unwgdos.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/unwgdos.c 
    1292412933--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/unwgdos.c    1970-01-01 01:00:00.000000000 +0100 
    12925 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/unwgdos.c 2004-11-30 09:44:01.000000000 +0000 
     12934+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/unwgdos.c 2005-02-11 19:02:42.803347384 +0000 
    1292612935@@ -0,0 +1,570 @@ 
    1292712936+ 
     
    1349713506diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/unwgdos_crayio.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/unwgdos_crayio.c 
    1349813507--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/unwgdos_crayio.c     1970-01-01 01:00:00.000000000 +0100 
    13499 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/unwgdos_crayio.c  2004-11-30 09:44:01.000000000 +0000 
     13508+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/unwgdos_crayio.c  2005-02-11 19:02:42.810346320 +0000 
    1350013509@@ -0,0 +1,2112 @@ 
    1350113510+#include <stdio.h> 
     
    1561315622diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifstub.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifstub.c 
    1561415623--- cdat-4.0b3/libcdms/src/cdunif/cdunifstub.c  2004-06-28 18:07:50.000000000 +0100 
    15615 +++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifstub.c       2005-01-28 17:05:06.785891832 +0000 
     15624+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifstub.c       2005-02-11 19:02:42.812346016 +0000 
    1561615625@@ -57,6 +57,10 @@ 
    1561715626        CuError(CU_EBADFORM,"POP I/O routines not available, file %s.",controlpath); 
     
    1562715636diff -Naur cdat-4.0b3/libcdms/src/cdunif/Makefile.in cdat-4.0b3-pp/libcdms/src/cdunif/Makefile.in 
    1562815637--- cdat-4.0b3/libcdms/src/cdunif/Makefile.in   2004-06-28 18:07:49.000000000 +0100 
    15629 +++ cdat-4.0b3-pp/libcdms/src/cdunif/Makefile.in        2005-01-28 17:05:06.787891528 +0000 
     15638+++ cdat-4.0b3-pp/libcdms/src/cdunif/Makefile.in        2005-02-11 19:02:42.813345864 +0000 
    1563015639@@ -48,7 +48,7 @@ 
    1563115640  
     
    1565515664diff -Naur cdat-4.0b3/libcdms/src/cdunif/test/Makefile.in cdat-4.0b3-pp/libcdms/src/cdunif/test/Makefile.in 
    1565615665--- cdat-4.0b3/libcdms/src/cdunif/test/Makefile.in      2004-06-28 18:07:50.000000000 +0100 
    15657 +++ cdat-4.0b3-pp/libcdms/src/cdunif/test/Makefile.in   2005-01-28 17:05:06.788891376 +0000 
     15666+++ cdat-4.0b3-pp/libcdms/src/cdunif/test/Makefile.in   2005-02-11 19:02:42.815345560 +0000 
    1565815667@@ -43,7 +43,7 @@ 
    1565915668  
     
    1569415703diff -Naur cdat-4.0b3/libcdms/src/cdunif/test/testpp.c cdat-4.0b3-pp/libcdms/src/cdunif/test/testpp.c 
    1569515704--- cdat-4.0b3/libcdms/src/cdunif/test/testpp.c 1970-01-01 01:00:00.000000000 +0100 
    15696 +++ cdat-4.0b3-pp/libcdms/src/cdunif/test/testpp.c      2005-01-28 17:05:06.790891072 +0000 
     15705+++ cdat-4.0b3-pp/libcdms/src/cdunif/test/testpp.c      2005-02-11 19:02:42.816345408 +0000 
    1569715706@@ -0,0 +1,113 @@ 
    1569815707+/* Test cdunif/PP: 
Note: See TracChangeset for help on using the changeset viewer.