From 8862acd04f1f7f854baf94eac26586fd4721e06b Mon Sep 17 00:00:00 2001 From: Andreas Adelmann Date: Thu, 11 Aug 2011 15:51:02 +0000 Subject: [PATCH] fixes ... --- tools/Makefile.am | 2 +- tools/h5PartDcToVtk.cc | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 3f4f998..4b32301 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -2,7 +2,7 @@ OBJEXT=o -AM_LDFLAGS = -L../src/lib @LFLAGS@ +AM_LDFLAGS = -L../src/lib @LDFLAGS@ LIBS = -lH5hutC -lH5hut @LIBS@ INCLUDES = -I../src/include @INCLUDES@ diff --git a/tools/h5PartDcToVtk.cc b/tools/h5PartDcToVtk.cc index 3329364..00d0703 100755 --- a/tools/h5PartDcToVtk.cc +++ b/tools/h5PartDcToVtk.cc @@ -312,7 +312,7 @@ int main(int argc, const char *argv[]) string ifn = string(input_name) + string(".h5"); - h5file = H5OpenFile(ifn.c_str(), H5_O_WRONLY); + h5file = H5OpenFile(ifn.c_str(), H5_O_WRONLY, NULL); if( h5file == NULL ) { fprintf(stdout, "unable to open file %s\n", input_name); @@ -339,8 +339,8 @@ int main(int argc, const char *argv[]) H5SetStep(h5file, ntime_step-1); - num_dataset = H5GetNumDatasets(h5file); - h5_int64_t nparticles = H5GetNumParticles(h5file); + num_dataset = H5PartGetNumDatasets(h5file); + h5_int64_t nparticles = H5PartGetNumParticles(h5file); h5_int64_t* larray = (h5_int64_t*)malloc(sizeof(h5_int64_t)*nparticles); H5PartReadDataInt64(h5file, "id", larray); @@ -483,8 +483,8 @@ int main(int argc, const char *argv[]) //h5_float64_t Etmp=0.0;//new //int var_readE=H5PartReadStepAttrib(h5file,s_name,&Etmp);//new //num_dataset = H5PartGetNumDatasets(h5file);//new - num_dataset = H5GetNumDatasets(h5file); - h5_int64_t nparticles = H5GetNumParticles(h5file); + num_dataset = H5PartGetNumDatasets(h5file); + h5_int64_t nparticles = H5PartGetNumParticles(h5file); //Etmp = (Etmp - 0.51099906)*1000000.0;//new eV //ofenergy<