Commit 84b5cbba authored by bonnell's avatar bonnell
Browse files

fix extra object deletion in NETCDF reader

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@8825 18c085ea-50e0-402c-830e-de6fd14e8384
parent 303b6616
##
## Set the VISITHOME environment variable.
##
VISITHOME=/usr/gapps/visit
VISITARCH=linux_rhel4_gcc_3.4.6
##
## If MESA is not set, use VisIt's mesa.
##
if test -z "$MESA"; then
MESA=$VISITHOME/mesa/7.5/$VISITARCH
fi
##
## If VTK is not set, use VisIt's vtk.
##
if test -z "$VTK"; then
VTK=$VISITHOME/vtk/5.0.0c-mesa-7.5/$VISITARCH
fi
##
## Use VisIt's Qt.
##
QT_VER=4.4.3
QT_BIN=$VISITHOME/qt/$QT_VER/$VISITARCH/bin
QT_INCLUDE=$VISITHOME/qt/$QT_VER/$VISITARCH/include
QT_LIB=$VISITHOME/qt/$QT_VER/$VISITARCH/lib
##
## Use VisIt's Python.
##
PYDIR=$VISITHOME/python/2.5/$VISITARCH
PYVERSION=python2.5
##
## Tell VisIt where to find cmake in case we want to build slivr.
##
DEFAULT_CMAKE=$VISITHOME/cmake/2.4.5/$VISITARCH/bin/cmake
##
## Turn off warnings for deprecated features.
##
CXXFLAGS="-Wno-deprecated $CXXFLAGS"
##
## Add parallel arguments.
##
LDFLAGS="-L/misc/gapps/mpich/1.2.4/Linux/serial/64/debug/lib $LDFLAGS"
CPPFLAGS="-I/misc/gapps/mpich/1.2.4/Linux/serial/64/debug/include $CPPFLAGS"
MPI_LIBS="-lmpich"
##
## If enable_viewer_mesa_stub in not set, then disable it.
##
if test -z "$enable_viewer_mesa_stub"; then
enable_viewer_mesa_stub=no
fi
##
## Database reader plugin support libraries
##
###############################################################################
##
## Boxlib
##
DEFAULT_BOXLIB2D_INCLUDE=$VISITHOME/boxlib/$VISITARCH/include/2D
DEFAULT_BOXLIB2D_LIBS=$VISITHOME/boxlib/$VISITARCH/lib
DEFAULT_BOXLIB3D_INCLUDE=$VISITHOME/boxlib/$VISITARCH/include/3D
DEFAULT_BOXLIB3D_LIBS=$VISITHOME/boxlib/$VISITARCH/lib
##
## CFITSIO
##
DEFAULT_CFITSIO_INCLUDE=$VISITHOME/cfitsio/3006/$VISITARCH/include
DEFAULT_CFITSIO_LIB=$VISITHOME/cfitsio/3006/$VISITARCH/lib
##
## CGNS
##
DEFAULT_CGNS_INCLUDE=$VISITHOME/cgns/2.4/$VISITARCH/include
DEFAULT_CGNS_LIB=$VISITHOME/cgns/2.4/$VISITARCH/lib
##
## Exodus
##
DEFAULT_EXODUS_INCLUDES=$VISITHOME/exodus/4.46/$VISITARCH/inc
DEFAULT_EXODUS_LIBRARY=$VISITHOME/exodus/4.46/$VISITARCH/lib
##
## GDAL
##
DEFAULT_GDAL_INCLUDE=$VISITHOME/gdal/1.3.2/$VISITARCH/include
DEFAULT_GDAL_LIB=$VISITHOME/gdal/1.3.2/$VISITARCH/lib
##
## H5PART
##
DEFAULT_H5PART_INCLUDE=$VISITHOME/h5part/1.4.0/$VISITARCH/include
DEFAULT_H5PART_LIB=$VISITHOME/h5part/1.4.0/$VISITARCH/lib
##
## HDF4
##
DEFAULT_HDF4_FLAGS=$VISITHOME/hdf4/4.2.1/$VISITARCH/include
DEFAULT_HDF4_LIBS=$VISITHOME/hdf4/4.2.1/$VISITARCH/lib
DEFAULT_SZIP_LIB=$VISITHOME/szip/2.1/$VISITARCH/lib
##
## HDF5 (using the new VAC_ARG_WITH3RD macro)
##
DEFAULT_HDF5_LIBLOC=$VISITHOME/hdf5/1.8.1/$VISITARCH
DEFAULT_HDF5_LIBDEP=-L$VISITHOME/szip/2.1/$VISITARCH/lib,-lsz
##
## Mili
##
MILI_DIR=$VISITHOME/mili/1.10.0/$VISITARCH
##
## netCDF
##
DEFAULT_NETCDF_INCLUDE=$VISITHOME/netcdf/3.6.0/$VISITARCH/include
DEFAULT_NETCDF_LIB=$VISITHOME/netcdf/3.6.0/$VISITARCH/lib
##
## Silo
##
DEFAULT_SILO_LIBLOC=$VISITHOME/silo/4.7/$VISITARCH
DEFAULT_SILO_LIBDEP=-L$DEFAULT_HDF5_LIBLOC/lib,-lhdf5,$DEFAULT_HDF5_LIBDEP
##
## ViSUS
##
##DEFAULT_VISUS_INCLUDE=$VISITHOME/visus/$VISITARCH/include
##DEFAULT_VISUS_LIB=$VISITHOME/visus/$VISITARCH/lib
##
## ITAPS
##
## Because there can often be multiple implementations of the ITAPS interfaces
## we handle ITAPS very differently. The symbol below is a space separated
## string of implementation specifications. In turn, each implementation
## specification is a colon separated string of implementation details. In turn
## each implementation detail is a comma separated string of tokens. The
## format of each implementation specification is as follows...
##
## <impl-base-name>:<ext1>,<ext2>,...:<cflag1>,<cflag2>,...:<lflag1>,<lflag2>,...
##
## note the colon and comma separation of this string.
##
## where
##
## impl-base-name is the base name of the implementation (e.g. GRUMMP).
## Note that the actual plugin name is the concatenation of 'ITAPS_'
## with the impl-base-name (e.g. ITAPS_GRUMMP)
## exti is a filename extension to be associated with the implementation's
## plugin. You can associate as many extensions as you wish but be sure
## to comma separate them.
## cflagi is a flag to pass during the compile phase of the plugin.
## Usually, you use cflag entries to specify include file paths (be
## sure to include the leading '-I' for them). You can specify as many
## cflag entries as you wish but comma separate them.
## lflagi is a flag to pass during the link phase of the plugin. Usually,
## you use lflag entries to specify library file paths (be sure to
## include the leading '-L' for them).
##
## When you are doing development on the ITAPS plugin, as opposed to installing
## it for possibly multiple ITAPS implementations, then use the special
## base-name 'ITAPS_C', along with whatever other entries in the implementation
## specification you need and then just work directly on the source code in
## src/databases/ITAPS_C.
##
#DEFAULT_ITAPS_IMPLS="MOAB:cub,vmesh:-DITAPS_MOAB,-I$VISITHOME/itaps/$VISITARCH/MOAB/include:-L$VISITHOME/itaps/$VISITARCH/MOAB/lib,-liMesh,-lMOAB,$VISITHOME/hdf5/1.6.5/$VISITARCH/libhdf5.a,-L$VISITHOME/netcdf/3.6.0/$VISITARCH/lib,-lnetcdf_c++,-lnetcdf FMDB:sms:-I$VISITHOME/itaps/$VISITARCH/FMDB/include:-L$VISITHOME/itaps/$VISITARCH/FMDB/lib,-lFMDB,-lSCORECModel,-lSCORECUtil GRUMMP:bdry,smesh,vmesh:-I$VISITHOME/itaps/$VISITARCH/GRUMMP/include:-L$VISITHOME/itaps/$VISITARCH/GRUMMP/lib,-liMesh_GRUMMP,-lGR_3D,-lGR_surf,-lGR_2D,-lGR_base,-lSUMAAlog_lite,-lOptMS"
# will be creating links for them.
#DEFAULT_ITAPS_IMPLS="MOAB:cub:-I/usr/gapps/visit/itaps/linux_rhel3_gcc_3.2.3/MOAB.old.hdf5/include:-L/usr/gapps/visit/itaps/linux_rhel3_gcc_3.2.3/MOAB.old.hdf5/lib,-liMesh,-lMOAB,-lhdf5,-lsz,-lz,-L/usr/gapps/visit/netcdf/3.6.0/linux_rhel3_gcc_3.2.3/lib,-lnetcdf_c++,-lnetcdf,-lvtkGraphics FMDB:sms:-I/usr/gapps/visit/itaps/linux_rhel3_gcc_3.2.3/FMDB/include:-L/usr/gapps/visit/itaps/linux_rhel3_gcc_3.2.3/FMDB/lib,-lFMDB,-lSCORECModel,-lSCORECUtil,-lvtkGraphics GRUMMP:bdry,smesh,vmesh:-I/usr/gapps/visit/itaps/linux_rhel3_gcc_3.2.3/GRUMMP/include:-L/usr/gapps/visit/itaps/linux_rhel3_gcc_3.2.3/GRUMMP/lib,-liMesh_GRUMMP,-lGR_3D,-lGR_surf,-lGR_2D,-lGR_base,-lSUMAAlog_lite,-lOptMS,-lvtkGraphics"
##
## CCMIO
##
DEFAULT_CCMIO_INCLUDE=$VISITHOME/ccmio/2.6.1/$VISITARCH/include
DEFAULT_CCMIO_LIB=$VISITHOME/ccmio/2.6.1/$VISITARCH/lib
#DEFAULT_TCMALLOC_DIR=$VISITHOME/google-perftools/0.97/$VISITARCH/lib
......@@ -103,13 +103,15 @@ avtCCSMReader::avtCCSMReader(const char *filename) :
//
// Modifications:
//
// Kathleen Bonnell, Tue Nov 3 11:58:06 PST 2009
// Don't delete fileObject here, base class does it.
//
// ****************************************************************************
avtCCSMReader::~avtCCSMReader()
{
FreeUpResources();
delete fileObject;
delete [] dimSizes;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment