Skip to content
GitLab
Commit 2202a72d authored by hrchilds's avatar hrchilds
Browse files

Update from August 10, 2004 

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@298 18c085ea-50e0-402c-830e-de6fd14e8384
parent c2521e62
Hide whitespace changes
Inline Side-by-side
BUILD_NOTES
View file @ 2202a72d
......@@ -489,16 +489,16 @@ mkdir $VISITDIR/qt/3.3.2/$VISITARCH/bin
mkdir $VISITDIR/qt/3.3.2/$VISITARCH/include
mkdir $VISITDIR/qt/3.3.2/$VISITARCH/include/private
mkdir $VISITDIR/qt/3.3.2/$VISITARCH/lib
cp bin/{designer,findtr,moc,qt20fix,qtrename140} $VISITDIR/qt/$VISITARCH/3.3.2/bin
cd include; cp *.h $VISITDIR/qt/$VISITARCH/3.3.2/include
cp private/*.h $VISITDIR/qt/$VISITARCH/3.3.2/include/private
cd ../lib;find . -print | cpio -pvmud $VISITDIR/qt/$VISITARCH/3.3.2/lib
cp bin/{designer,findtr,moc,qt20fix,qtrename140} $VISITDIR/qt/3.3.2/$VISITARCH/bin
cd include; cp *.h $VISITDIR/qt/3.3.2/$VISITARCH/include
cp private/*.h $VISITDIR/qt/3.3.2/$VISITARCH/include/private
cd ../lib;find . -print | cpio -pvmud $VISITDIR/qt/3.3.2/$VISITARCH/lib
cd ../..
#
# On aix systems you will need to add an additional link to the lib
# directory so that the loader can find the library.
#
# ln -s libqt.so.3.3.2 $VISITDIR/qt/$VISITARCH/3.3.2/lib/libqt.so
# ln -s libqt.so.3.3.2 $VISITDIR/qt/3.3.2/$VISITARCH/lib/libqt.so
#
Silo
......
clearcase_bin/visit-build-open
View file @ 2202a72d
......@@ -56,6 +56,7 @@ gps=true
riptide=true
frost=true
pengra=true
thunder=true
dist=undefined
......@@ -75,6 +76,7 @@ do
riptide=false
frost=false
pengra=false
thunder=false
shift
;;
-kickit)
......@@ -133,6 +135,14 @@ do
pengra=true
shift
;;
-thunder)
thunder=false
shift
;;
+thunder)
thunder=true
shift
;;
-d)
dist=$2
shift 2
......@@ -509,10 +519,60 @@ then
fi
fi
#
# Build on thunder.
#
rm -f thunder
cat <<EOF > thunder
#!/bin/sh
if test ! -d /usr/tmp/$user ; then
mkdir /usr/tmp/$user
fi
if test ! -d /usr/tmp/$user/thunder ; then
mkdir /usr/tmp/$user/thunder
fi
rm -rf /usr/tmp/$user/thunder/visitbuild
mkdir /usr/tmp/$user/thunder/visitbuild
mv thunder_$dist.tar.gz /usr/tmp/$user/thunder/visitbuild/$dist.tar.gz
cd /usr/tmp/$user/thunder/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
make -j 3 >> ../buildlog 2>&1
clearcase_bin/visit-bin-dist >> ../buildlog 2>&1
mv visit\$ver2.linux-ia64.tar.gz ..
cd ..
rm -f resultlog
echo " build of visit on thunder" > 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 [ $thunder = true ]
then
if [ $test = no ]
then
scp thunder thunder2:thunder_buildit
scp $dist.tar.gz thunder2:thunder_$dist.tar.gz
ssh thunder2 "chmod 750 thunder_buildit;./thunder_buildit" &
fi
fi
#
# Clean up.
#
if [ $test = no ]
then
rm -f kickit sunspot hyper gps riptide frost pengra
rm -f kickit sunspot hyper gps riptide frost pengra thunder
fi
clearcase_bin/visit-config-open
View file @ 2202a72d
......@@ -12,7 +12,73 @@
<Field name="id" type="stringVector">Streamline_1.0 InverseGhostZone_1.0 </Field>
<Field name="enabled" type="intVector">0 0 </Field>
</Object>
<Object name="HostProfileList" childObjects="25">
<Object name="HostProfileList" childObjects="29">
<Object name="HostProfile" childObjects="0">
<Field name="profileName" type="string">serial</Field>
<Field name="host" type="string">alc.llnl.gov</Field>
<Field name="hostAliases" type="string">alc#.llnl.gov alc##.llnl.gov alc###.llnl.gov alc# alc## alc###</Field>
<Field name="timeout" type="int">480</Field>
<Field name="numProcessors" type="int">1</Field>
<Field name="numNodesSet" type="bool">false</Field>
<Field name="numNodes" type="int">0</Field>
<Field name="partitionSet" type="bool">false</Field>
<Field name="partition" type="string"></Field>
<Field name="bankSet" type="bool">false</Field>
<Field name="bank" type="string"></Field>
<Field name="timeLimitSet" type="bool">false</Field>
<Field name="timeLimit" type="string"></Field>
<Field name="launchMethodSet" type="bool">false</Field>
<Field name="launchMethod" type="string"></Field>
<Field name="forceStatic" type="bool">true</Field>
<Field name="forceDynamic" type="bool">false</Field>
<Field name="active" type="bool">true</Field>
<Field name="arguments" type="stringVector">-dir /usr/gapps/visit </Field>
<Field name="parallel" type="bool">false</Field>
</Object>
<Object name="HostProfile" childObjects="0">
<Field name="profileName" type="string">parallel interactive pdebug</Field>
<Field name="host" type="string">alc.llnl.gov</Field>
<Field name="hostAliases" type="string">alc#.llnl.gov alc##.llnl.gov alc###.llnl.gov alc# alc## alc###</Field>
<Field name="timeout" type="int">480</Field>
<Field name="numProcessors" type="int">8</Field>
<Field name="numNodesSet" type="bool">false</Field>
<Field name="numNodes" type="int">0</Field>
<Field name="partitionSet" type="bool">true</Field>
<Field name="partition" type="string">pdebug</Field>
<Field name="bankSet" type="bool">false</Field>
<Field name="bank" type="string"></Field>
<Field name="timeLimitSet" type="bool">false</Field>
<Field name="timeLimit" type="string"></Field>
<Field name="launchMethodSet" type="bool">true</Field>
<Field name="launchMethod" type="string">srun</Field>
<Field name="forceStatic" type="bool">true</Field>
<Field name="forceDynamic" type="bool">false</Field>
<Field name="active" type="bool">false</Field>
<Field name="arguments" type="stringVector">-dir /usr/gapps/visit</Field>
<Field name="parallel" type="bool">true</Field>
</Object>
<Object name="HostProfile" childObjects="0">
<Field name="profileName" type="string">parallel batch pbatch</Field>
<Field name="host" type="string">alc.llnl.gov</Field>
<Field name="hostAliases" type="string">alc#.llnl.gov alc##.llnl.gov alc###.llnl.gov alc# alc## alc###</Field>
<Field name="timeout" type="int">480</Field>
<Field name="numProcessors" type="int">16</Field>
<Field name="numNodesSet" type="bool">true</Field>
<Field name="numNodes" type="int">8</Field>
<Field name="partitionSet" type="bool">true</Field>
<Field name="partition" type="string">alc,pbatch</Field>
<Field name="bankSet" type="bool">true</Field>
<Field name="bank" type="string">bdivp</Field>
<Field name="timeLimitSet" type="bool">true</Field>
<Field name="timeLimit" type="string">30m</Field>
<Field name="launchMethodSet" type="bool">true</Field>
<Field name="launchMethod" type="string">psub/srun</Field>
<Field name="forceStatic" type="bool">true</Field>
<Field name="forceDynamic" type="bool">false</Field>
<Field name="active" type="bool">false</Field>
<Field name="arguments" type="stringVector">-dir /usr/gapps/visit</Field>
<Field name="parallel" type="bool">true</Field>
</Object>
<Object name="HostProfile" childObjects="0">
<Field name="profileName" type="string">serial</Field>
<Field name="host" type="string">blue.llnl.gov</Field>
......@@ -506,7 +572,7 @@
<Field name="numNodesSet" type="bool">true</Field>
<Field name="numNodes" type="int">2</Field>
<Field name="partitionSet" type="bool">true</Field>
<Field name="partition" type="string">uv</Field>
<Field name="partition" type="string">uv,pbatch</Field>
<Field name="bankSet" type="bool">true</Field>
<Field name="bank" type="string">bdivp</Field>
<Field name="timeLimitSet" type="bool">true</Field>
......@@ -519,8 +585,30 @@
<Field name="arguments" type="stringVector">-dir /usr/gapps/visit </Field>
<Field name="parallel" type="bool">true</Field>
</Object>
<Object name="HostProfile">
<Field name="profileName" type="string">serial</Field>
<Object name="HostProfile" childObjects="0">
<Field name="profileName" type="string">parallel pdebug</Field>
<Field name="host" type="string">uv.asci.llnl.gov</Field>
<Field name="hostAliases" type="string">>uv#.asci.llnl.gov uv##.asci.llnl.gov uv###.asci.llnl.gov uv# uv## uv###</Field>
<Field name="timeout" type="int">480</Field>
<Field name="numProcessors" type="int">16</Field>
<Field name="numNodesSet" type="bool">true</Field>
<Field name="numNodes" type="int">2</Field>
<Field name="partitionSet" type="bool">true</Field>
<Field name="partition" type="string">uv,pdebug</Field>
<Field name="bankSet" type="bool">true</Field>
<Field name="bank" type="string">bdivp</Field>
<Field name="timeLimitSet" type="bool">true</Field>
<Field name="timeLimit" type="string">30m</Field>
<Field name="launchMethodSet" type="bool">true</Field>
<Field name="launchMethod" type="string">psub</Field>
<Field name="forceStatic" type="bool">true</Field>
<Field name="forceDynamic" type="bool">false</Field>
<Field name="active" type="bool">false</Field>
<Field name="arguments" type="stringVector">-dir /usr/gapps/visit </Field>
<Field name="parallel" type="bool">true</Field>
</Object>
<Object name="HostProfile">
<Field name="profileName" type="string">serial</Field>
<Field name="host" type="string">thunder.llnl.gov</Field>
<Field name="active" type="bool">true</Field>
<Field name="arguments" type="stringVector">"-dir" "/usr/gapps/visit" </Field>
......
clearcase_bin/visit-install-open
View file @ 2202a72d
......@@ -57,6 +57,8 @@ gps=true
riptide=true
frost=true
pengra=true
alc=true
thunder=true
ver=undefined
verflag=-private
......@@ -77,6 +79,8 @@ do
riptide=false
frost=false
pengra=false
alc=false
thunder=false
shift
;;
-kickit)
......@@ -135,6 +139,22 @@ do
pengra=true
shift
;;
-alc)
alc=false
shift
;;
+alc)
alc=true
shift
;;
-thunder)
thunder=false
shift
;;
+thunder)
thunder=true
shift
;;
-v)
ver=$2
shift 2
......@@ -427,10 +447,90 @@ then
fi
fi
#
# Install on alc.
#
rm -f alc
cat <<EOF > alc
#!/bin/sh
./visit-install -r -private -c open -g visit -gw -l $ver linux /usr/gapps/visit > installlog 2>&1
rm -f resultlog
echo " install of visit on alc" > 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/linux-intel/bin >> resultlog 2>&1
echo "" >> resultlog 2>&1
echo "number of database plugins = "\`ls /usr/gapps/visit/$ver/linux-intel/plugins/databases/libI* | wc -l\` >> resultlog 2>&1
echo "number of operator plugins = "\`ls /usr/gapps/visit/$ver/linux-intel/plugins/operators/libI* | wc -l\` >> resultlog 2>&1
echo "number of plot plugins = "\`ls /usr/gapps/visit/$ver/linux-intel/plugins/plots/libI* | wc -l\` >> resultlog 2>&1
echo "" >> resultlog 2>&1
echo "The database plugins:" >> resultlog 2>&1
ls /usr/gapps/visit/$ver/linux-intel/plugins/databases/libI* | sed "s/\/usr\/gapps\/visit\/$ver\/linux-intel\/plugins\/databases\/libI//" | sed "s/Database.so//" >> resultlog 2>&1
mail $emailName < resultlog
EOF
if [ $alc = true ]
then
if [ $test = no ]
then
scp pengra0:/usr/tmp/brugger/pengra/visitbuild/visit$ver2.linux.tar.gz visit$ver2.linux_chaos.tar.gz
scp visit$ver2.linux_chaos.tar.gz alc0:visit$ver2.linux.tar.gz
scp visit-install alc0:
scp alc alc0:alc_install
ssh alc0 "chmod 750 alc_install;./alc_install"
# Temporary until the gnu shared libraries are fixed on alc. Copying
# the gcc 3.2.3 shared libraries to visit's shared library directory so
# that it gets them instead of the broken gnu 3.3.3 shared libraries.
scp pengra0:/usr/lib/libstdc++.so.5.0.3 .
scp pengra0:/lib/libgcc_s.so.1 .
chmod 664 libstdc++.so.5.0.3 libgcc_s.so.1
scp libstdc++.so.5.0.3 alc:/usr/gapps/visit/$ver/linux-intel/lib
scp libgcc_s.so.1 alc:/usr/gapps/visit/$ver/linux-intel/lib
fi
fi
#
# Install on thunder.
#
rm -f thunder
cat <<EOF > thunder
#!/bin/sh
./visit-install $verflag -c open -g visit -gw -l $ver linux-ia64 /usr/gapps/visit > installlog 2>&1
rm -f resultlog
echo " install of visit on thunder" > 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/linux-ia64/bin >> resultlog 2>&1
echo "" >> resultlog 2>&1
echo "number of database plugins = "\`ls /usr/gapps/visit/$ver/linux-ia64/plugins/databases/libI* | wc -l\` >> resultlog 2>&1
echo "number of operator plugins = "\`ls /usr/gapps/visit/$ver/linux-ia64/plugins/operators/libI* | wc -l\` >> resultlog 2>&1
echo "number of plot plugins = "\`ls /usr/gapps/visit/$ver/linux-ia64/plugins/plots/libI* | wc -l\` >> resultlog 2>&1
echo "" >> resultlog 2>&1
echo "The database plugins:" >> resultlog 2>&1
ls /usr/gapps/visit/$ver/linux-ia64/plugins/databases/libI* | sed "s/\/usr\/gapps\/visit\/$ver\/linux-ia64\/plugins\/databases\/libI//" | sed "s/Database.so//" >> resultlog 2>&1
mail $emailName < resultlog
EOF
if [ $thunder = true ]
then
if [ $test = no ]
then
scp thunder2:/usr/tmp/brugger/thunder/visitbuild/visit$ver2.linux-ia64.tar.gz .
scp visit$ver2.linux-ia64.tar.gz alc0:
scp visit-install alc0:
scp thunder alc0:thunder_install
ssh alc0 "chmod 750 thunder_install;./thunder_install"
fi
fi
#
# Clean up.
#
if [ $test = no ]
then
rm -f kickit sunspot hyper gps riptide frost pengra
rm -f kickit sunspot hyper gps riptide frost pengra alc thunder
fi
components/DBAtts/MetaData/avtDatabaseMetaData.C
View file @ 2202a72d
......@@ -5829,6 +5829,34 @@ avtDatabaseMetaData::SetContainsGhostZones(std::string name, avtGhostType val)
}
}
// ****************************************************************************
// Method: avtDatabaseMetaData::GetContainsGhostZones
//
// Purpose:
// Gets whether a particular mesh has ghost zones.
//
// Arguments:
// name The name of a mesh.
// val True if it has ghost zones, false otherwise.
//
// Programmer: Mark C. Miller
// Creation: August 10, 2004
//
// ****************************************************************************
avtGhostType
avtDatabaseMetaData::GetContainsGhostZones(std::string name) const
{
for (int i = 0 ; i < GetNumMeshes() ; i++)
{
if (meshes[i]->name == name)
{
return meshes[i]->containsGhostZones;
}
}
return AVT_MAYBE_GHOSTS;
}
// ****************************************************************************
// Method: avtDatabaseMetaData::SetContainsOriginalCells
......
components/DBAtts/MetaData/avtDatabaseMetaData.h
View file @ 2202a72d
......@@ -373,6 +373,10 @@ public:
//----------------------------------------------------------------------------
// Class: avtDatabaseMetaData
//
// Modifications:
// Mark C. Miller, Tue Aug 10 14:16:36 PDT 2004
// Added method GetContainsGhosts()
//----------------------------------------------------------------------------
class DBATTS_API avtDatabaseMetaData : public AttributeSubject
{
......@@ -522,6 +526,7 @@ public:
void SetBlocksForMesh(int index, int nBlocks);
void SetContainsGhostZones(std::string name, avtGhostType);
avtGhostType GetContainsGhostZones(std::string name) const;
void SetContainsOriginalCells(std::string name, bool);
void SetContainsOriginalNodes(std::string name, bool);
void SetContainsGlobalNodeIds(std::string name, bool);
......
components/Database/Database/avtGenericDatabase.C
View file @ 2202a72d
......@@ -3437,6 +3437,9 @@ avtGenericDatabase::ReadDataset(avtDatasetCollection &ds, vector<int> &domains,
// Removed avtMeshMetadata local variable.
// Changed logic for testing existence of global node ids to attempt to
// Get global node ids and if they exist, use them.
//
// Mark C. Miller, Tue Aug 10 14:16:36 PDT 2004
// Added check for if ghosts had been read from file and return immediately
//
// ****************************************************************************
......@@ -3455,6 +3458,13 @@ avtGenericDatabase::CommunicateGhosts(avtDatasetCollection &ds,
avtVarType type = md->DetermineVarType(varname);
std::string meshname = md->MeshForVar(varname);
//
// Return immediately if we've alread got ghost zones we've read from the
// database
//
if (md->GetContainsGhostZones(meshname) == AVT_HAS_GHOSTS)
return false;
void_ref_ptr vr = cache.GetVoidRef("any_mesh",
AUXILIARY_DATA_DOMAIN_BOUNDARY_INFORMATION,
-1, -1);
......@@ -3939,23 +3949,21 @@ avtGenericDatabase::CommunicateGhosts(avtDatasetCollection &ds,
}
int shouldStop = (haveGlobalNodeIds ? 0 : 1);
if (haveGlobalNodeIds)
{
#ifdef PARALLEL
int parallelShouldStop;
MPI_Allreduce(&shouldStop, &parallelShouldStop, 1, MPI_INT, MPI_MAX,
MPI_COMM_WORLD);
shouldStop = parallelShouldStop;
int parallelShouldStop;
MPI_Allreduce(&shouldStop, &parallelShouldStop, 1, MPI_INT, MPI_MAX,
MPI_COMM_WORLD);
shouldStop = parallelShouldStop;
#endif
if (shouldStop > 0)
{
debug1 << "Not applying ghost zones because not all the domains "
<< "have global node ids." << endl;
return false;
}
if (shouldStop > 0)
{
debug1 << "Not applying ghost zones because not all the domains "
<< "have global node ids." << endl;
return false;
}
else
{
int timerHandle = visitTimer->StartTimer();
//
......
config-site/adelie0.conf
View file @ 2202a72d
......@@ -4,43 +4,61 @@
VISITHOME=/usr/gapps/visit
##
## Use the g++ 2.96 compiler.
## Use the g++ 3.2.3 compiler.
##
CXX=/usr/local/bin/g++-2.96
##
## Use the newest versions of the silo include files and library files
##
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4/redhat_7a_ia32_qsw/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4/redhat_7a_ia32_qsw/lib
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/current/redhat_7a_ia32_qsw
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/redhat_7a_ia32_qsw
VTK=$VISITHOME/vtk/2003.10.28/linux_chaos_gcc_3.3.3
fi
##
## If QTDIR is not set, use our Qt
##
if test -z "$QTDIR"; then
QTDIR=$VISITHOME/qt/2.3.0/redhat_7a_ia32_qsw
QTDIR=$VISITHOME/qt/3.3.2/linux_chaos_gcc_3.3.3
fi
##
## Use VisIt's Python.
##
PYDIR=$VISITHOME/python/redhat_7a_ia32_qsw
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_gnu/include $CXXFLAGS"
MPI_LIBS="-L/usr/lib/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
##
## HDF5
##
......@@ -53,15 +71,7 @@ DEFAULT_HDF5_LIB=/usr/local/hdf5/hdf5-1.6.0/serial/lib
MILI_DIR=/usr/gapps/visit/mili/current/redhat_7
##
## Boxlib
##
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/redhat_7/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/redhat_7/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/redhat_7/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/redhat_7/lib
##
## Add parallel arguments
## Silo
##
CXXFLAGS="-I/usr/lib/mpi/include $CXXFLAGS"
MPI_LIBS="-L/usr/lib/mpi/lib -lmpi -lelan -lelan3 -lrmscall"
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4/chaos_2_ia32_elan3/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4/chaos_2_ia32_elan3/lib
config-site/adelie1.conf
View file @ 2202a72d
......@@ -4,43 +4,61 @@
VISITHOME=/usr/gapps/visit
##
## Use the g++ 2.96 compiler.
## Use the g++ 3.2.3 compiler.
##
CXX=/usr/local/bin/g++-2.96
##
## Use the newest versions of the silo include files and library files
##
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4/redhat_7a_ia32_qsw/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4/redhat_7a_ia32_qsw/lib
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/current/redhat_7a_ia32_qsw
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/redhat_7a_ia32_qsw
VTK=$VISITHOME/vtk/2003.10.28/linux_chaos_gcc_3.3.3
fi
##
## If QTDIR is not set, use our Qt
##
if test -z "$QTDIR"; then
QTDIR=$VISITHOME/qt/2.3.0/redhat_7a_ia32_qsw
QTDIR=$VISITHOME/qt/3.3.2/linux_chaos_gcc_3.3.3
fi
##
## Use VisIt's Python.