Changeset 302 for IO_handling


Ignore:
Timestamp:
02/12/04 10:43:10 (15 years ago)
Author:
jkettleb
Message:

Given p0 a dimension of 1 rather than 0

Defaul short names are based on model, section, item if the ppcode is 0

File:
1 edited

Legend:

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

    r301 r302  
    1 diff -Naur cdat-4.0b3/libcdms/configure cdat-4.0b3-work/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-work/libcdms/configure   2004-11-29 16:51:16.964853048 +0000 
     3+++ cdat-4.0b3-pp/libcdms/configure     2004-11-30 09:44:01.000000000 +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-work/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-work/libcdms/configure.in        2004-11-29 16:51:16.964853048 +0000 
     570+++ cdat-4.0b3-pp/libcdms/configure.in  2004-11-30 09:44:01.000000000 +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-work/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-work/libcdms/include/cdunif.h    2004-11-29 16:51:16.974851528 +0000 
     609+++ cdat-4.0b3-pp/libcdms/include/cdunif.h      2004-11-30 09:44:01.000000000 +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-work/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-work/libcdms/include/cdunifint.h 2004-11-29 16:51:16.972851832 +0000 
     621+++ cdat-4.0b3-pp/libcdms/include/cdunifint.h   2004-11-30 09:44:01.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 -Naur cdat-4.0b3/libcdms/include/cdunifpp/cdunifpp_frename.h cdat-4.0b3-work/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-work/libcdms/include/cdunifpp/cdunifpp_frename.h 2004-11-29 16:51:16.975851376 +0000 
     641+++ cdat-4.0b3-pp/libcdms/include/cdunifpp/cdunifpp_frename.h   2004-11-30 09:44:01.000000000 +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-work/libcdms/include/cdunifpp/cdunifpp.h 
     711diff -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-work/libcdms/include/cdunifpp/cdunifpp.h 2004-11-29 16:51:16.975851376 +0000 
     713+++ cdat-4.0b3-pp/libcdms/include/cdunifpp/cdunifpp.h   2004-11-30 09:44:01.000000000 +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-work/libcdms/include/cdunifpp/crayio.h 
     1434diff -Naur cdat-4.0b3/libcdms/include/cdunifpp/crayio.h cdat-4.0b3-pp/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-work/libcdms/include/cdunifpp/crayio.h   2004-11-29 16:51:16.976851224 +0000 
     1436+++ cdat-4.0b3-pp/libcdms/include/cdunifpp/crayio.h     2004-11-30 09:44:01.000000000 +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-work/libcdms/include/cdunifpp/util.h 
     1834diff -Naur cdat-4.0b3/libcdms/include/cdunifpp/util.h cdat-4.0b3-pp/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-work/libcdms/include/cdunifpp/util.h     2004-11-29 16:51:16.976851224 +0000 
     1836+++ cdat-4.0b3-pp/libcdms/include/cdunifpp/util.h       2004-11-30 09:44:01.000000000 +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-work/libcdms/include/cdunifpp/vardef.h 
     2089diff -Naur cdat-4.0b3/libcdms/include/cdunifpp/vardef.h cdat-4.0b3-pp/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-work/libcdms/include/cdunifpp/vardef.h   2004-11-29 16:51:16.976851224 +0000 
     2091+++ cdat-4.0b3-pp/libcdms/include/cdunifpp/vardef.h     2004-11-30 09:44:01.000000000 +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-work/libcdms/src/cdunif/cdunif.c 
     2160diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunif.c cdat-4.0b3-pp/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-work/libcdms/src/cdunif/cdunif.c 2004-11-29 16:51:16.939856848 +0000 
     2162+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunif.c   2004-11-30 09:44:01.000000000 +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-work/libcdms/src/cdunif/cdunifint.c 
     2202diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifint.c cdat-4.0b3-pp/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-work/libcdms/src/cdunif/cdunifint.c      2004-11-29 16:51:16.937857152 +0000 
     2204+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifint.c        2004-11-30 09:44:01.000000000 +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-work/libcdms/src/cdunif/cdunifpp/cdunifpp_attribute.c 
     2224diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_attribute.c cdat-4.0b3-pp/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-work/libcdms/src/cdunif/cdunifpp/cdunifpp_attribute.c    2004-11-29 16:51:16.946855784 +0000 
     2226+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_attribute.c      2004-11-30 09:44:01.000000000 +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-work/libcdms/src/cdunif/cdunifpp/cdunifpp_axisvals.c 
     2362diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_axisvals.c cdat-4.0b3-pp/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-work/libcdms/src/cdunif/cdunifpp/cdunifpp_axisvals.c     2004-11-29 16:51:16.941856544 +0000 
     2364+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_axisvals.c       2004-11-30 09:44:01.000000000 +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-work/libcdms/src/cdunif/cdunifpp/cdunifpp.c 
     2693diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp.c cdat-4.0b3-pp/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-work/libcdms/src/cdunif/cdunifpp/cdunifpp.c      2004-11-29 16:51:16.946855784 +0000 
     2695+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp.c        2004-11-30 09:44:01.000000000 +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-work/libcdms/src/cdunif/cdunifpp/cdunifpp_check.c 
     2840diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_check.c cdat-4.0b3-pp/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-work/libcdms/src/cdunif/cdunifpp/cdunifpp_check.c        2004-11-29 16:51:16.945855936 +0000 
     2842+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_check.c  2004-11-30 09:44:01.000000000 +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-work/libcdms/src/cdunif/cdunifpp/cdunifpp_compare.c 
     2875diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_compare.c cdat-4.0b3-pp/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-work/libcdms/src/cdunif/cdunifpp/cdunifpp_compare.c      2004-11-29 16:51:16.941856544 +0000 
     2877+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_compare.c        2004-11-30 09:44:01.000000000 +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-work/libcdms/src/cdunif/cdunifpp/cdunifpp_data.c 
     3104diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_data.c cdat-4.0b3-pp/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-work/libcdms/src/cdunif/cdunifpp/cdunifpp_data.c 2004-11-29 16:53:18.511375168 +0000 
     3106+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_data.c   2004-11-30 09:44:01.000000000 +0000 
    31073107@@ -0,0 +1,215 @@ 
    31083108+/* 
     
    33213321+ 
    33223322+#endif 
    3323 diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_debug.c cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_debug.c 
     3323diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_debug.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_debug.c 
    33243324--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_debug.c     1970-01-01 01:00:00.000000000 +0100 
    3325 +++ cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_debug.c        2004-11-29 16:51:16.946855784 +0000 
     3325+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_debug.c  2004-11-30 09:44:01.000000000 +0000 
    33263326@@ -0,0 +1,209 @@ 
    33273327+/* 
     
    35343534+ 
    35353535+#endif 
    3536 diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_error.c cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_error.c 
     3536diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_error.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_error.c 
    35373537--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_error.c     1970-01-01 01:00:00.000000000 +0100 
    3538 +++ cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_error.c        2004-11-29 16:51:16.948855480 +0000 
     3538+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_error.c  2004-11-30 09:44:01.000000000 +0000 
    35393539@@ -0,0 +1,44 @@ 
    35403540+/* 
     
    35823582+ 
    35833583+#endif 
    3584 diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_filetype.c cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_filetype.c 
     3584diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_filetype.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_filetype.c 
    35853585--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_filetype.c  1970-01-01 01:00:00.000000000 +0100 
    3586 +++ cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_filetype.c     2004-11-29 16:51:16.946855784 +0000 
     3586+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_filetype.c       2004-11-30 09:44:01.000000000 +0000 
    35873587@@ -0,0 +1,226 @@ 
    35883588+/* 
     
    38123812+ 
    38133813+#endif 
    3814 diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_linklist.c cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_linklist.c 
     3814diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_linklist.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_linklist.c 
    38153815--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_linklist.c  1970-01-01 01:00:00.000000000 +0100 
    3816 +++ cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_linklist.c     2004-11-29 16:51:16.949855328 +0000 
     3816+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_linklist.c       2004-11-30 09:44:01.000000000 +0000 
    38173817@@ -0,0 +1,181 @@ 
    38183818+/* 
     
    39973997+ 
    39983998+#endif 
    3999 diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_malloc.c cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_malloc.c 
     3999diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_malloc.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_malloc.c 
    40004000--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_malloc.c    1970-01-01 01:00:00.000000000 +0100 
    4001 +++ cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_malloc.c       2004-11-29 16:51:16.941856544 +0000 
     4001+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_malloc.c 2004-11-30 09:44:01.000000000 +0000 
    40024002@@ -0,0 +1,114 @@ 
    40034003+/* 
     
    41154115+ 
    41164116+#endif 
    4117 diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_ppcode.c cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_ppcode.c 
     4117diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_ppcode.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_ppcode.c 
    41184118--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_ppcode.c    1970-01-01 01:00:00.000000000 +0100 
    4119 +++ cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_ppcode.c       2004-11-29 16:51:16.940856696 +0000 
     4119+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_ppcode.c 2004-11-30 09:44:01.000000000 +0000 
    41204120@@ -0,0 +1,1902 @@ 
    41214121+/* 
     
    60216021+ 
    60226022+#endif 
    6023 diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_process.c cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_process.c 
     6023diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_process.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_process.c 
    60246024--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_process.c   1970-01-01 01:00:00.000000000 +0100 
    6025 +++ cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_process.c      2004-11-29 16:51:16.947855632 +0000 
    6026 @@ -0,0 +1,932 @@ 
     6025+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_process.c        2004-11-30 16:58:26.000000000 +0000 
     6026@@ -0,0 +1,936 @@ 
    60276027+/* 
    60286028+ * 
     
    64306430+  } 
    64316431+ 
     6432+  if (have_hybrid) { 
     6433+    ndims++; 
     6434+  } 
     6435+ 
    64326436+  if((   cudims = CuCreateDims(file,ndims)   )==NULL) goto err; 
    64336437+ 
     
    64896493+    while ((axis=pp_list_walk(axislist,0,&handle))!=NULL) { 
    64906494+ 
    6491 +      units=NULL; /* reset */ 
    6492 +      axisname=NULL; 
    6493 +      standardname=NULL; 
    6494 +      pointspacing=NULL; 
    6495 +      posdir=NULL; 
    6496 + 
    64976495+      dim=&cudims[dimid]; 
    64986496+      var=&cuvars[varid]; 
     
    65026500+      dim->coord = var; 
    65036501+ 
    6504 +      pointspacing=standardname=axisname=posdir=NULL; 
     6502+      pointspacing=standardname=axisname=posdir=units=NULL; 
    65056503+ 
    65066504+      switch(axistype){ 
     
    67416739+  /* add p0 variable if we had hybrid coords */ 
    67426740+  if (have_hybrid) { 
     6741+  
     6742+    dim=&cudims[dimid]; 
     6743+    strcpy(dim->name,"n1"); 
     6744+    dim->len=1; 
     6745+  
    67436746+    var=&cuvars[varid]; 
    67446747+    ppvar=(PPvar*) var->internp; 
    67456748+    sprintf(var->name,"p0"); 
    6746 +    var->ndims=0; 
     6749+    var->ndims=1; 
     6750+    var->dims[0]=dimid; 
    67476751+     
    67486752+    /* single value consisting of p0 */ 
    67496753+    if((   ppvar->data = pp_data_new(realtype,1,heaplist)   )==NULL) goto err; 
    67506754+    ((Freal*)(ppvar->data->values))[0]=reference_pressure; 
    6751 + 
     6755+    dimid++; 
    67526756+    varid++; 
    67536757+  } 
     
    69576961+ 
    69586962+#endif 
    6959 diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_read.c cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_read.c 
     6963diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_read.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_read.c 
    69606964--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_read.c      1970-01-01 01:00:00.000000000 +0100 
    6961 +++ cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_read.c 2004-11-29 16:51:16.948855480 +0000 
     6965+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_read.c   2004-11-30 09:44:01.000000000 +0000 
    69626966@@ -0,0 +1,912 @@ 
    69636967+/* 
     
    78737877+ 
    78747878+#endif 
    7875 diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_stash2pp.c cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_stash2pp.c 
     7879diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_stash2pp.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_stash2pp.c 
    78767880--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_stash2pp.c  1970-01-01 01:00:00.000000000 +0100 
    7877 +++ cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_stash2pp.c     2004-11-29 16:51:16.945855936 +0000 
     7881+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_stash2pp.c       2004-11-30 09:44:01.000000000 +0000 
    78787882@@ -0,0 +1,1897 @@ 
    78797883+/* 
     
    97749778+ 
    97759779+#endif 
    9776 diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_stashname.c cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_stashname.c 
     9780diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_stashname.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_stashname.c 
    97779781--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_stashname.c 1970-01-01 01:00:00.000000000 +0100 
    9778 +++ cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_stashname.c    2004-11-29 16:51:16.944856088 +0000 
     9782+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_stashname.c      2004-11-30 09:44:01.000000000 +0000 
    97799783@@ -0,0 +1,1885 @@ 
    97809784+/* 
     
    1166311667+ 
    1166411668+#endif 
    11665 diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_struct.c cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_struct.c 
     11669diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_struct.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_struct.c 
    1166611670--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_struct.c    1970-01-01 01:00:00.000000000 +0100 
    11667 +++ cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_struct.c       2004-11-29 16:51:16.947855632 +0000 
     11671+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_struct.c 2004-11-30 09:44:01.000000000 +0000 
    1166811672@@ -0,0 +1,83 @@ 
    1166911673+/* 
     
    1175011754+ 
    1175111755+#endif 
    11752 diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_unwgdoswrap.c cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_unwgdoswrap.c 
     11756diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_unwgdoswrap.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_unwgdoswrap.c 
    1175311757--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_unwgdoswrap.c       1970-01-01 01:00:00.000000000 +0100 
    11754 +++ cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_unwgdoswrap.c  2004-11-29 16:51:16.948855480 +0000 
     11758+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_unwgdoswrap.c    2004-11-30 09:44:01.000000000 +0000 
    1175511759@@ -0,0 +1,58 @@ 
    1175611760+/* 
     
    1181211816+ 
    1181311817+#endif 
    11814 diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_varinfo.c cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_varinfo.c 
     11818diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_varinfo.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_varinfo.c 
    1181511819--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/cdunifpp_varinfo.c   1970-01-01 01:00:00.000000000 +0100 
    11816 +++ cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/cdunifpp_varinfo.c      2004-11-29 16:51:16.944856088 +0000 
     11820+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/cdunifpp_varinfo.c        2004-11-30 15:54:21.000000000 +0000 
    1181711821@@ -0,0 +1,260 @@ 
    1181811822+/* 
     
    1187611880+  lookupname = pp_ppshortname(hdr->LBFC); 
    1187711881+ 
    11878 +  if (lookupname != NULL) 
     11882+  if (hdr->LBFC != 0 && lookupname != NULL) 
    1187911883+    snprintf(name,name_max,"%s",lookupname); 
    1188011884+  else  
     
    1207612080+ 
    1207712081+#endif 
    12078 diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/Makefile cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/Makefile 
     12082diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/Makefile cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/Makefile 
    1207912083--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/Makefile     1970-01-01 01:00:00.000000000 +0100 
    12080 +++ cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/Makefile        2004-11-29 16:51:16.939856848 +0000 
     12084+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/Makefile  2004-11-30 09:44:01.000000000 +0000 
    1208112085@@ -0,0 +1,61 @@ 
    1208212086+# Generated automatically from Makefile.in by configure. 
     
    1214112145+       $(CC) $(CFLAGS) $(EXTRAHDR) -c $< 
    1214212146+ 
    12143 diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/Makefile.in cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/Makefile.in 
     12147diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/Makefile.in cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/Makefile.in 
    1214412148--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/Makefile.in  1970-01-01 01:00:00.000000000 +0100 
    12145 +++ cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/Makefile.in     2004-11-29 16:51:16.945855936 +0000 
     12149+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/Makefile.in       2004-11-30 09:44:01.000000000 +0000 
    1214612150@@ -0,0 +1,60 @@ 
    1214712151+# makefile for cdunifpp 
     
    1220512209+       $(CC) $(CFLAGS) $(EXTRAHDR) -c $< 
    1220612210+ 
    12207 diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/unwgdos.c cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/unwgdos.c 
     12211diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/unwgdos.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/unwgdos.c 
    1220812212--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/unwgdos.c    1970-01-01 01:00:00.000000000 +0100 
    12209 +++ cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/unwgdos.c       2004-11-29 16:51:16.942856392 +0000 
     12213+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/unwgdos.c 2004-11-30 09:44:01.000000000 +0000 
    1221012214@@ -0,0 +1,570 @@ 
    1221112215+ 
     
    1277912783+} 
    1278012784+#endif 
    12781 diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/unwgdos_crayio.c cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/unwgdos_crayio.c 
     12785diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifpp/unwgdos_crayio.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/unwgdos_crayio.c 
    1278212786--- cdat-4.0b3/libcdms/src/cdunif/cdunifpp/unwgdos_crayio.c     1970-01-01 01:00:00.000000000 +0100 
    12783 +++ cdat-4.0b3-work/libcdms/src/cdunif/cdunifpp/unwgdos_crayio.c        2004-11-29 16:51:16.942856392 +0000 
     12787+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifpp/unwgdos_crayio.c  2004-11-30 09:44:01.000000000 +0000 
    1278412788@@ -0,0 +1,2112 @@ 
    1278512789+#include <stdio.h> 
     
    1489514899+} 
    1489614900+#endif 
    14897 diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifstub.c cdat-4.0b3-work/libcdms/src/cdunif/cdunifstub.c 
     14901diff -Naur cdat-4.0b3/libcdms/src/cdunif/cdunifstub.c cdat-4.0b3-pp/libcdms/src/cdunif/cdunifstub.c 
    1489814902--- cdat-4.0b3/libcdms/src/cdunif/cdunifstub.c  2004-06-28 18:07:50.000000000 +0100 
    14899 +++ cdat-4.0b3-work/libcdms/src/cdunif/cdunifstub.c     2004-11-29 16:51:16.924859128 +0000 
     14903+++ cdat-4.0b3-pp/libcdms/src/cdunif/cdunifstub.c       2004-11-30 09:44:01.000000000 +0000 
    1490014904@@ -57,6 +57,10 @@ 
    1490114905        CuError(CU_EBADFORM,"POP I/O routines not available, file %s.",controlpath); 
     
    1490914913        CuError(CU_EBADFORM,"Stub called, file %s",file->controlpath); 
    1491014914        return -1; 
    14911 diff -Naur cdat-4.0b3/libcdms/src/cdunif/Makefile.in cdat-4.0b3-work/libcdms/src/cdunif/Makefile.in 
     14915diff -Naur cdat-4.0b3/libcdms/src/cdunif/Makefile.in cdat-4.0b3-pp/libcdms/src/cdunif/Makefile.in 
    1491214916--- cdat-4.0b3/libcdms/src/cdunif/Makefile.in   2004-06-28 18:07:49.000000000 +0100 
    14913 +++ cdat-4.0b3-work/libcdms/src/cdunif/Makefile.in      2004-11-29 16:51:16.925858976 +0000 
     14917+++ cdat-4.0b3-pp/libcdms/src/cdunif/Makefile.in        2004-11-30 09:44:01.000000000 +0000 
    1491414918@@ -48,7 +48,7 @@ 
    1491514919  
     
    1493714941 distclean: clean 
    1493814942  
    14939 diff -Naur cdat-4.0b3/libcdms/src/cdunif/test/Makefile.in cdat-4.0b3-work/libcdms/src/cdunif/test/Makefile.in 
     14943diff -Naur cdat-4.0b3/libcdms/src/cdunif/test/Makefile.in cdat-4.0b3-pp/libcdms/src/cdunif/test/Makefile.in 
    1494014944--- cdat-4.0b3/libcdms/src/cdunif/test/Makefile.in      2004-06-28 18:07:50.000000000 +0100 
    14941 +++ cdat-4.0b3-work/libcdms/src/cdunif/test/Makefile.in 2004-11-29 16:51:16.898863080 +0000 
     14945+++ cdat-4.0b3-pp/libcdms/src/cdunif/test/Makefile.in   2004-11-30 09:44:01.000000000 +0000 
    1494214946@@ -43,7 +43,7 @@ 
    1494314947  
     
    1497614980+       -rm -f cdfile cudump cuget testnc testgrib testdrs testslab testpp 
    1497714981+ 
    14978 diff -Naur cdat-4.0b3/libcdms/src/cdunif/test/testpp.c cdat-4.0b3-work/libcdms/src/cdunif/test/testpp.c 
     14982diff -Naur cdat-4.0b3/libcdms/src/cdunif/test/testpp.c cdat-4.0b3-pp/libcdms/src/cdunif/test/testpp.c 
    1497914983--- cdat-4.0b3/libcdms/src/cdunif/test/testpp.c 1970-01-01 01:00:00.000000000 +0100 
    14980 +++ cdat-4.0b3-work/libcdms/src/cdunif/test/testpp.c    2004-11-29 16:51:16.897863232 +0000 
     14984+++ cdat-4.0b3-pp/libcdms/src/cdunif/test/testpp.c      2004-11-30 09:44:01.000000000 +0000 
    1498114985@@ -0,0 +1,113 @@ 
    1498214986+/* Test cdunif/PP: 
Note: See TracChangeset for help on using the changeset viewer.