Commit 6529da13 authored by hrchilds's avatar hrchilds

Update from January 5, 2005

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@390 18c085ea-50e0-402c-830e-de6fd14e8384
parent 50e18c57
......@@ -53,7 +53,6 @@ kickit=true
sunspot=true
hyper=true
gps=true
riptide=true
berg=true
pengra=true
thunder=true
......@@ -73,7 +72,6 @@ do
sunspot=false
hyper=false
gps=false
riptide=false
berg=false
pengra=false
thunder=false
......@@ -111,14 +109,6 @@ do
gps=true
shift
;;
-riptide)
riptide=false
shift
;;
+riptide)
riptide=true
shift
;;
-berg)
berg=false
shift
......@@ -369,56 +359,6 @@ then
fi
fi
#
# Build on riptide, both serial and parallel versions.
#
rm -f riptide
cat <<EOF > riptide
#!/bin/sh
if test ! -e /fc/tmp0/fcdata/$user ; then
mkdir /fc/tmp0/fcdata/$user
fi
if test ! -e /fc/tmp0/fcdata/$user/riptide ; then
mkdir /fc/tmp0/fcdata/$user/riptide
fi
rm -rf /fc/tmp0/fcdata/$user/riptide/visitbuild
mkdir /fc/tmp0/fcdata/$user/riptide/visitbuild
mv riptide_$dist.tar.gz /fc/tmp0/fcdata/$user/riptide/visitbuild/$dist.tar.gz
cd /fc/tmp0/fcdata/$user/riptide/visitbuild
gunzip -c $dist.tar.gz | tar xvf - > buildlog 2>&1
cd $dist
ver=\`cat VERSION\`
ver2=\`echo \$ver | tr "." "_"\`
env CXXFLAGS=-O2 ./configure --enable-parallel >> ../buildlog 2>&1
env PARALLEL=8 make -P >> ../buildlog 2>&1
clearcase_bin/visit-bin-dist >> ../buildlog 2>&1
mv visit\$ver2.irix6.tar.gz ..
cd ..
rm -f resultlog
echo " build of visit on riptide" > resultlog 2>&1
echo " ---------------------------" >> resultlog 2>&1
echo "" >> resultlog 2>&1
ls -l >> resultlog 2>&1
echo "" >> resultlog 2>&1
echo "number of database plugins = "\`ls $dist/plugins/databases/libI* | wc -l\` >> resultlog 2>&1
echo "number of operator plugins = "\`ls $dist/plugins/operators/libI* | wc -l\` >> resultlog 2>&1
echo "number of plot plugins = "\`ls $dist/plugins/plots/libI* | wc -l\` >> resultlog 2>&1
echo "" >> resultlog 2>&1
echo "The database plugins:" >> resultlog 2>&1
ls $dist/plugins/databases/libI* | sed "s/$dist\/plugins\/databases\/libI//" | sed "s/Database.so//" >> resultlog 2>&1
mail $emailName < resultlog
EOF
if [ $riptide = true ]
then
if [ $test = no ]
then
scp riptide riptide:riptide_buildit
scp $dist.tar.gz riptide:riptide_$dist.tar.gz
ssh riptide "chmod 750 riptide_buildit;./riptide_buildit" &
fi
fi
#
# Build on berg, both serial and parallel versions.
#
......@@ -574,5 +514,5 @@ fi
#
if [ $test = no ]
then
rm -f kickit sunspot hyper gps riptide berg pengra thunder
rm -f kickit sunspot hyper gps berg pengra thunder
fi
......@@ -54,7 +54,6 @@ kickit=true
sunspot=true
hyper=true
gps=true
riptide=true
berg=true
pengra=true
alc=true
......@@ -76,7 +75,6 @@ do
sunspot=false
hyper=false
gps=false
riptide=false
berg=false
pengra=false
alc=false
......@@ -115,14 +113,6 @@ do
gps=true
shift
;;
-riptide)
riptide=false
shift
;;
+riptide)
riptide=true
shift
;;
-berg)
berg=false
shift
......@@ -295,7 +285,7 @@ if [ $hyper = true ]
then
if [ $test = no ]
then
scp riptide:/fc/tmp0/fcdata/$user/riptide/visitbuild/visit$ver2.irix6.tar.gz .
scp hyper:/scratch1/$user/hyper/visitbuild/visit$ver2.irix6.tar.gz .
scp visit$ver2.irix6.tar.gz kickit:
scp visit-install kickit:
scp hyper kickit:hyper_install
......@@ -339,42 +329,6 @@ then
fi
fi
#
# Install on riptide.
#
rm -f riptide
cat <<EOF > riptide
#!/bin/sh
./visit-install -private -c open -g visit -gw -l $ver irix6 /usr/gapps/visit > installlog 2>&1
rm -f resultlog
echo " install of visit on riptide" > resultlog 2>&1
echo " -----------------------------" >> resultlog 2>&1
echo "" >> resultlog 2>&1
df -k /usr/gapps/visit >> resultlog 2>&1
echo "" >> resultlog 2>&1
ls -l /usr/gapps/visit/$ver/sgi-irix6-mips2/bin >> resultlog 2>&1
echo "" >> resultlog 2>&1
echo "number of database plugins = "\`ls /usr/gapps/visit/$ver/sgi-irix6-mips2/plugins/databases/libI* | wc -l\` >> resultlog 2>&1
echo "number of operator plugins = "\`ls /usr/gapps/visit/$ver/sgi-irix6-mips2/plugins/operators/libI* | wc -l\` >> resultlog 2>&1
echo "number of plot plugins = "\`ls /usr/gapps/visit/$ver/sgi-irix6-mips2/plugins/plots/libI* | wc -l\` >> resultlog 2>&1
echo "" >> resultlog 2>&1
echo "The database plugins:" >> resultlog 2>&1
ls /usr/gapps/visit/$ver/sgi-irix6-mips2/plugins/databases/libI* | sed "s/\/usr\/gapps\/visit\/$ver\/sgi-irix6-mips2\/plugins\/databases\/libI//" | sed "s/Database.so//" >> resultlog 2>&1
mail $emailName < resultlog
EOF
if [ $riptide = true ]
then
if [ $test = no ]
then
scp riptide:/fc/tmp0/fcdata/$user/riptide/visitbuild/visit$ver2.irix6.tar.gz .
scp visit$ver2.irix6.tar.gz gps15:
scp visit-install gps15:
scp riptide gps15:riptide_install
ssh gps15 "chmod 750 riptide_install;./riptide_install"
fi
fi
#
# Install on berg.
#
......@@ -532,5 +486,5 @@ fi
#
if [ $test = no ]
then
rm -f kickit sunspot hyper gps riptide berg pengra alc thunder
rm -f kickit sunspot hyper gps berg pengra alc thunder
fi
......@@ -333,7 +333,7 @@ avtRayTracer::Execute(void)
int sampLimitPerProc = 25000000; // 25M
numSamps /= PAR_Size();
int numTiles = numSamps/sampLimitPerProc;
int numDivisions = (int) sqrt(numTiles);
int numDivisions = (int) sqrt((double) numTiles);
if (numDivisions < 1)
numDivisions = 1;
int IStep = screen[0] / numDivisions;
......
......@@ -11,7 +11,7 @@ fi
##
## Set g++ specific flags.
##
if test "$CXX" = "g++"; then
if test "`echo $CXX | cut -c1-3`" = "g++"; then
##
## Minimize the size of the table of contents (TOC). Other flags that
## reduce the size of the TOC are -mno-fp-in-toc and -mno-sum-in-toc
......@@ -23,7 +23,7 @@ if test "$CXX" = "g++"; then
##
LDFLAGS="-Wl,-brtl $LDFLAGS"
elif test "$CXX" = "xlC"; then
else ## Assume $CXX = xlC
##
## Tell it to look for .so's as libraries, and to link using shared semantics.
##
......
......@@ -8,6 +8,6 @@
if test "`uname -p`"="alpha"; then
if test "X$CC" = "X"; then
CC="/usr/bin/cc"
CFLAGS="-std1 $CFLAGS"
fi
CFLAGS="-std1 $CFLAGS"
fi
##
## Set the VISITHOME environment variable.
##
VISITHOME=/usr/gapps/visit
##
## Use the g++ 3.2.3 compiler.
##
CC=/usr/local/bin/gcc-3.2.3
CXX=/usr/local/bin/g++-3.2.3
##
## If MESA is not set, use VisIt's mesa.
##
if test -z "$MESA"; then
MESA=$VISITHOME/mesa/5.0/linux_chaos_gcc_3.3.3
fi
##
## If VTK is not set, use VisIt's vtk.
##
if test -z "$VTK"; then
VTK=$VISITHOME/vtk/2003.10.28/linux_chaos_gcc_3.3.3
fi
##
## If QT is not set, use VisIt's Qt.
##
if test -z "$QT_BIN"; then
QT_BIN=$VISITHOME/qt/3.3.2/linux_chaos_gcc_3.3.3/bin
fi
if test -z "$QT_INCLUDE"; then
QT_INCLUDE=$VISITHOME/qt/3.3.2/linux_chaos_gcc_3.3.3/include
fi
if test -z "$QT_LIB"; then
QT_LIB=$VISITHOME/qt/3.3.2/linux_chaos_gcc_3.3.3/lib
fi
##
## Use VisIt's Python.
##
PYDIR=$VISITHOME/python/linux_chaos_gcc_3.3.3
PYVERSION=python2.1
##
## Turn off warnings for deprecated features.
##
CXXFLAGS="-Wno-deprecated $CXXFLAGS"
##
## Add parallel arguments.
##
CXXFLAGS="-I/usr/lib/mpi/mpi_gnu/include $CXXFLAGS"
MPI_LIBS="-L/usr/lib/mpi/mpi_gnu/lib -Wl,-rpath=/usr/lib/mpi/mpi_gnu/lib -lmpi -lelan -lelan3 -lrmscall"
##
## Database reader plugin support libraries
##
###############################################################################
##
## Boxlib
##
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/lib
##
## Exodus
##
DEFAULT_EXODUS_INCLUDES=$VISITHOME/exodus/linux/inc
DEFAULT_EXODUS_LIBRARY=$VISITHOME/exodus/linux/lib
##
## HDF4
##
DEFAULT_HDF4_FLAGS=/usr/gapps/visit/hdf4/2.0/linux_chaos_gcc_3.3.3/include
DEFAULT_HDF4_LIBS=/usr/gapps/visit/hdf4/2.0/linux_chaos_gcc_3.3.3/lib
##
## HDF5
##
DEFAULT_HDF5_INCLUDE=/usr/local/hdf5/hdf5-1.6.0_chaos_2.0/serial_gcc/include
DEFAULT_HDF5_LIB=/usr/local/hdf5/hdf5-1.6.0_chaos_2.0/serial_gcc/lib
##
## Mili
##
MILI_DIR=/usr/gapps/visit/mili/current/linux_chaos_gcc_3.3.3
##
## Silo
##
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.1/chaos_2_ia32_elan3/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.1/chaos_2_ia32_elan3/lib
##
## Set the VISITHOME environment variable.
##
VISITHOME=/usr/gapps/visit
##
## Use the g++ 3.2.3 compiler.
##
CC=/usr/local/bin/gcc-3.2.3
CXX=/usr/local/bin/g++-3.2.3
##
## If MESA is not set, use VisIt's mesa.
##
if test -z "$MESA"; then
MESA=$VISITHOME/mesa/5.0/linux_chaos_gcc_3.3.3
fi
##
## If VTK is not set, use VisIt's vtk.
##
if test -z "$VTK"; then
VTK=$VISITHOME/vtk/2003.10.28/linux_chaos_gcc_3.3.3
fi
##
## If QT is not set, use VisIt's Qt.
##
if test -z "$QT_BIN"; then
QT_BIN=$VISITHOME/qt/3.3.2/linux_chaos_gcc_3.3.3/bin
fi
if test -z "$QT_INCLUDE"; then
QT_INCLUDE=$VISITHOME/qt/3.3.2/linux_chaos_gcc_3.3.3/include
fi
if test -z "$QT_LIB"; then
QT_LIB=$VISITHOME/qt/3.3.2/linux_chaos_gcc_3.3.3/lib
fi
##
## Use VisIt's Python.
##
PYDIR=$VISITHOME/python/linux_chaos_gcc_3.3.3
PYVERSION=python2.1
##
## Turn off warnings for deprecated features.
##
CXXFLAGS="-Wno-deprecated $CXXFLAGS"
##
## Add parallel arguments.
##
CXXFLAGS="-I/usr/lib/mpi/mpi_gnu/include $CXXFLAGS"
MPI_LIBS="-L/usr/lib/mpi/mpi_gnu/lib -Wl,-rpath=/usr/lib/mpi/mpi_gnu/lib -lmpi -lelan -lelan3 -lrmscall"
##
## Database reader plugin support libraries
##
###############################################################################
##
## Boxlib
##
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/linux_chaos_gcc_3.3.3/lib
##
## Exodus
##
DEFAULT_EXODUS_INCLUDES=$VISITHOME/exodus/linux/inc
DEFAULT_EXODUS_LIBRARY=$VISITHOME/exodus/linux/lib
##
## HDF4
##
DEFAULT_HDF4_FLAGS=/usr/gapps/visit/hdf4/2.0/linux_chaos_gcc_3.3.3/include
DEFAULT_HDF4_LIBS=/usr/gapps/visit/hdf4/2.0/linux_chaos_gcc_3.3.3/lib
##
## HDF5
##
DEFAULT_HDF5_INCLUDE=/usr/local/hdf5/hdf5-1.6.0_chaos_2.0/serial_gcc/include
DEFAULT_HDF5_LIB=/usr/local/hdf5/hdf5-1.6.0_chaos_2.0/serial_gcc/lib
##
## Mili
##
MILI_DIR=/usr/gapps/visit/mili/current/linux_chaos_gcc_3.3.3
##
## Silo
##
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.1/chaos_2_ia32_elan3/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.1/chaos_2_ia32_elan3/lib
##
## Set the VISITHOME environment variable.
##
VISITHOME=/usr/gapps/visit
##
## If MESA is not set, use VisIt's mesa.
##
if test -z "$MESA"; then
MESA=$VISITHOME/mesa/5.0/irix64_cc_7.3.1.2_64
fi
##
## If VTK is not set, use VisIt's vtk.
##
if test -z "$VTK"; then
VTK=$VISITHOME/vtk/2003.10.28/irix64_cc_7.3.1.2_64
fi
##
## If QT is not set, use VisIt's Qt.
##
if test -z "$QT_BIN"; then
QT_BIN=$VISITHOME/qt/3.3.2/irix64_cc_7.3.1.2_64/bin
fi
if test -z "$QT_INCLUDE"; then
QT_INCLUDE=$VISITHOME/qt/3.3.2/irix64_cc_7.3.1.2_64/include
fi
if test -z "$QT_LIB"; then
QT_LIB=$VISITHOME/qt/3.3.2/irix64_cc_7.3.1.2_64/lib
fi
##
## Use VisIt's Python
##
PYDIR=$VISITHOME/python/irix64_cc_7.3.1.2_64
PYVERSION=python2.1
PY_LDFLAGS="-64"
##
## Make a 64 bit binary
##
CFLAGS="-64 -G 7 -OPT:Olimit=0 $CFLAGS"
CXXFLAGS="-64 -LANG:std -G 7 -OPT:Olimit=0 $CXXFLAGS"
LDFLAGS="-64 -LANG:std -G 7 -OPT:Olimit=0 $LDFLAGS"
##
## Report all warnings.
##
CFLAGS="-fullwarn -woff 1424 $CFLAGS"
CXXFLAGS="-fullwarn -woff 1424 $CXXFLAGS"
##
## Add parallel arguments.
##
MPI_LIBS="-lmpi -lmpi++"
##
## Database reader plugin support libraries
##
###############################################################################
##
## HDF5
##
DEFAULT_HDF5_INCLUDE=/usr/local/hdf5/hdf5-1.6.0/serial/64/include
DEFAULT_HDF5_LIB=/usr/local/hdf5/hdf5-1.6.0/serial/64/lib
##
## Mili
##
MILI_DIR=/usr/gapps/visit/mili/1.06/irix64_cc_7.3.1.2_64
##
## Silo
##
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.1/irix_6.5_64/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.1/irix_6.5_64/lib
......@@ -9592,7 +9592,7 @@ case $SHORT_UNAME in
;;
aix)
if test "$CXX" = "g++"; then
if test "`echo $CXX | cut -c1-3`" = "g++"; then
# AIX used to be the weird one. It is mostly normal finally,
# as long as you use g++. It should be noted that for AIX to find
# .so's as libraries, it requires "-Wl,-brtl" in the LDFLAGS.
......
......@@ -2589,7 +2589,7 @@ case $SHORT_UNAME in
;;
aix)
if test "$CXX" = "g++"; then
if test "`echo $CXX | cut -c1-3`" = "g++"; then
# AIX used to be the weird one. It is mostly normal finally,
# as long as you use g++. It should be noted that for AIX to find
# .so's as libraries, it requires "-Wl,-brtl" in the LDFLAGS.
......
<?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>
</Plugin>
#include <EnzoPluginInfo.h>
#include <avtEnzoFileFormat.h>
#include <avtSTMDFileFormatInterface.h>
#include <avtGenericDatabase.h>
// ****************************************************************************
// Method: EnzoCommonPluginInfo::GetDatabaseType
//
// Purpose:
// Returns the type of a Enzo database.
//
// Programmer: meredith -- generated by xml2info
// Creation: Tue Dec 7 14:37:43 PST 2004
//
// ****************************************************************************
DatabaseType
EnzoCommonPluginInfo::GetDatabaseType()
{
return DB_TYPE_STMD;
}
// ****************************************************************************
// Method: EnzoCommonPluginInfo::GetDefaultExtensions
//
// Purpose:
// Returns the default extensions for a Enzo database.
//
// Programmer: meredith -- generated by xml2info
// Creation: Tue Dec 7 14:37:43 PST 2004
//
// ****************************************************************************
std::vector<std::string>
EnzoCommonPluginInfo::GetDefaultExtensions()
{
std::vector<std::string> defaultExtensions;
defaultExtensions.push_back("hierarchy");
defaultExtensions.push_back("boundary");
return defaultExtensions;
}
// ****************************************************************************
// Method: EnzoCommonPluginInfo::GetWriter
//
// Purpose:
// Sets up a Enzo writer.
//
// Returns: A Enzo writer.
//
// Programmer: meredith -- generated by xml2info
// Creation: Tue Dec 7 14:37:43 PST 2004
//
// ****************************************************************************
avtDatabaseWriter *
EnzoCommonPluginInfo::GetWriter(void)
{
return NULL;
}
// ****************************************************************************
// Method: EnzoCommonPluginInfo::SetUpEnzoDatabase
//
// Purpose:
// Sets up a Enzo 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 Enzo database from list.
//
// Programmer: meredith -- generated by xml2info
// Creation: Tue Dec 7 14:37:43 PST 2004
//
// ****************************************************************************
avtDatabase *
EnzoCommonPluginInfo::SetupDatabase(const char *const *list,
int nList, int nBlock)
{
avtSTMDFileFormat **ffl = new avtSTMDFileFormat*[nList];
for (int i = 0 ; i < nList ; i++)
{
ffl[i] = new avtEnzoFileFormat(list[i]);
}
avtSTMDFileFormatInterface *inter
= new avtSTMDFileFormatInterface(ffl, nList);
return new avtGenericDatabase(inter);
}
#include <EnzoPluginInfo.h>
#if defined(__APPLE__)
#define GetEngineInfo Enzo_GetEngineInfo
#endif
// ****************************************************************************
// Function: GetEngineInfo
//
// Purpose:
// Return a new EnginePluginInfo for the Enzo database.
//
// Programmer: meredith -- generated by xml2info
// Creation: Tue Dec 7 14:37:43 PST 2004
//
// ****************************************************************************
extern "C" EngineDatabasePluginInfo* GetEngineInfo()
{