Changeset 296 for IO_handling

Timestamp:

18/11/04 11:57:15 (16 years ago)

Author:

spascoe

Message:

Added a description of crashes and more test cases in the test directory.

Location:

IO_handling/trunk/ppio/cu2netcdf

Files:

• Makefile (modified) (2 diffs)
• cu2netcdf.c (modified) (3 diffs)
• test/README (added)
• test/in.nc (deleted)
• test/in.ncd (deleted)
• test/pe.nc (added)
• test/pe.pp (added)
• test/pe_temp.nc (added)
• test/testnc.nc (deleted)

IO_handling/trunk/ppio/cu2netcdf/Makefile

@@ -5 +5 @@
 
 # Configuration for Stephen on Hurricane
-#CDAT_SRC = /research/home/spascoe/src/cpdn/cdunifpp/cdat-4.0b3
-#NETCDF_INC = /usr/local/include
-#NETCDF_LIB = /usr/local/lib
+CDAT_SRC = /research/home/spascoe/src/cpdn/cdunifpp/cdat-4.0b3
+NETCDF_INC = /usr/local/include
+NETCDF_LIB = /usr/local/lib
 
 # Configuration for Stephen's laptop
-CDAT_SRC = /home/spascoe/cvs/IO_handling/ppio/cdat-4.0b3
-NETCDF_INC = /usr/include
-NETCDF_LIB = /usr/lib
+#CDAT_SRC = /home/spascoe/cvs/IO_handling/ppio/cdat-4.0b3
+#NETCDF_INC = /usr/include
+#NETCDF_LIB = /usr/lib
+
+
+## Set flags according to taste:
+# DEBUG = error messages with file context
+# NC3 = use netcdf3 API rather than netcdf2
+# DMALLOC_INC = include dmalloc.h
+#CPP_FLAGS = -DDEBUG -DNC3 -DDMALLOC_INC
+CPP_FLAGS = -DDEBUG
+
+#############################################################################
 
 LIBCDMS= $(CDAT_SRC)/libcdms/lib
 #LIBCDMS = /usr/local/cdat-4.0b/lib
+
 
 INCLUDES = -I$(CDAT_SRC)/libcdms/include -I$(NETCDF_INC) -I$(HOME)/include
@@ -26 +37 @@
 
 cu2netcdf.o: cu2netcdf.c
-        gcc -c -g $(INCLUDES) -o cu2netcdf.o cu2netcdf.c
+        gcc -c -g $(INCLUDES) $(CPP_FLAGS) -o cu2netcdf.o cu2netcdf.c
 
 

IO_handling/trunk/ppio/cu2netcdf/cu2netcdf.c

@@ -11 +11 @@
 #include "cdunif.h"
 
-#define DEBUG
-#define NC3
 /* Maximum array size copied between variables at one time. */
 #define VARCHUNK_MAX 0xffffff
@@ -22 +20 @@
 #define ERROR(msg) \
   (fprintf(stderr, __FILE__ ":%d:%s\n", __LINE__, msg), abort()) 
-//#include "dmalloc.h"
 #else
 #define ERROR(msg) (fprintf(stderr, "Error: %s\n", msg), exit(1))
+#endif
+
+#ifdef DMALLOC_INC
+#include "dmalloc.h"
 #endif
 
@@ -225 +226 @@
   }
 #else
-  if ((nc_status=ncattput(c->outfileid, outvarid, attname, atttype, attlen,
+  if ((nc_status=ncattput(c->outfileid, outvarid, attname, cutype2nctype(atttype), attlen,
                           (void *)attval)) == -1)
     ERROR("ncattput failed");