Commit 1d23bdab authored by Marc Howison's avatar Marc Howison

1.6 release: moved 1.5 to 1.6; copied 1.6 to tags/H5Part-1.6.0; copied 1.6 to 1.7

parent 0de2f00b
......@@ -89,56 +89,3 @@ tools/README -text
tools/h5pAttrib.cc -text
tools/h5pToGNUplot.cc -text
tools/homdynToH5p.cc -text
visit_plugins/databases/H5Part/.depend -text
visit_plugins/databases/H5Part/Makefile -text
visit_plugins/databases/H5Part/README.txt -text
visit_plugins/databases/H5Part/avth5partFileFormat.C -text
visit_plugins/databases/H5Part/avth5partFileFormat.h -text
visit_plugins/databases/H5Part/h5part.xml -text
visit_plugins/databases/H5Part/h5partCommonPluginInfo.C -text
visit_plugins/databases/H5Part/h5partEnginePluginInfo.C -text
visit_plugins/databases/H5Part/h5partMDServerPluginInfo.C -text
visit_plugins/databases/H5Part/h5partPluginInfo.C -text
visit_plugins/databases/H5Part/h5partPluginInfo.h -text
visit_plugins/operators/BinnerFilter/.depend -text
visit_plugins/operators/BinnerFilter/Binner.xml -text
visit_plugins/operators/BinnerFilter/BinnerCommonPluginInfo.C -text
visit_plugins/operators/BinnerFilter/BinnerEnginePluginInfo.C -text
visit_plugins/operators/BinnerFilter/BinnerFilter.C -text
visit_plugins/operators/BinnerFilter/BinnerFilter.h -text
visit_plugins/operators/BinnerFilter/BinnerFilter.java -text
visit_plugins/operators/BinnerFilter/BinnerGUIPluginInfo.C -text
visit_plugins/operators/BinnerFilter/BinnerMakefile -text
visit_plugins/operators/BinnerFilter/BinnerPluginInfo.C -text
visit_plugins/operators/BinnerFilter/BinnerPluginInfo.h -text
visit_plugins/operators/BinnerFilter/BinnerScriptingPluginInfo.C -text
visit_plugins/operators/BinnerFilter/BinnerViewerPluginInfo.C -text
visit_plugins/operators/BinnerFilter/Binnerreplace.txt -text
visit_plugins/operators/BinnerFilter/Makefile -text
visit_plugins/operators/BinnerFilter/PyBinner.C -text
visit_plugins/operators/BinnerFilter/PyBinner.h -text
visit_plugins/operators/BinnerFilter/QvisBinnerWindow.C -text
visit_plugins/operators/BinnerFilter/QvisBinnerWindow.h -text
visit_plugins/operators/BinnerFilter/avtBinnerFilter.C -text
visit_plugins/operators/BinnerFilter/avtBinnerFilter.h -text
visit_plugins/operators/BinnerFilter/icon.xpm -text
visit_plugins/operators/RandomSample/.depend -text
visit_plugins/operators/RandomSample/H5PartRandomSampleAttributes.C -text
visit_plugins/operators/RandomSample/H5PartRandomSampleAttributes.h -text
visit_plugins/operators/RandomSample/H5PartRandomSampleAttributes.java -text
visit_plugins/operators/RandomSample/H5PartRandomSampleCommonPluginInfo.C -text
visit_plugins/operators/RandomSample/H5PartRandomSampleEnginePluginInfo.C -text
visit_plugins/operators/RandomSample/H5PartRandomSampleGUIPluginInfo.C -text
visit_plugins/operators/RandomSample/H5PartRandomSamplePluginInfo.C -text
visit_plugins/operators/RandomSample/H5PartRandomSamplePluginInfo.h -text
visit_plugins/operators/RandomSample/H5PartRandomSampleScriptingPluginInfo.C -text
visit_plugins/operators/RandomSample/H5PartRandomSampleViewerPluginInfo.C -text
visit_plugins/operators/RandomSample/Makefile -text
visit_plugins/operators/RandomSample/PyH5PartRandomSampleAttributes.C -text
visit_plugins/operators/RandomSample/PyH5PartRandomSampleAttributes.h -text
visit_plugins/operators/RandomSample/QvisH5PartRandomSampleWindow.C -text
visit_plugins/operators/RandomSample/QvisH5PartRandomSampleWindow.h -text
visit_plugins/operators/RandomSample/RandomSample.xml -text
visit_plugins/operators/RandomSample/avtH5PartRandomSampleFilter.C -text
visit_plugins/operators/RandomSample/avtH5PartRandomSampleFilter.h -text
visit_plugins/operators/RandomSample/icon.xpm -text
/* config.h.in. Generated from configure.ac by autoheader. */
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
/* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* "" */
#undef MY_BUILD_CPU
......@@ -33,12 +60,40 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
/* Version number of package */
#undef VERSION
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
/* Define to 1 if on AIX 3.
System headers sometimes define this.
We just want to avoid a redefinition error message. */
/* Enable extensions on AIX 3, Interix. */
#ifndef _ALL_SOURCE
# undef _ALL_SOURCE
#endif
/* Enable GNU extensions on systems that have them. */
#ifndef _GNU_SOURCE
# undef _GNU_SOURCE
#endif
/* Enable threading extensions on Solaris. */
#ifndef _POSIX_PTHREAD_SEMANTICS
# undef _POSIX_PTHREAD_SEMANTICS
#endif
/* Enable extensions on HP NonStop. */
#ifndef _TANDEM_SOURCE
# undef _TANDEM_SOURCE
#endif
/* Enable general extensions on Solaris. */
#ifndef __EXTENSIONS__
# undef __EXTENSIONS__
#endif
/* Version number of package */
#undef VERSION
/* Define to 1 if on MINIX. */
#undef _MINIX
/* Define to 2 if the system does not provide POSIX.1 features except with
this defined. */
#undef _POSIX_1_SOURCE
/* Define to 1 if you need to in order for `stat' and other things to work. */
#undef _POSIX_SOURCE
# Every configure script must call AC_INIT before doing anything else.
# AC_INIT (package, version, [bug-report], [tarname])
AC_INIT([H5Part], [1.5], [h5part@lists.psi.ch], H5Part)
AC_INIT([H5Part], [1.6.0], [h5part@lists.psi.ch], H5Part)
# Ensure that a recent enough version of Autoconf is being used.
......
......@@ -4,7 +4,7 @@
# Project related configuration options
#---------------------------------------------------------------------------
PROJECT_NAME = H5Part
PROJECT_NUMBER = 1.5
PROJECT_NUMBER = 1.6.0
OUTPUT_DIRECTORY = ./ReferencePages
CREATE_SUBDIRS = NO
OUTPUT_LANGUAGE = English
......
......@@ -16,9 +16,9 @@ extern "C" {
#include "H5MultiBlock.h"
#endif
#define H5PART_VER_STRING "1.5.0"
#define H5PART_VER_STRING "1.6.0"
#define H5PART_VER_MAJOR 1
#define H5PART_VER_MINOR 5
#define H5PART_VER_MINOR 6
#define H5PART_VER_RELEASE 0
/* error values */
......
This diff is collapsed.
##
## Programs and options...
##
TOPDIR=/usr/local/visit/visit-1.5.1/1.5.1/linux-x86_64/
include $(TOPDIR)/include/make-variables
TOPDIR=/usr/local/visit/visit-1.5.1/1.5.1/linux-x86_64/
HOMEPLUGINS=/d/visusers/cristina/.visit/linux-x86_64/plugins
##
## Libraries and includes...
##
VTK_INCLUDE= \
-I$(TOPDIR)/include/vtk \
-I$(TOPDIR)/include/vtk/Common \
-I$(TOPDIR)/include/vtk/Filtering \
-I$(TOPDIR)/include/vtk/Graphics \
-I$(TOPDIR)/include/vtk/Hybrid \
-I$(TOPDIR)/include/vtk/IO \
-I$(TOPDIR)/include/vtk/Imaging \
-I$(TOPDIR)/include/vtk/Rendering
MOC=$(TOPDIR)/bin/moc
CXXFLAGS=$(CXXFLAGSORIG) -I/usr/local/hdf5/include -I/d/visusers/cristina/H5Part/H5ecloud
CPPFLAGS=$(CPPFLAGSORIG) $(VTK_INCLUDE) -I. -I/usr/local/hdf5/include -I/d/visusers/cristina/H5Part/H5ecloud -I$(TOPDIR)/include -I$(TOPDIR)/include/visit
LDFLAGS=$(LDFLAGSORIG) -L$(HOMEPLUGINS)/databases
##
## Files...
##
PLUGINDIR=databases
PLUGINNAME=h5partDatabase
WIDGETS=
ISRC=h5partPluginInfo.C
COMMONSRC=h5partPluginInfo.C h5partCommonPluginInfo.C
MSRC=h5partMDServerPluginInfo.C avth5partFileFormat.C
ESRC=h5partEnginePluginInfo.C avth5partFileFormat.C
SRC=$(ISRC) $(COMMONSRC) $(MSRC) $(ESRC)
SHLIB_FORCED=-L/d/visusers/cristina/H5Part/H5ecloud/ -lH5Part
ELIBS_FOR_MACOSX_PREBINDING=$(BZIP2_LIBS)
MLIBS_FOR_MACOSX_PREBINDING=$(BZIP2_LIBS)
ILIBS=
MLIBS=-lpipeline_ser -ldatabase_ser -lmir_ser -lavtmath_ser -ldbatts -lavtexceptions -lstate -lcomm -lmisc -lexpr -lparser -lplugin -lutility -lvisit_vtk -llightweight_visit_vtk -L$(HOMEPLUGINS)/databases -lI$(PLUGINNAME) $(MLIBS_FOR_MACOSX_PREBINDING) $(VTK_LIBS)
ESERLIBS=-lpipeline_ser -ldatabase_ser -lmir_ser -lavtmath_ser -ldbatts -lavtexceptions -lstate -lcomm -lmisc -lexpr -lparser -lplugin -lutility -lvisit_vtk -llightweight_visit_vtk -L$(HOMEPLUGINS)/databases -lI$(PLUGINNAME) $(ELIBS_FOR_MACOSX_PREBINDING) $(VTK_LIBS)
EPARLIBS=-lpipeline_par -ldatabase_par -lmir_par -lavtmath_par -ldbatts -lavtexceptions -lstate -lcomm -lmisc -lexpr -lparser -lplugin -lutility -lvisit_vtk -llightweight_visit_vtk -L$(HOMEPLUGINS)/databases -lI$(PLUGINNAME) $(ELIBS_FOR_MACOSX_PREBINDING) $(VTK_LIBS) $(SHLIB_MPI_LIBS)
IDSO=$(HOMEPLUGINS)/databases/libIh5partDatabase.so
MDSO=$(HOMEPLUGINS)/databases/libMh5partDatabase.so
ESERDSO=$(HOMEPLUGINS)/databases/libEh5partDatabase_ser.so
EPARDSO=$(HOMEPLUGINS)/databases/libEh5partDatabase_par.so
DISTRIB=
##
## Derived objects
##
IOBJ=$(ISRC:.C=.o)
GOBJ=$(COMMONSRC:.C=.o) $(GSRC:.C=.o)
SOBJ=$(COMMONSRC:.C=.o) $(SSRC:.C=.o)
VOBJ=$(COMMONSRC:.C=.o) $(VSRC:.C=.o)
MOBJ=$(COMMONSRC:.C=.o) $(MSRC:.C=.o) $(MSPECIFICSRC:.C=_mds.o)
ESEROBJ=$(COMMONSRC:.C=.o) $(ESRC:.C=.o)
EPAROBJ=$(COMMONSRC:.C=.o) $(ESRC:.C=_par.o)
MOCSRC = $(WIDGETS:.h=_moc.C)
MOCOBJ = $(MOCSRC:.C=.o)
##
## Standard targets...
##
all: message $(IDSO) $(MDSERVERLIB) $(ENGINELIBSER) $(ENGINELIBPAR)
clean:
$(RM) $(IOBJ) $(COMMONOBJ)
$(RM) $(GOBJ) $(SOBJ) $(VOBJ) $(MOBJ) $(ESEROBJ) $(EPAROBJ)
$(RM) $(MOCSRC) $(MOCOBJ)
$(RM) $(IDSO) $(GDSO) $(SDSO) $(VDSO) $(MDSO) $(ESERDSO) $(EPARDSO)
$(RM) $(JAVAOBJ)
##
## Other targets...
##
message:
@echo
@echo "****************************************************************************"
@echo "*** Building h5part Database Plugin"
@echo "****************************************************************************"
##
## moc
##
$(MOCSRC) or_no_widgets: $(WIDGETS)
@rm -f $@
$(MOC) $(@:_moc.C=.h) > $@
##
## Automatic dependency stuff
##
include $(TOPDIR)/include/make-targets
Reading H5Part data into VisIt:
VisIt, http://www.llnl.gov/visit, is an open source point-and-click 3D scientific visualization application that supports most of the common visualization techniques on structured and unstructured grids. One of its advantages is that it employs a distributed and parallel architecture in order to handle extremely large data sets interactively. VisIt's rendering and data processing capabilities are split into viewer and engine components that may be distributed across multiple machines.
This database plugins allows the user to read H5Part data into VisIt. To be recognized by VisIt the filename needs to have the extension ".h5part". This is important, otherwise VisIt will try to open the file with another reader and it will fail.
Building the plugin:
You must first install VisIt in your machine to be able to link to its libraries.
Modify the Makefile to reflect your installation.
TOPDIR is the path to the VisIt Distribution installation.
HOMEPLUGINS is the path to your home dir .visit plugin directory. Create it if not there.
SHLIB_FORCED is the path to your H5Part. I made H5Part statically linked to the hdf5 library, if you don't, add your -L/hdf5librarypath -lhdf5
Modify the location of the hdf5 include and the H5Part library.
If compiling a parallel version add -DPARALLEL_IO to the CXXFLAGS and CPPFLAGS.
Note: TOPDIR is defined twice because in make-variables it is defined by the VisIt developers to be in one of their machines.
This diff is collapsed.
// ************************************************************************* //
// avth5partFileFormat.h //
// ************************************************************************* //
#ifndef AVT_h5part_FILE_FORMAT_H
#define AVT_h5part_FILE_FORMAT_H
#include <avtMTMDFileFormat.h>
#include <H5Part.h>
#include <vector>
#include <string>
// ****************************************************************************
// Class: avth5partFileFormat
//
// Purpose:
// Reads in h5part files as a plugin to VisIt.
//
// Programmer: cristina -- generated by xml2avt
// Creation: Mon Feb 27 13:53:31 PST 2006
//
// ****************************************************************************
class avth5partFileFormat : public avtMTMDFileFormat
{
public:
avth5partFileFormat(const char *);
virtual ~avth5partFileFormat() {;};
//
// This is used to return unconvention data -- ranging from material
// information to information about block connectivity.
//
// virtual void *GetAuxiliaryData(const char *var, const char *type,
// int timestep, int domain,void *args,
// DestructorFunction &);
//
//
// If you know the times and cycle numbers, overload this function.
// Otherwise, VisIt will make up some reasonable ones for you.
//
// virtual void GetCycles(std::vector<int> &);
// virtual void GetTimes(std::vector<double> &);
//
virtual int GetNTimesteps(void);
virtual const char *GetType(void) { return "h5part"; };
virtual void FreeUpResources(void);
virtual vtkDataSet *GetMesh(int, int, const char *);
virtual vtkDataArray *GetVar(int, int, const char *);
virtual vtkDataArray *GetVectorVar(int, int, const char *);
protected:
// DATA MEMBERS
virtual void PopulateDatabaseMetaData(avtDatabaseMetaData *, int);
std::string fname; //filename
std::vector<float> points; //point coordinates
std::vector<std::vector<float> > pointvars; //point variables
std::vector<std::string> pointvarnames; //point variables' names
std::vector<float> minExtents; //min extents
std::vector<float> maxExtents; //max extents
};
#endif
<?xml version="1.0"?>
<Plugin name="h5part" type="database" label="h5part" version="1.0" enabled="true" mdspecificcode="false" onlyengine="false" noengine="false" dbtype="MTMD" haswriter="false" hasoptions="false">
<CXXFLAGS>
-I/usr/local/hdf5/include
</CXXFLAGS>
<LIBS>
-L/d/visusers/cristina/H5Part/H5ecloud/ -lH5Part
</LIBS>
<Extensions>
h5part
</Extensions>
<Attribute name="" purpose="" persistent="true" exportAPI="" exportInclude="">
</Attribute>
</Plugin>
#include <h5partPluginInfo.h>
#include <avth5partFileFormat.h>
#include <avtMTMDFileFormatInterface.h>
#include <avtGenericDatabase.h>
// ****************************************************************************
// Method: h5partCommonPluginInfo::GetDatabaseType
//
// Purpose:
// Returns the type of a h5part database.
//
// Programmer: cristina -- generated by xml2info
// Creation: Mon Feb 27 13:53:31 PST 2006
//
// ****************************************************************************
DatabaseType
h5partCommonPluginInfo::GetDatabaseType()
{
return DB_TYPE_MTMD;
}
// ****************************************************************************
// Method: h5partCommonPluginInfo::GetDefaultExtensions
//
// Purpose:
// Returns the default extensions for a h5part database.
//
// Programmer: cristina -- generated by xml2info
// Creation: Mon Feb 27 13:53:31 PST 2006
//
// ****************************************************************************
std::vector<std::string>
h5partCommonPluginInfo::GetDefaultExtensions()
{
std::vector<std::string> defaultExtensions;
defaultExtensions.push_back("h5part");
return defaultExtensions;
}
// ****************************************************************************
// Method: h5partCommonPluginInfo::Setuh5partDatabase
//
// Purpose:
// Sets up a h5part database.
//
// Arguments:
// list A list of file names.
// nList The number of timesteps in list.
// nBlocks The number of blocks in the list.
//
// Returns: A h5part database from list.
//
// Programmer: cristina -- generated by xml2info
// Creation: Mon Feb 27 13:53:31 PST 2006
//
// ****************************************************************************
avtDatabase *
h5partCommonPluginInfo::SetupDatabase(const char *const *list,
int nList, int nBlock)
{
return new avtGenericDatabase(
new avtMTMDFileFormatInterface(
new avth5partFileFormat(list[0])));
}
#include <h5partPluginInfo.h>
#if defined(__APPLE__)
#define GetEngineInfo h5part_GetEngineInfo
#endif
// ****************************************************************************
// Function: GetEngineInfo
//
// Purpose:
// Return a new EnginePluginInfo for the h5part database.
//
// Programmer: cristina -- generated by xml2info
// Creation: Thu Mar 9 09:51:18 PDT 2006
//
// ****************************************************************************
extern "C" EngineDatabasePluginInfo* GetEngineInfo()
{
return new h5partEnginePluginInfo;
}
// ****************************************************************************
// Method: h5partCommonPluginInfo::GetWriter
//
// Purpose:
// Sets up a h5part writer.
//
// Returns: A h5part writer.
//
// Programmer: cristina -- generated by xml2info
// Creation: Thu Mar 9 09:51:18 PDT 2006
//
// ****************************************************************************
avtDatabaseWriter *
h5partEnginePluginInfo::GetWriter(void)
{
return NULL;
}
#include <h5partPluginInfo.h>
#if defined(__APPLE__)
#define GetMDServerInfo h5part_GetMDServerInfo
#endif
// ****************************************************************************
// Function: GetMDServerInfo
//
// Purpose:
// Return a new MDServerPluginInfo for the h5part database.
//
// Programmer: cristina -- generated by xml2info
// Creation: Thu Mar 9 09:51:18 PDT 2006
//
// ****************************************************************************
extern "C" MDServerDatabasePluginInfo* GetMDServerInfo()
{
return new h5partMDServerPluginInfo;
}
// this makes compilers happy... remove if we ever have functions here
void h5partMDServerPluginInfo::dummy()
{
}
// ************************************************************************* //
// File: h5partPluginInfo.C
// ************************************************************************* //
#include <h5partPluginInfo.h>
#include <visit-config.h>
#if defined(__APPLE__)
extern "C" const char *h5partVisItPluginVersion = VERSION;
#else
extern "C" const char *VisItPluginVersion = VERSION;
#endif
#if defined(__APPLE__)
#define GetGeneralInfo h5part_GetGeneralInfo
#endif
// ****************************************************************************
// Function: GetGeneralInfo
//
// Purpose:
// Return a new GeneralPluginInfo for the h5part database.
//
// Programmer: cristina -- generated by xml2info
// Creation: Thu Mar 9 09:51:18 PDT 2006
//
// ****************************************************************************
extern "C" GeneralDatabasePluginInfo* GetGeneralInfo()
{
return new h5partGeneralPluginInfo;
}
// ****************************************************************************
// Method: h5partGeneralPluginInfo::GetName
//
// Purpose:
// Return the name of the database plugin.
//
// Returns: A pointer to the name of the database plugin.
//
// Programmer: cristina -- generated by xml2info
// Creation: Thu Mar 9 09:51:18 PDT 2006
//
// ****************************************************************************
char *
h5partGeneralPluginInfo::GetName() const
{
return "h5part";
}
// ****************************************************************************
// Method: h5partGeneralPluginInfo::GetVersion
//
// Purpose:
// Return the version of the database plugin.
//
// Returns: A pointer to the version of the database plugin.
//
// Programmer: cristina -- generated by xml2info
// Creation: Thu Mar 9 09:51:18 PDT 2006
//
// ****************************************************************************
char *
h5partGeneralPluginInfo::GetVersion() const
{
return "1.0";
}
// ****************************************************************************
// Method: h5partGeneralPluginInfo::GetID
//
// Purpose:
// Return the id of the database plugin.
//
// Returns: A pointer to the id of the database plugin.
//
// Programmer: cristina -- generated by xml2info
// Creation: Thu Mar 9 09:51:18 PDT 2006
//
// ****************************************************************************
char *
h5partGeneralPluginInfo::GetID() const
{
return "h5part_1.0";
}
// ****************************************************************************
// Method: h5partGeneralPluginInfo::EnabledByDefault
//
// Purpose:
// Return true if this plugin should be enabled by default; false otherwise.
//
// Returns: true/false
//
// Programmer: cristina -- generated by xml2info
// Creation: Thu Mar 9 09:51:18 PDT 2006
//
// ****************************************************************************
bool
h5partGeneralPluginInfo::EnabledByDefault() const
{
return true;
}
// ****************************************************************************
// Method: h5partGeneralPluginInfo::HasWriter
//
// Purpose:
// Return true if this plugin has a database writer.
//
// Returns: true/false
//
// Programmer: cristina -- generated by xml2info
// Creation: Thu Mar 9 09:51:18 PDT 2006
//
// ****************************************************************************
bool
h5partGeneralPluginInfo::HasWriter() const
{
return false;
}
// ****************************************************************************
// h5partPluginInfo.h
// ****************************************************************************
#ifndef H5PART_PLUGIN_INFO_H
#define H5PART_PLUGIN_INFO_H
#include <DatabasePluginInfo.h>
#include <database_plugin_exports.h>
class avtDatabase;
class avtDatabaseWriter;
// ****************************************************************************
// Class: h5partDatabasePluginInfo
//
// Purpose:
// Classes that provide all the information about the h5part plugin.
// Portions are separated into pieces relevant to the appropriate
// components of VisIt.
//
// Programmer: cristina -- generated by xml2info
// Creation: Thu Mar 9 09:51:18 PDT 2006
//
// Modifications:
//
// ****************************************************************************
class h5partGeneralPluginInfo : public virtual GeneralDatabasePluginInfo