Changeset 290


Ignore:
Timestamp:
09/11/04 17:04:30 (15 years ago)
Author:
jkettleb
Message:

Incorporates modeltime.patch and cell-patch
Also adds checks for grids that cannot be accepted and flags with cdunif errors

File:
1 edited

Legend:

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

    r283 r290  
    1 diff -r -u -N cdat-4.0b3/libcdms/configure cdat-4.0b3-ppio/libcdms/configure 
     1diff -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-ppio/libcdms/configure   2004-08-05 14:35:49.290205896 +0100 
     3+++ cdat-4.0b3-pp/libcdms/configure     2004-11-04 16:57:55.000000000 +0000 
    44@@ -18,6 +18,8 @@ 
    55 ac_help="$ac_help 
     
    566566 EOF 
    567567 cat >> $CONFIG_STATUS <<\EOF 
    568 diff -r -u -N cdat-4.0b3/libcdms/configure.in cdat-4.0b3-ppio/libcdms/configure.in 
     568diff -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-ppio/libcdms/configure.in        2004-08-05 14:35:49.291205744 +0100 
     570+++ cdat-4.0b3-pp/libcdms/configure.in  2004-11-04 16:57:55.000000000 +0000 
    571571@@ -66,7 +66,26 @@ 
    572572 else 
     
    605605   src/db_util/Makefile dnl 
    606606   src/api/Makefile dnl 
    607 diff -r -u -N cdat-4.0b3/libcdms/include/cdunif.h cdat-4.0b3-ppio/libcdms/include/cdunif.h 
     607diff -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-ppio/libcdms/include/cdunif.h    2004-08-05 14:35:49.292205592 +0100 
     609+++ cdat-4.0b3-pp/libcdms/include/cdunif.h      2004-11-04 16:57:55.000000000 +0000 
    610610@@ -90,7 +90,7 @@ 
    611611                                              * valid formats must begin at 0 and increase 
     
    617617  
    618618 typedef struct { 
    619 diff -r -u -N cdat-4.0b3/libcdms/include/cdunifint.h cdat-4.0b3-ppio/libcdms/include/cdunifint.h 
     619diff -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-ppio/libcdms/include/cdunifint.h 2004-08-05 14:35:49.293205440 +0100 
     621+++ cdat-4.0b3-pp/libcdms/include/cdunifint.h   2004-11-04 16:57:55.000000000 +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 -r -u -N cdat-4.0b3/libcdms/include/cdunifpp/cdunifpp_frename.h cdat-4.0b3-ppio/libcdms/include/cdunifpp/cdunifpp_frename.h 
     639diff -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-ppio/libcdms/include/cdunifpp/cdunifpp_frename.h 2004-08-05 14:35:49.294205288 +0100 
     641+++ cdat-4.0b3-pp/libcdms/include/cdunifpp/cdunifpp_frename.h   2004-11-04 16:57:55.000000000 +0000 
    642642@@ -0,0 +1,60 @@ 
    643643+/* including this header file will rename all the functions in the library 
     
    701701+#define swap_bytes pp_unwgdos__swap_bytes 
    702702+#define swapbytes_ pp_unwgdos__swapbytes_ 
    703 diff -r -u -N cdat-4.0b3/libcdms/include/cdunifpp/cdunifpp.h cdat-4.0b3-ppio/libcdms/include/cdunifpp/cdunifpp.h 
     703diff -Naur cdat-4.0b3/libcdms/include/cdunifpp/cdunifpp.h cdat-4.0b3-pp/libcdms/include/cdunifpp/cdunifpp.h 
    704704--- cdat-4.0b3/libcdms/include/cdunifpp/cdunifpp.h      1970-01-01 01:00:00.000000000 +0100 
    705 +++ cdat-4.0b3-ppio/libcdms/include/cdunifpp/cdunifpp.h 2004-08-05 14:35:49.297204832 +0100 
    706 @@ -0,0 +1,698 @@ 
     705+++ cdat-4.0b3-pp/libcdms/include/cdunifpp/cdunifpp.h   2004-11-04 17:11:44.000000000 +0000 
     706@@ -0,0 +1,711 @@ 
    707707+/* Header file for stuff used internally by cdunif_pp */ 
    708708+ 
     
    824824+typedef enum pp_axistype PPaxistype; 
    825825+typedef enum pp_lev_val_type PPlevvaltype; 
     826+typedef enum pp_calendartype PPcalendartype; 
     827+ 
     828+enum pp_calendartype { 
     829+  gregorian,  
     830+  cal360day, 
     831+  model 
     832+}; 
    826833+ 
    827834+enum pp_filetype { 
     
    12931300+PPdata *pp_taxis_to_boundary_values(const PPtaxis *, PPlist *); 
    12941301+int pp_is_time_mean(Fint); 
    1295 +int pp_is_360day_calendar(Fint); 
    12961302+Freal pp_time_diff(Fint, const PPdate *, const PPdate *); 
     1303+PPcalendartype pp_calendar_type(Fint); 
    12971304+long long pp_gregorian_to_secs(const PPdate *); 
    12981305+char *pp_t_units(const PPtaxis *, PPlist *); 
     
    13941401+int pp_get_var_packing(const PPhdr *); 
    13951402+int pp_get_var_compression(const PPhdr *); 
     1403+int pp_get_var_processing(const PPhdr *hdr); 
     1404+int pp_get_var_gridcode(const PPhdr *hdr); 
    13961405+int pp_get_var_name(int varid, const char *, CuVar *) ; 
    13971406+void *pp_get_var_fill_value(const PPhdr *); 
    13981407+int pp_var_is_land_mask(const PPhdr *); 
    13991408+CuType pp_get_var_type(const PPhdr *); 
     1409+int pp_var_is_time_mean(const PPhdr *hdr); 
     1410+int pp_var_is_time_min(const PPhdr *hdr); 
     1411+int pp_var_is_time_max(const PPhdr *hdr); 
     1412+int pp_var_is_zonal_mean(const PPhdr *hdr); 
    14001413+ 
    14011414+/* in cdunifpp_debug.c: */ 
     
    14031416+ 
    14041417+#define D(x) {printf("debug: %d\n",x);} 
    1405 diff -r -u -N cdat-4.0b3/libcdms/include/cdunifpp/crayio.h cdat-4.0b3-ppio/libcdms/include/cdunifpp/crayio.h 
     1418diff -Naur cdat-4.0b3/libcdms/include/cdunifpp/crayio.h cdat-4.0b3-pp/libcdms/include/cdunifpp/crayio.h 
    14061419--- cdat-4.0b3/libcdms/include/cdunifpp/crayio.h        1970-01-01 01:00:00.000000000 +0100 
    1407 +++ cdat-4.0b3-ppio/libcdms/include/cdunifpp/crayio.h   2004-08-05 14:35:49.299204528 +0100 
     1420+++ cdat-4.0b3-pp/libcdms/include/cdunifpp/crayio.h     2004-11-04 16:57:55.000000000 +0000 
    14081421@@ -0,0 +1,396 @@ 
    14091422+#if !defined(COS_HDR) 
     
    18031816+ 
    18041817+#endif 
    1805 diff -r -u -N cdat-4.0b3/libcdms/include/cdunifpp/util.h cdat-4.0b3-ppio/libcdms/include/cdunifpp/util.h 
     1818diff -Naur cdat-4.0b3/libcdms/include/cdunifpp/util.h cdat-4.0b3-pp/libcdms/include/cdunifpp/util.h 
    18061819--- cdat-4.0b3/libcdms/include/cdunifpp/util.h  1970-01-01 01:00:00.000000000 +0100 
    1807 +++ cdat-4.0b3-ppio/libcdms/include/cdunifpp/util.h     2004-08-05 14:35:49.300204376 +0100 
     1820+++ cdat-4.0b3-pp/libcdms/include/cdunifpp/util.h       2004-11-04 16:57:55.000000000 +0000 
    18081821@@ -0,0 +1,251 @@ 
    18091822+#if !defined(UTIL_HDR) 
     
    20582071+ 
    20592072+#endif 
    2060 diff -r -u -N cdat-4.0b3/libcdms/include/cdunifpp/vardef.h cdat-4.0b3-ppio/libcdms/include/cdunifpp/vardef.h 
     2073diff -Naur cdat-4.0b3/libcdms/include/cdunifpp/vardef.h cdat-4.0b3-pp/libcdms/include/cdunifpp/vardef.h 
    20612074--- cdat-4.0b3/libcdms/include/cdunifpp/vardef.h        1970-01-01 01:00:00.000000000 +0100 
    2062 +++ cdat-4.0b3-ppio/libcdms/include/cdunifpp/vardef.h   2004-08-05 14:35:49.301204224 +0100 
     2075+++ cdat-4.0b3-pp/libcdms/include/cdunifpp/vardef.h     2004-11-04 16:57:55.000000000 +0000 
    20632076@@ -0,0 +1,67 @@ 
    20642077+#include "util.h" 
     
    21292142+#define INTEGER int 
    21302143+#endif 
    2131 diff -r -u -N cdat-4.0b3/libcdms/src/cdunif/cdunif.c cdat-4.0b3-ppio/libcdms/src/cdunif/cdunif.c 
     2144diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunif.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunif.c 
    21322145--- cdat-4.0b3/libcdms/src/cdunif/cdunif.c      2004-06-28 18:07:49.000000000 +0100 
    2133 +++ cdat-4.0b3-ppio/libcdms/src/cdunif/cdunif.c 2004-08-05 14:35:49.302204072 +0100 
     2146+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunif.c   2004-11-04 16:57:55.000000000 +0000 
    21342147@@ -289,6 +289,38 @@ 
    21352148        cuattname_stub, 
     
    21712184 }; 
    21722185  
    2173 diff -r -u -N cdat-4.0b3/libcdms/src/cdunif/cdunifint.c cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifint.c 
     2186diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifint.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifint.c 
    21742187--- cdat-4.0b3/libcdms/src/cdunif/cdunifint.c   2004-06-28 18:07:49.000000000 +0100 
    2175 +++ cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifint.c      2004-08-05 14:35:49.304203768 +0100 
     2188+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifint.c        2004-11-04 16:57:55.000000000 +0000 
    21762189@@ -431,7 +431,17 @@ 
    21772190                fclose(fd); 
     
    21932206   error: 
    21942207        if(feof(fd)) 
    2195 diff -r -u -N cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_attribute.c cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifpp/cdunifpp_attribute.c 
     2208diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_attribute.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_attribute.c 
    21962209--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_attribute.c 1970-01-01 01:00:00.000000000 +0100 
    2197 +++ cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifpp/cdunifpp_attribute.c    2004-08-05 14:35:49.307203312 +0100 
     2210+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_attribute.c      2004-11-04 16:57:55.000000000 +0000 
    21982211@@ -0,0 +1,126 @@ 
    21992212+#ifdef HAVE_PP 
     
    23232336+} 
    23242337+#endif 
    2325 diff -r -u -N cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_axisvals.c cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifpp/cdunifpp_axisvals.c 
     2338diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_axisvals.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_axisvals.c 
    23262339--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_axisvals.c  1970-01-01 01:00:00.000000000 +0100 
    2327 +++ cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifpp/cdunifpp_axisvals.c     2004-08-05 14:35:49.309203008 +0100 
    2328 @@ -0,0 +1,296 @@ 
     2340+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_axisvals.c       2004-11-04 16:58:30.000000000 +0000 
     2341@@ -0,0 +1,319 @@ 
    23292342+#ifdef HAVE_PP 
    23302343+#include "cdunifpp.h" 
     
    25402553+} 
    25412554+ 
    2542 +int pp_is_360day_calendar(Fint LBTIM) { 
    2543 +  int ic; 
    2544 +  ic=LBTIM % 10; 
    2545 +  return (ic == 2); 
    2546 +} 
    2547 + 
    25482555+ 
    25492556+/* float_time returns time in days since origin time */ 
     
    25552562+  const Freal sec_to_day = 1. / 86400.; 
    25562563+ 
    2557 +  if (pp_is_360day_calendar(LBTIM)) {     
    2558 + 
     2564+  switch(pp_calendar_type(LBTIM)) { 
     2565+  case gregorian: 
     2566+    return (pp_gregorian_to_secs(date) - pp_gregorian_to_secs(orig_date)) * sec_to_day; 
     2567+    break; /* notreached */ 
     2568+  case cal360day: 
    25592569+    secs = 
    25602570+      date->second - orig_date->second +  
     
    25662576+ 
    25672577+    return secs * sec_to_day; 
     2578+    break; /* notreached */ 
     2579+  case model: 
     2580+    secs = 
     2581+      date->second - orig_date->second +  
     2582+      60 * (date->minute - orig_date->minute +  
     2583+           60 * (date->hour - orig_date->hour +  
     2584+                 24 * (long long) (date->day - orig_date->day))); 
     2585+ 
     2586+    return secs * sec_to_day; 
     2587+    break; 
    25682588+  } 
    2569 + 
    2570 +  else { 
    2571 + 
    2572 +    return (pp_gregorian_to_secs(date) - pp_gregorian_to_secs(orig_date)) * sec_to_day; 
     2589+} 
     2590+ 
     2591+PPcalendartype pp_calendar_type(Fint type){ 
     2592+ 
     2593+  switch(type%10) { 
     2594+ 
     2595+  case 0: 
     2596+    /* fallthrough */ 
     2597+  case 3: 
     2598+    return model; 
     2599+    break; /* notreached */ 
     2600+  case 1: 
     2601+    return gregorian; 
     2602+    break; /* notreached */ 
     2603+  case 2: 
     2604+    return cal360day; 
     2605+    break; /* notreached */ 
     2606+  default: pp_switch_bug(); 
     2607+     
    25732608+  } 
    25742609+} 
     2610+ 
    25752611+ 
    25762612+long long pp_gregorian_to_secs(const PPdate *date) 
     
    26232659+ 
    26242660+#endif 
    2625 diff -r -u -N cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp.c cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifpp/cdunifpp.c 
     2661diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp.c 
    26262662--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp.c   1970-01-01 01:00:00.000000000 +0100 
    2627 +++ cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifpp/cdunifpp.c      2004-08-05 14:35:49.309203008 +0100 
     2663+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp.c        2004-11-04 16:57:55.000000000 +0000 
    26282664@@ -0,0 +1,135 @@ 
    26292665+/* -*-Mode: C;-*- 
     
    27622798+ 
    27632799+#endif 
    2764 diff -r -u -N cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_check.c cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifpp/cdunifpp_check.c 
     2800diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_check.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_check.c 
    27652801--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_check.c     1970-01-01 01:00:00.000000000 +0100 
    2766 +++ cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifpp/cdunifpp_check.c        2004-08-05 14:35:49.310202856 +0100 
     2802+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_check.c  2004-11-04 16:57:55.000000000 +0000 
    27672803@@ -0,0 +1,23 @@ 
    27682804+#ifdef HAVE_PP 
     
    27892825+ 
    27902826+#endif 
    2791 diff -r -u -N cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_compare.c cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifpp/cdunifpp_compare.c 
     2827diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_compare.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_compare.c 
    27922828--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_compare.c   1970-01-01 01:00:00.000000000 +0100 
    2793 +++ cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifpp/cdunifpp_compare.c      2004-08-05 14:35:49.311202704 +0100 
     2829+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_compare.c        2004-11-04 16:57:55.000000000 +0000 
    27942830@@ -0,0 +1,217 @@ 
    27952831+#ifdef HAVE_PP 
     
    30103046+ 
    30113047+#endif 
    3012 diff -r -u -N cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_data.c cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifpp/cdunifpp_data.c 
     3048diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_data.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_data.c 
    30133049--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_data.c      1970-01-01 01:00:00.000000000 +0100 
    3014 +++ cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifpp/cdunifpp_data.c 2004-08-05 14:35:49.313202400 +0100 
     3050+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_data.c   2004-11-04 16:57:55.000000000 +0000 
    30153051@@ -0,0 +1,177 @@ 
    30163052+#ifdef HAVE_PP 
     
    31913227+ 
    31923228+#endif 
    3193 diff -r -u -N cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_debug.c cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifpp/cdunifpp_debug.c 
     3229diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_debug.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_debug.c 
    31943230--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_debug.c     1970-01-01 01:00:00.000000000 +0100 
    3195 +++ cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifpp/cdunifpp_debug.c        2004-08-05 14:35:49.314202248 +0100 
     3231+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_debug.c  2004-11-04 16:57:55.000000000 +0000 
    31963232@@ -0,0 +1,201 @@ 
    31973233+#ifdef HAVE_PP 
     
    33963432+ 
    33973433+#endif 
    3398 diff -r -u -N cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_error.c cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifpp/cdunifpp_error.c 
     3434diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_error.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_error.c 
    33993435--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_error.c     1970-01-01 01:00:00.000000000 +0100 
    3400 +++ cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifpp/cdunifpp_error.c        2004-08-05 14:35:49.314202248 +0100 
     3436+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_error.c  2004-11-04 16:58:30.000000000 +0000 
    34013437@@ -0,0 +1,36 @@ 
    34023438+#ifdef HAVE_PP 
     
    34133449+int pp_switch_bug() 
    34143450+{ 
    3415 +  pp_error("no match in switch statement; may indicate coding bug in CDUNIFPP"); 
     3451+  pp_error("no match in switch statement; may indicate coding bug in CDUNIFPP or unexpected header value"); 
    34163452+  return 0; 
    34173453+} 
     
    34363472+ 
    34373473+#endif 
    3438 diff -r -u -N cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_filetype.c cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifpp/cdunifpp_filetype.c 
     3474diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_filetype.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_filetype.c 
    34393475--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_filetype.c  1970-01-01 01:00:00.000000000 +0100 
    3440 +++ cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifpp/cdunifpp_filetype.c     2004-08-05 14:35:49.316201944 +0100 
     3476+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_filetype.c       2004-11-04 16:57:55.000000000 +0000 
    34413477@@ -0,0 +1,218 @@ 
    34423478+#ifdef HAVE_PP 
     
    36583694+ 
    36593695+#endif 
    3660 diff -r -u -N cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_linklist.c cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifpp/cdunifpp_linklist.c 
     3696diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_linklist.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_linklist.c 
    36613697--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_linklist.c  1970-01-01 01:00:00.000000000 +0100 
    3662 +++ cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifpp/cdunifpp_linklist.c     2004-08-05 14:35:49.317201792 +0100 
     3698+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_linklist.c       2004-11-04 16:57:55.000000000 +0000 
    36633699@@ -0,0 +1,173 @@ 
    36643700+#ifdef HAVE_PP 
     
    38353871+ 
    38363872+#endif 
    3837 diff -r -u -N cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_malloc.c cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifpp/cdunifpp_malloc.c 
     3873diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_malloc.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_malloc.c 
    38383874--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_malloc.c    1970-01-01 01:00:00.000000000 +0100 
    3839 +++ cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifpp/cdunifpp_malloc.c       2004-08-05 14:35:49.317201792 +0100 
     3875+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_malloc.c 2004-11-04 16:57:55.000000000 +0000 
    38403876@@ -0,0 +1,106 @@ 
    38413877+#ifdef HAVE_PP 
     
    39453981+ 
    39463982+#endif 
    3947 diff -r -u -N cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_ppcode.c cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifpp/cdunifpp_ppcode.c 
     3983diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_ppcode.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_ppcode.c 
    39483984--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_ppcode.c    1970-01-01 01:00:00.000000000 +0100 
    3949 +++ cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifpp/cdunifpp_ppcode.c       2004-08-05 14:35:49.331199664 +0100 
     3985+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_ppcode.c 2004-11-04 16:57:55.000000000 +0000 
    39503986@@ -0,0 +1,1894 @@ 
    39513987+#ifdef HAVE_PP 
     
    58435879+ 
    58445880+#endif 
    5845 diff -r -u -N cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_process.c cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifpp/cdunifpp_process.c 
     5881diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_process.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_process.c 
    58465882--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_process.c   1970-01-01 01:00:00.000000000 +0100 
    5847 +++ cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifpp/cdunifpp_process.c      2004-08-05 14:35:49.334199208 +0100 
    5848 @@ -0,0 +1,850 @@ 
     5883+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_process.c        2004-11-05 18:33:18.000000000 +0000 
     5884@@ -0,0 +1,924 @@ 
    58495885+#ifdef HAVE_PP 
    58505886+#include "cdunifpp.h" 
     
    58685904+  PPtaxis *taxis; 
    58695905+  PPlevel *lev; 
    5870 +  PPtime *time; 
     5906+  PPtime *time, *tval; 
    58715907+  void *oldptr; 
    58725908+  PPlist *heaplist, *xaxes, *yaxes, *zaxes, *taxes; 
    58735909+  PPlist *fieldvars; 
    5874 +  PPlistpos handle; 
     5910+  PPlistpos handle, thandle; 
    58755911+  PPlist *gatts,*catts; 
    58765912+ 
     
    58875923+  PPlist *axislist; 
    58885924+  void *axis; 
    5889 +  char *tunits; 
     5925+  char *tunits, *calatt; 
    58905926+  int have_hybrid=1; 
    58915927+  PPaxistype axistype; 
     
    59065942+  int stashval; 
    59075943+  int ilev; 
     5944+  int ilen1, ilen2; 
    59085945+  Freal lon_modulo, plev_scale; 
     5946+ 
     5947+  int has_cellmethod; 
     5948+  char tmpstring[MAX_ATT_LEN+1]; 
    59095949+ 
    59105950+  /* ------------------------------------------------------ */   
     
    60176057+ 
    60186058+      /* ADD ANY MORE VARIABLE SKIPPING CASES HERE. */ 
     6059+ 
     6060+      if (pp_get_var_gridcode(hdrp) > 1) 
     6061+       skip_reason="grid code not supported"; 
    60196062+ 
    60206063+      if (skip_reason!=NULL) { 
     
    62956338+ 
    62966339+    while ((axis=pp_list_walk(axislist,0,&handle))!=NULL) { 
     6340+ 
     6341+      units=NULL; /* reset */ 
     6342+      axisname=NULL; 
     6343+      standardname=NULL; 
     6344+      pointspacing=NULL; 
     6345+      posdir=NULL; 
    62976346+ 
    62986347+      dim=&cudims[dimid]; 
     
    64116460+       taxis->dimid = dimid;    
    64126461+       sprintf(dim->name,"time%d",idim); 
     6462+ 
     6463+       switch(pp_calendar_type(taxis->type)) { 
     6464+       case gregorian: 
     6465+         calatt="gregorian"; 
     6466+         break; 
     6467+       case cal360day: 
     6468+         calatt="360_day"; 
     6469+         break; 
     6470+       case model: 
     6471+         pp_list_startwalk(taxis->values,&thandle); 
     6472+         tval = pp_list_walk(taxis->values,0,&thandle); 
     6473+          
     6474+         taxis->time_orig.year  = tval->time1.year; 
     6475+         taxis->time_orig.month = tval->time1.month; 
     6476+         taxis->time_orig.day   = tval->time1.day; 
     6477+         taxis->time_orig.hour  = tval->time1.hour; 
     6478+         taxis->time_orig.minute= tval->time1.minute; 
     6479+         taxis->time_orig.second= tval->time1.second; 
     6480+         calatt="none"; 
     6481+         break; 
     6482+       } 
     6483+        
     6484+       if(   pp_add_string_att(ppvar->atts,"calendar", 
     6485+                               calatt, 
     6486+                               heaplist)   !=0) goto err; 
     6487+ 
    64136488+       if((   tunits=pp_t_units(taxis,heaplist)   )==NULL) goto err; 
    64146489+       dim->len = pp_list_size(taxis->values); 
    64156490+       if((   ppvar->data = pp_taxis_to_values(taxis,heaplist)   )==NULL) goto err; 
    6416 +       if(   pp_add_string_att(ppvar->atts,"calendar", 
    6417 +                               pp_is_360day_calendar(taxis->type) ? "360_day" : "gregorian", 
    6418 +                               heaplist)   !=0) goto err; 
    64196491+       axisname="T"; 
    64206492+       standardname="time"; 
     
    64316503+      var->dims[0] = dimid; 
    64326504+       
    6433 +      if (units) { 
     6505+      if (units != NULL) { 
    64346506+       if(   pp_add_string_att(ppvar->atts,"units",units,heaplist)   !=0) goto err; 
    64356507+       strncpy(dim->units,units,CU_MAX_NAME); 
     
    64376509+      } 
    64386510+ 
    6439 +      if (axisname) 
     6511+      if (axisname != NULL) 
    64406512+       if(   pp_add_string_att(ppvar->atts,"axis",axisname,heaplist)   !=0) goto err; 
    64416513+ 
    6442 +      if (standardname) 
     6514+      if (standardname != NULL) 
    64436515+       if(   pp_add_string_att(ppvar->atts,"standard_name",standardname,heaplist)   !=0) goto err; 
    64446516+       
    6445 +      if (pointspacing) 
     6517+      if (pointspacing != NULL) 
    64466518+       if(  pp_add_string_att(ppvar->atts,"point_spacing",pointspacing,heaplist)   !=0) goto err; 
    64476519+ 
    6448 +      if (posdir) 
     6520+      if (posdir != NULL) 
    64496521+       if(   pp_add_string_att(ppvar->atts,"positive",posdir,heaplist)   !=0) goto err; 
    64506522+ 
     
    66026674+ 
    66036675+    /* cell_methods att for time mean */ 
    6604 +    if (pp_is_time_mean(fvar->taxis->type)) { 
    6605 +      snprintf(cellmethods,MAX_ATT_LEN,"%s: mean",cudims[fvar->taxis->dimid].name); 
     6676+    /* 
     6677+     *if (pp_is_time_mean(fvar->taxis->type)) { 
     6678+     * snprintf(cellmethods,MAX_ATT_LEN,"%s: mean",cudims[fvar->taxis->dimid].name); 
     6679+     * if(   pp_add_string_att(ppvar->atts,"cell_methods",cellmethods,heaplist)   !=0) goto err; 
     6680+     *} 
     6681+     */ 
     6682+ 
     6683+    has_cellmethod=0; 
     6684+    strcpy(cellmethods,""); 
     6685+    if (pp_var_is_time_mean(hdrp)) {  /* mean, min, max should be mutually exclusive */ 
     6686+      has_cellmethod=1; 
     6687+      if (snprintf(cellmethods,MAX_ATT_LEN,"%s: mean",cudims[fvar->taxis->dimid].name) > MAX_ATT_LEN+1) { 
     6688+       cellmethods[MAX_ATT_LEN]='\0'; 
     6689+      } 
     6690+    } 
     6691+    if (pp_var_is_time_max(hdrp)) { 
     6692+      has_cellmethod=1; 
     6693+      if (snprintf(cellmethods,MAX_ATT_LEN,"%s: maximum",cudims[fvar->taxis->dimid].name) > MAX_ATT_LEN+1) { 
     6694+       cellmethods[MAX_ATT_LEN]='\0'; 
     6695+      } 
     6696+    } 
     6697+    if (pp_var_is_time_min(hdrp)) { 
     6698+      has_cellmethod=1; 
     6699+      if (snprintf(cellmethods,MAX_ATT_LEN,"%s: minimum",cudims[fvar->taxis->dimid].name) >MAX_ATT_LEN+1) { 
     6700+       cellmethods[MAX_ATT_LEN]='\0'; 
     6701+      } 
     6702+    } 
     6703+    if (pp_var_is_zonal_mean(hdrp)) { 
     6704+      has_cellmethod=1; 
     6705+      if (snprintf(tmpstring,MAX_ATT_LEN," %s: mean",cudims[fvar->xaxis->dimid].name) > MAX_ATT_LEN+1) { 
     6706+       tmpstring[MAX_ATT_LEN]='\0'; 
     6707+      } 
     6708+      ilen1=strlen(cellmethods); 
     6709+      ilen2=strlen(tmpstring); 
     6710+      strncat(cellmethods,tmpstring,MAX_ATT_LEN-ilen1);  /* correct length? */ 
     6711+      if ((ilen1+ilen2) > MAX_ATT_LEN+1) { 
     6712+       cellmethods[MAX_ATT_LEN]='\0'; 
     6713+      } 
     6714+    } 
     6715+    if (has_cellmethod) { 
    66066716+      if(   pp_add_string_att(ppvar->atts,"cell_methods",cellmethods,heaplist)   !=0) goto err; 
    66076717+    } 
     
    66106720+     * cell_methods attribute.  See also pp_taxis_to_values() in cdunifpp_axisvals.c 
    66116721+     */ 
    6612 +     
     6722+    
    66136723+    if(   pp_copy_and_free_atts(file,var,ppvar->atts,heaplist)   !=0) goto err; 
    66146724+ 
     
    66976807+ 
    66986808+#endif 
    6699 diff -r -u -N cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_read.c cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifpp/cdunifpp_read.c 
     6809diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_read.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_read.c 
    67006810--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_read.c      1970-01-01 01:00:00.000000000 +0100 
    6701 +++ cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifpp/cdunifpp_read.c 2004-08-05 14:35:49.341198144 +0100 
     6811+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_read.c   2004-11-04 16:57:55.000000000 +0000 
    67026812@@ -0,0 +1,904 @@ 
    67036813+#ifdef HAVE_PP 
     
    76057715+ 
    76067716+#endif 
    7607 diff -r -u -N cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_stash2pp.c cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifpp/cdunifpp_stash2pp.c 
     7717diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_stash2pp.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_stash2pp.c 
    76087718--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_stash2pp.c  1970-01-01 01:00:00.000000000 +0100 
    7609 +++ cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifpp/cdunifpp_stash2pp.c     2004-08-05 14:35:49.348197080 +0100 
     7719+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_stash2pp.c       2004-11-04 16:57:55.000000000 +0000 
    76107720@@ -0,0 +1,1889 @@ 
    76117721+#ifdef HAVE_PP 
     
    94989608+ 
    94999609+#endif 
    9500 diff -r -u -N cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_stashname.c cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifpp/cdunifpp_stashname.c 
     9610diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_stashname.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_stashname.c 
    95019611--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_stashname.c 1970-01-01 01:00:00.000000000 +0100 
    9502 +++ cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifpp/cdunifpp_stashname.c    2004-08-05 14:35:49.360195256 +0100 
     9612+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_stashname.c      2004-11-04 16:57:55.000000000 +0000 
    95039613@@ -0,0 +1,1877 @@ 
    95049614+#ifdef HAVE_PP 
     
    1137911489+ 
    1138011490+#endif 
    11381 diff -r -u -N cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_struct.c cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifpp/cdunifpp_struct.c 
     11491diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_struct.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_struct.c 
    1138211492--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_struct.c    1970-01-01 01:00:00.000000000 +0100 
    11383 +++ cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifpp/cdunifpp_struct.c       2004-08-05 14:35:49.361195104 +0100 
     11493+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_struct.c 2004-11-04 16:57:55.000000000 +0000 
    1138411494@@ -0,0 +1,75 @@ 
    1138511495+#ifdef HAVE_PP 
     
    1145811568+ 
    1145911569+#endif 
    11460 diff -r -u -N cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_unwgdoswrap.c cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifpp/cdunifpp_unwgdoswrap.c 
     11570diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_unwgdoswrap.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_unwgdoswrap.c 
    1146111571--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_unwgdoswrap.c       1970-01-01 01:00:00.000000000 +0100 
    11462 +++ cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifpp/cdunifpp_unwgdoswrap.c  2004-08-05 14:35:49.362194952 +0100 
     11572+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_unwgdoswrap.c    2004-11-04 16:57:55.000000000 +0000 
    1146311573@@ -0,0 +1,50 @@ 
    1146411574+/* This is a wrapper function which interfaces between CDUNIFPP and 
     
    1151211622+ 
    1151311623+#endif 
    11514 diff -r -u -N cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_varinfo.c cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifpp/cdunifpp_varinfo.c 
     11624diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_varinfo.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_varinfo.c 
    1151511625--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_varinfo.c   1970-01-01 01:00:00.000000000 +0100 
    11516 +++ cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifpp/cdunifpp_varinfo.c      2004-08-05 14:35:49.363194800 +0100 
    11517 @@ -0,0 +1,222 @@ 
     11626+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_varinfo.c        2004-11-04 17:10:43.000000000 +0000 
     11627@@ -0,0 +1,252 @@ 
    1151811628+#ifdef HAVE_PP 
    1151911629+#include "cdunifpp.h" 
     
    1163411744+{ 
    1163511745+  return (hdr->LBPACK / 10) % 10; 
     11746+} 
     11747+ 
     11748+int pp_get_var_processing(const PPhdr *hdr) 
     11749+{ 
     11750+  return hdr->LBPROC; 
     11751+} 
     11752+ 
     11753+int pp_get_var_gridcode(const PPhdr *hdr) 
     11754+{ 
     11755+  return hdr->LBCODE; 
    1163611756+} 
    1163711757+ 
     
    1173711857+} 
    1173811858+ 
    11739 +#endif 
    11740 diff -r -u -N cdat-4.0b3/libcdms/src/cdunif/cdunifpp/Makefile.in cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifpp/Makefile.in 
    11741 --- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/Makefile.in  1970-01-01 01:00:00.000000000 +0100 
    11742 +++ cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifpp/Makefile.in     2004-08-05 14:35:49.364194648 +0100 
    11743 @@ -0,0 +1,60 @@ 
     11859+int pp_var_is_time_mean(const PPhdr *hdr) 
     11860+{ 
     11861+  return (hdr->LBPROC & 128); 
     11862+} 
     11863+ 
     11864+int pp_var_is_time_min(const PPhdr *hdr) 
     11865+{ 
     11866+  return (hdr->LBPROC & 4096); 
     11867+} 
     11868+ 
     11869+int pp_var_is_time_max(const PPhdr *hdr) 
     11870+{ 
     11871+  return (hdr->LBPROC & 8192); 
     11872+} 
     11873+ 
     11874+int pp_var_is_zonal_mean(const PPhdr *hdr) 
     11875+{ 
     11876+  return (hdr->LBPROC & 64); 
     11877+} 
     11878+ 
     11879+#endif 
     11880diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/Makefile cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/Makefile 
     11881--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/Makefile     1970-01-01 01:00:00.000000000 +0100 
     11882+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/Makefile  2004-11-05 18:34:37.000000000 +0000 
     11883@@ -0,0 +1,61 @@ 
     11884+# Generated automatically from Makefile.in by configure. 
    1174411885+# makefile for cdunifpp 
    1174511886+ 
     
    1177711918+# set to blank if you don't want to rename symbols in unpacking routines 
    1177811919+ 
     11920+CC = cc 
     11921+CFLAGS = -I../../../include/cdunifpp  -I/tmp/cdat/DODS/include -I../../../include $(DEBUG) 
     11922+CPPFLAGS =  -Dnetcdf -DBYTESWAP -DpgiFortran -DHAVE_PP 
     11923+LIBRARY = ../../../lib/libcdms.a 
     11924+ 
     11925+all: $(OBJS) 
     11926+       ar rv $(LIBRARY) $(OBJS) 
     11927+# (ranlib called by higher-level makefile) 
     11928+ 
     11929+clean: 
     11930+       -rm -f *.o 
     11931+ 
     11932+distclean: clean 
     11933+ 
     11934+%.o: %.c $(HEADERS) 
     11935+ 
     11936+cdunifpp_unwgdoswrap.o: cdunifpp_unwgdoswrap.c $(HEADERS) $(UNWGDOS_HDRS) 
     11937+       $(CC) $(CFLAGS) $(CPPFLAGS) $(EXTRAHDR) -c $< 
     11938+ 
     11939+unwgdos.o: unwgdos.c $(UNWGDOS_HDRS) 
     11940+       $(CC) $(CFLAGS) $(EXTRAHDR) -c $< 
     11941+ 
     11942+unwgdos_crayio.o: unwgdos_crayio.c $(UNWGDOS_HDRS) 
     11943+       $(CC) $(CFLAGS) $(EXTRAHDR) -c $< 
     11944+ 
     11945diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/Makefile.in cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/Makefile.in 
     11946--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/Makefile.in  1970-01-01 01:00:00.000000000 +0100 
     11947+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/Makefile.in       2004-11-04 16:57:55.000000000 +0000 
     11948@@ -0,0 +1,60 @@ 
     11949+# makefile for cdunifpp 
     11950+ 
     11951+OBJS = \ 
     11952+     cdunifpp.o \ 
     11953+     cdunifpp_attribute.o \ 
     11954+     cdunifpp_axisvals.o \ 
     11955+     cdunifpp_check.o \ 
     11956+     cdunifpp_compare.o \ 
     11957+     cdunifpp_data.o \ 
     11958+     cdunifpp_debug.o \ 
     11959+     cdunifpp_error.o \ 
     11960+     cdunifpp_filetype.o \ 
     11961+     cdunifpp_linklist.o \ 
     11962+     cdunifpp_malloc.o \ 
     11963+     cdunifpp_ppcode.o \ 
     11964+     cdunifpp_process.o \ 
     11965+     cdunifpp_read.o \ 
     11966+     cdunifpp_stash2pp.o \ 
     11967+     cdunifpp_stashname.o \ 
     11968+     cdunifpp_struct.o \ 
     11969+     cdunifpp_unwgdoswrap.o \ 
     11970+     cdunifpp_varinfo.o \ 
     11971+     unwgdos.o \ 
     11972+     unwgdos_crayio.o 
     11973+ 
     11974+HEADERS=../../../include/cdunifint.h ../../../include/cdunifpp/cdunifpp.h 
     11975+ 
     11976+UNWGDOS_HDRS=../../../include/cdunifpp/crayio.h \ 
     11977+             ../../../include/cdunifpp/util.h \ 
     11978+             ../../../include/cdunifpp/vardef.h \ 
     11979+             ../../../include/cdunifpp/cdunifpp_frename.h 
     11980+ 
     11981+EXTRAHDR=-include ../../../include/cdunifpp/cdunifpp_frename.h 
     11982+# set to blank if you don't want to rename symbols in unpacking routines 
     11983+ 
    1177911984+CC = @CC@ 
    1178011985+CFLAGS = -I../../../include/cdunifpp @CFLAGS@ -I../../../include $(DEBUG) 
     
    1180212007+       $(CC) $(CFLAGS) $(EXTRAHDR) -c $< 
    1180312008+ 
    11804 diff -r -u -N cdat-4.0b3/libcdms/src/cdunif/cdunifpp/unwgdos.c cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifpp/unwgdos.c 
     12009diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/unwgdos.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/unwgdos.c 
    1180512010--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/unwgdos.c    1970-01-01 01:00:00.000000000 +0100 
    11806 +++ cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifpp/unwgdos.c       2004-08-05 14:35:49.366194344 +0100 
     12011+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/unwgdos.c 2004-11-04 16:57:55.000000000 +0000 
    1180712012@@ -0,0 +1,570 @@ 
    1180812013+ 
     
    1237612581+} 
    1237712582+#endif 
    12378 diff -r -u -N cdat-4.0b3/libcdms/src/cdunif/cdunifpp/unwgdos_crayio.c cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifpp/unwgdos_crayio.c 
     12583diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/unwgdos_crayio.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/unwgdos_crayio.c 
    1237912584--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/unwgdos_crayio.c     1970-01-01 01:00:00.000000000 +0100 
    12380 +++ cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifpp/unwgdos_crayio.c        2004-08-05 14:35:49.372193432 +0100 
     12585+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/unwgdos_crayio.c  2004-11-04 16:57:55.000000000 +0000 
    1238112586@@ -0,0 +1,2112 @@ 
    1238212587+#include <stdio.h> 
     
    1449214697+} 
    1449314698+#endif 
    14494 diff -r -u -N cdat-4.0b3/libcdms/src/cdunif/cdunifstub.c cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifstub.c 
     14699diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifstub.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifstub.c 
    1449514700--- cdat-4.0b3/libcdms/src/cdunif/cdunifstub.c  2004-06-28 18:07:50.000000000 +0100 
    14496 +++ cdat-4.0b3-ppio/libcdms/src/cdunif/cdunifstub.c     2004-08-05 14:35:49.373193280 +0100 
     14701+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifstub.c       2004-11-04 16:57:55.000000000 +0000 
    1449714702@@ -57,6 +57,10 @@ 
    1449814703        CuError(CU_EBADFORM,"POP I/O routines not available, file %s.",controlpath); 
     
    1450614711        CuError(CU_EBADFORM,"Stub called, file %s",file->controlpath); 
    1450714712        return -1; 
    14508 diff -r -u -N cdat-4.0b3/libcdms/src/cdunif/Makefile.in cdat-4.0b3-ppio/libcdms/src/cdunif/Makefile.in 
     14713diff -Naur cdat-4.0b3/libcdms/src/cdunif/Makefile.in cdat-4.0b3-pp/libcdms/src/cdunif/Makefile.in 
    1450914714--- cdat-4.0b3/libcdms/src/cdunif/Makefile.in   2004-06-28 18:07:49.000000000 +0100 
    14510 +++ cdat-4.0b3-ppio/libcdms/src/cdunif/Makefile.in      2004-08-05 14:35:49.374193128 +0100 
     14715+++ cdat-4.0b3-pp/libcdms/src/cdunif/Makefile.in        2004-11-04 16:57:55.000000000 +0000 
    1451114716@@ -48,7 +48,7 @@ 
    1451214717  
     
    1453414739 distclean: clean 
    1453514740  
    14536 diff -r -u -N cdat-4.0b3/libcdms/src/cdunif/test/Makefile.in cdat-4.0b3-ppio/libcdms/src/cdunif/test/Makefile.in 
     14741diff -Naur cdat-4.0b3/libcdms/src/cdunif/test/Makefile.in cdat-4.0b3-pp/libcdms/src/cdunif/test/Makefile.in 
    1453714742--- cdat-4.0b3/libcdms/src/cdunif/test/Makefile.in      2004-06-28 18:07:50.000000000 +0100 
    14538 +++ cdat-4.0b3-ppio/libcdms/src/cdunif/test/Makefile.in 2004-08-05 14:36:40.266456328 +0100 
     14743+++ cdat-4.0b3-pp/libcdms/src/cdunif/test/Makefile.in   2004-11-04 16:57:55.000000000 +0000 
    1453914744@@ -43,7 +43,7 @@ 
    1454014745  
     
    1457314778+       -rm -f cdfile cudump cuget testnc testgrib testdrs testslab testpp 
    1457414779+ 
    14575 diff -r -u -N cdat-4.0b3/libcdms/src/cdunif/test/testpp.c cdat-4.0b3-ppio/libcdms/src/cdunif/test/testpp.c 
     14780diff -Naur cdat-4.0b3/libcdms/src/cdunif/test/testpp.c cdat-4.0b3-pp/libcdms/src/cdunif/test/testpp.c 
    1457614781--- cdat-4.0b3/libcdms/src/cdunif/test/testpp.c 1970-01-01 01:00:00.000000000 +0100 
    14577 +++ cdat-4.0b3-ppio/libcdms/src/cdunif/test/testpp.c    2004-08-05 14:35:49.375192976 +0100 
     14782+++ cdat-4.0b3-pp/libcdms/src/cdunif/test/testpp.c      2004-11-04 16:57:55.000000000 +0000 
    1457814783@@ -0,0 +1,113 @@ 
    1457914784+/* Test cdunif/PP: 
Note: See TracChangeset for help on using the changeset viewer.