updated h5_lustre.c to user new macros; changed library targets to ../lib/lib*.a to avoid the mv and mkdir hacks in Makefile.am; fixed problem in h5u_test with H5PartSetViewIndices; OPEN BUG with h5u_test for >1 MPI task (strange pthread setfault?)

test/H5Fed/Makefile.am

@@ -2,15 +2,6 @@
 
 OBJEXT = o
 
-# COMPILER SETTING
-CC = @CC@
-CXX = @CXX@
-FC = @FC@
-
-# COMPILER FLAG SETTING
-AM_CFLAGS = @CFLAGS@
-FFLAGS = @FFLAGS@
-
 AM_LDFLAGS = -L../../src/lib @LDFLAGS@
 LIBS = -lH5hutC -lH5hut @LIBS@
 INCLUDES = -I../../src/include @INCLUDES@
@@ -35,7 +26,7 @@ EXTRA_DIST =					\
 		tetmesh_adjacencies.c		\
 		tetmesh_read.c			\
 		tetmesh_read_tags.c		\
-g		tetmesh_write.c			\
+		tetmesh_write.c			\
 		tetmesh_write2.c		\
 		tetmesh_write_tags.c		\
 		trimesh_adjacencies.c		\
@@ -47,8 +38,6 @@ g		tetmesh_write.c			\
 #		map_triangle2globalid.c \
 #		$(bin_SCRIPTS)
 
-all:	$(noinst_PROGRAMS)
-
 clean: clean-am
 	rm -f *.h5
 

test/H5Part/Bench.c

@@ -10,7 +10,7 @@
 #endif
 
 #ifndef DISABLE_H5PART
-#include "H5Part.h"
+#include "H5hut.h"
 #endif
 
 #define FILENAME "testio"
@@ -217,7 +217,7 @@ int main(int argc,char *argv[]){
     if(rank==0) unlink(filename);
     MPI_Barrier(MPI_COMM_WORLD); /* to prevent unlink from interfering with file open */
 
-    f = H5PartOpenFileParallel(filename,H5PART_WRITE,MPI_COMM_WORLD);
+    f = H5OpenFile(filename,H5_O_WRONLY,MPI_COMM_WORLD);
     MPI_Barrier(MPI_COMM_WORLD); /* to prevent unlink from interfering with file open */
     /* start the timer */
     starttime=endtime=MPI_Wtime();
@@ -228,7 +228,7 @@ int main(int argc,char *argv[]){
 	for(n=0;n<localnp;n++)
 	  (data[j])[n]=(double)rank;
       }
-      H5PartSetStep(f,i);
+      H5SetStep(f,i);
       H5PartWriteDataFloat64(f,"x",x);
       H5PartWriteDataFloat64(f,"y",y);
       H5PartWriteDataFloat64(f,"z",z);
@@ -239,7 +239,7 @@ int main(int argc,char *argv[]){
       curtime=MPI_Wtime(); /* ensure no race condition by broadcasting time */
       MPI_Bcast(&curtime,1,MPI_DOUBLE,0,MPI_COMM_WORLD);
     }
-    H5PartCloseFile(f);
+    H5CloseFile(f);
     MPI_Barrier(MPI_COMM_WORLD);
     endtime=MPI_Wtime();
     if(rank==0){

test/Makefile.am

@@ -1,10 +1,11 @@
 # test level Makefile.am
 
 #SUBDIRS = H5Block H5Fed H5Part
+SUBDIRS = H5Fed
 
 OBJEXT=o
 
-AM_LDFLAGS = -L../src/h5core -L../src/C @LDFLAGS@
+AM_LDFLAGS = -L../src/lib @LDFLAGS@
 LIBS = -lH5hutC -lH5hut @LIBS@
 
 INCLUDES = -I../src/include @INCLUDES@
@@ -25,8 +26,8 @@ h5u_test_SOURCES =	\
 		params.h
 
 h5u_test_DEPENDENCIES = \
-		../src/h5core/libH5hut.a \
-		../src/C/libH5hutC.a
+		../src/lib/libH5hut.a \
+		../src/lib/libH5hutC.a
 
 h5b_test_SOURCES =	\
 		h5b_test.c \
@@ -37,8 +38,8 @@ h5b_test_SOURCES =	\
 		params.h
 
 h5b_test_DEPENDENCIES = \
-		../src/h5core/libH5hut.a \
-		../src/C/libH5hutC.a
+		../src/lib/libH5hut.a \
+		../src/lib/libH5hutC.a
 
 clean: clean-am
 	rm -f *.h5

test/h5u_read.c

@@ -96,7 +96,7 @@ test_read_data64(h5_file_t *file, int nparticles, int step)
         h5_int64_t val, start, end, type;
 	char name1[4];
 	char name2[8];
-	h5_id_t indices[8];
+	h5_size_t indices[8];
         h5_size_t size;
 
 	double *x,*y,*z;
@@ -212,9 +212,10 @@ test_read_data64(h5_file_t *file, int nparticles, int step)
 		val = H5PartGetNumParticles(file);
 		IVALUE(val, 4, "particle count");
 
+                x[3] = 0;
 		status = H5PartReadDataFloat64(file, "x", x);
 		RETURN(status, H5_SUCCESS, "H5PartReadDataFloat64");
-		FVALUE(x[2], (double)(rank*2+9+nparticles*t), "x data");
+		FVALUE(x[3], (double)(rank*2+3+nparticles*t), "x data");
 
 		val = H5PartGetNumParticles(file);
 		IVALUE(val, 4, "particle count");
@@ -330,7 +331,7 @@ test_read_data32(h5_file_t *file, int nparticles, int step)
 	px=(float*)malloc(nparticles*sizeof(float));
 	py=(float*)malloc(nparticles*sizeof(float));
 	pz=(float*)malloc(nparticles*sizeof(float));
-	id=(int*)malloc(nparticles*sizeof(int));
+	id=(h5_int32_t*)malloc(nparticles*sizeof(h5_int32_t));
 
 	TEST("Reading 32-bit data");
 
@@ -365,7 +366,7 @@ test_read_data32(h5_file_t *file, int nparticles, int step)
 		status = H5PartReadDataFloat32(file, "pz", pz);
 		RETURN(status, H5_SUCCESS, "H5PartReadDataFloat32");
 		
-		status = H5PartReadDataInt32(file, LONGNAME, id);
+		status = H5PartReadDataInt32(file, LONGNAME2, id);
 		RETURN(status, H5_SUCCESS, "H5PartReadDataInt32");
 
 		for (i=0; i<nparticles; i++)

test/h5u_write.c

@@ -278,7 +278,7 @@ test_write_data32(h5_file_t *file, int nparticles, int step)
 		status = H5PartWriteDataFloat32(file, "pz", pz);
 		RETURN(status, H5_SUCCESS, "H5PartWriteDataFloat32");
 		
-		status = H5PartWriteDataInt32(file, LONGNAME, id);
+		status = H5PartWriteDataInt32(file, LONGNAME2, id);
 		RETURN(status, H5_SUCCESS, "H5PartWriteDataInt32");
 
 		/* the second write phase... */

test/params.h

@@ -3,6 +3,7 @@
 
 #define FILENAME "test.h5"
 #define LONGNAME "thisisaverylongnamethatshouldexceedthelimitof64charcausingawarningtoprint"
+#define LONGNAME2 "thisisaverylongnamethatshouldexceedthelimitof64charcausingawarni"
 #define NTIMESTEPS 10
 
 /* do not decrease this value below 99, or it will break assumptions