Commit 53ce8f74 authored by hrchilds's avatar hrchilds

Update from February 12, 2005

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@412 18c085ea-50e0-402c-830e-de6fd14e8384
parent 52736c59
......@@ -227,6 +227,9 @@ curdate=`date +%Y-%m-%d-%p%I%M`
# set mode to run in
#modes="serial parallel scalable"
modes="serial parallel scalable,parallel"
if test "`date +%A`" = "Sunday"; then
modes="serial,hdf5 parallel,hdf5 scalable,parallel,hdf5"
fi
# set list of tests/modes to skip
#skipList="dummy_mode:tests/dummy_category/dummy_file.py"
......
......@@ -95,5 +95,5 @@ MILI_DIR=/usr/gapps/visit/mili/current/sunos_57
##
## Silo
##
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.1/sunos_57/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.1/sunos_57/lib
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.2-pre1/sunos_57/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.2-pre1/sunos_57/lib
......@@ -95,5 +95,5 @@ MILI_DIR=/usr/gapps/visit/mili/current/sunos_57
##
## Silo
##
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.1/sunos_57/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.1/sunos_57/lib
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.2-pre1/sunos_57/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.2-pre1/sunos_57/lib
<?xml version="1.0"?>
<Plugin name="Enzo" label="Enzo" type="database" dbtype="STMD" version="1.0">
<Extensions> hierarchy boundary </Extensions>
<CXXFLAGS> $(HDF4_FLAGS) </CXXFLAGS>
<LIBS> $(HDF4_LIBS) </LIBS>
<CXXFLAGS> $(HDF4_FLAGS) $(HDF5_INCLUDE) </CXXFLAGS>
<LIBS> $(HDF4_LIBS) $(HDF5_LIB) </LIBS>
</Plugin>
This diff is collapsed.
......@@ -19,6 +19,10 @@
// Programmer: Jeremy Meredith
// Creation: December 3, 2004
//
// Modifications:
// Jeremy Meredith, Fri Feb 11 18:15:49 PST 2005
// Added HDF5 support to the existing HDF4 support.
//
// ****************************************************************************
class avtEnzoFileFormat : public avtSTMDFileFormat
......@@ -41,6 +45,9 @@ class avtEnzoFileFormat : public avtSTMDFileFormat
DestructorFunction &);
protected:
enum FileType { ENZO_FT_UNKNOWN, ENZO_FT_HDF4, ENZO_FT_HDF5 };
FileType fileType;
// DATA MEMBERS
struct Grid
{
......
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