Commit b64465c5 authored by hrchilds's avatar hrchilds

Update from January 30, 2006

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@609 18c085ea-50e0-402c-830e-de6fd14e8384
parent 8a5a6edb
......@@ -21,7 +21,6 @@ user=`whoami`
#
hitit=true
sunset=true
warp=false
sc=true
tidalwave=true
white=true
......@@ -41,7 +40,6 @@ do
-none)
hitit=false
sunset=false
warp=false
sc=false
tidalwave=false
white=false
......@@ -65,14 +63,6 @@ do
sunset=true
shift
;;
-warp)
warp=false
shift
;;
+warp)
warp=true
shift
;;
-sc)
sc=false
shift
......@@ -236,55 +226,6 @@ then
fi
fi
#
# Build on warp.
#
rm -f warp
cat <<EOF > warp
#!/bin/sh
if test ! -d /scratch/$user ; then
mkdir /scratch/$user
fi
if test ! -d /scratch/$user/warp ; then
mkdir /scratch/$user/warp
fi
rm -rf /scratch/$user/warp/visitbuild
mkdir /scratch/$user/warp/visitbuild
mv warp_$dist.tar.gz /scratch/$user/warp/visitbuild/$dist.tar.gz
cd /scratch/$user/warp/visitbuild
gunzip -c $dist.tar.gz | tar xvf - > buildlog 2>&1
cd $dist
ver=\`cat VERSION\`
ver2=\`echo \$ver | tr "." "_"\`
env CXXFLAGS=-O2 ./configure >> ../buildlog 2>&1
make -j 4 >> ../buildlog 2>&1
env PARALLEL=4 make -P >> ../buildlog 2>&1
clearcase_bin/visit-bin-dist >> ../buildlog 2>&1
mv visit\$ver2.irix6.tar.gz ..
cd ..
echo " build of visit on warp" > 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
EOF
if [ $warp = true ]
then
if [ $test = no ]
then
scp -P 22 warp warp:warp_buildit
scp -P 22 $dist.tar.gz warp:warp_$dist.tar.gz
ssh -p 22 warp "chmod 750 warp_buildit;./warp_buildit"
fi
fi
#
# Build on sc.
#
......@@ -533,5 +474,5 @@ fi
#
if [ $test = no ]
then
rm -f hitit sunset warp sc tidalwave white uv lilac
rm -f hitit sunset sc tidalwave white uv lilac
fi
......@@ -57,7 +57,6 @@ gps=true
berg=true
up=true
pengra=true
mcr=true
thunder=true
gauss=true
......@@ -80,7 +79,6 @@ do
berg=false
up=false
pengra=false
mcr=false
thunder=false
gauss=false
shift
......@@ -149,14 +147,6 @@ do
pengra=true
shift
;;
-mcr)
mcr=false
shift
;;
+mcr)
mcr=true
shift
;;
-thunder)
thunder=false
shift
......@@ -599,56 +589,6 @@ then
fi
fi
#
# Build on mcr.
#
rm -f mcr
cat <<EOF > mcr
#!/bin/sh
if test ! -d /usr/tmp/$user ; then
mkdir /usr/tmp/$user
fi
if test ! -d /usr/tmp/$user/mcr ; then
mkdir /usr/tmp/$user/mcr
fi
rm -rf /usr/tmp/$user/mcr/visitbuild
mkdir /usr/tmp/$user/mcr/visitbuild
mv mcr_$dist.tar.gz /usr/tmp/$user/mcr/visitbuild/$dist.tar.gz
cd /usr/tmp/$user/mcr/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.tar.gz ..
cd ..
rm -f resultlog
echo " build of visit on mcr" > 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 [ $mcr = true ]
then
if [ $test = no ]
then
scp mcr mcr37:mcr_buildit
scp $dist.tar.gz mcr37:mcr_$dist.tar.gz
ssh mcr37 "chmod 750 mcr_buildit;./mcr_buildit" &
fi
fi
#
# Build on thunder.
#
......@@ -754,5 +694,5 @@ fi
#
if [ $test = no ]
then
rm -f kickit hoth sunspot quad gps berg up pengra mcr thunder gauss
rm -f kickit hoth sunspot quad gps berg up pengra thunder gauss
fi
......@@ -21,7 +21,6 @@ user=`whoami`
#
hitit=true
sunset=true
warp=false
sc=true
tidalwave=true
white=true
......@@ -42,7 +41,6 @@ do
-none)
hitit=false
sunset=false
warp=false
sc=false
tidalwave=false
white=false
......@@ -79,14 +77,6 @@ do
sunset=true
shift
;;
-warp)
warp=false
shift
;;
+warp)
warp=true
shift
;;
-sc)
sc=false
shift
......@@ -246,40 +236,6 @@ then
fi
fi
#
# Install on warp.
#
rm -f warp
cat <<EOF > warp
./visit-install $verflag -c closed -g visit -gw -l $ver irix6 /usr/gapps/visit > installlog 2>&1
echo "" >> resultlog 2>&1
echo " install of visit on warp" >> 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
EOF
if [ $warp = true ]
then
if [ $test = no ]
then
cat warp >> bdiv
scp tidalwave:/fc/san1/$user/tidalwave/visitbuild/visit$ver2.irix6.tar.gz .
scp -P 22 visit$ver2.irix6.tar.gz sunset:
fi
fi
#
# Install on the B Division network.
#
......@@ -486,5 +442,5 @@ fi
#
if [ $test = no ]
then
rm -f bdiv hitit sunset lc warp sc tidalwave white uv lilac
rm -f bdiv hitit sunset lc sc tidalwave white uv lilac
fi
......@@ -61,7 +61,7 @@ quad=true
gps=true
berg=true
up=true
mcr=true
pengra=true
thunder=true
gauss=true
......@@ -83,7 +83,7 @@ do
gps=false
berg=false
up=false
mcr=false
pengra=false
thunder=false
gauss=false
shift
......@@ -136,12 +136,12 @@ do
up=true
shift
;;
-mcr)
mcr=false
-pengra)
pengra=false
shift
;;
+mcr)
mcr=true
+pengra)
pengra=true
shift
;;
-thunder)
......@@ -393,7 +393,7 @@ cat <<EOF > up
#!/bin/sh
./visit-install -private -c open -g visit -gw -l $ver aix64-xlc /usr/gapps/visit > installlog 2>&1
rm -f resultlog
echo "" > resultlog 2>&1
echo "" > resultlog 2>&1
echo " install of visit on up" >> resultlog 2>&1
echo " ------------------------" >> resultlog 2>&1
echo "" >> resultlog 2>&1
......@@ -423,15 +423,15 @@ then
fi
#
# Install on mcr.
# Install on pengra.
#
rm -f mcr
cat <<EOF > mcr
rm -f pengra
cat <<EOF > pengra
#!/bin/sh
./visit-install -private -c open -g visit -gw -l $ver linux_chaos /usr/gapps/visit > installlog 2>&1
rm -f resultlog
echo " install of visit on mcr" > resultlog 2>&1
echo " -------------------------" >> resultlog 2>&1
echo " install of visit on pengra" > resultlog 2>&1
echo " ----------------------------" >> resultlog 2>&1
echo "" >> resultlog 2>&1
df -k /usr/gapps/visit >> resultlog 2>&1
echo "" >> resultlog 2>&1
......@@ -446,22 +446,15 @@ ls /usr/gapps/visit/$ver/linux-intel/plugins/databases/libI* | sed "s/\/usr\/gap
mail $emailName < resultlog
EOF
if [ $mcr = true ]
if [ $pengra = true ]
then
if [ $test = no ]
then
scp mcr37:/usr/tmp/$user/mcr/visitbuild/visit$ver2.linux.tar.gz visit$ver2.linux_chaos.tar.gz
scp pengra1:/usr/tmp/$user/pengra/visitbuild/visit$ver2.linux.tar.gz visit$ver2.linux_chaos.tar.gz
scp visit$ver2.linux_chaos.tar.gz gps15:
scp visit-install gps15:
scp mcr gps15:mcr_install
ssh gps15 "chmod 750 mcr_install;./mcr_install"
# Temporary until all the machines are upgraded to chaos 3. These
# libraries are needed to run chaos 2 executables on chaos 3 systems.
scp mcr37:/usr/lib/libstdc++.so.5.0.3 .
scp mcr37:/lib/libgcc_s.so.1 .
chmod 664 libstdc++.so.5.0.3 libgcc_s.so.1
scp libstdc++.so.5.0.3 gps15:/usr/gapps/visit/$ver/linux-intel/lib
scp libgcc_s.so.1 gps15:/usr/gapps/visit/$ver/linux-intel/lib
scp pengra gps15:pengra_install
ssh gps15 "chmod 750 pengra_install;./pengra_install"
fi
fi
......@@ -542,5 +535,5 @@ fi
#
if [ $test = no ]
then
rm -f hoth sunspot quad gps berg up mcr thunder gauss
rm -f hoth sunspot quad gps berg up pengra thunder gauss
fi
......@@ -5559,6 +5559,9 @@ avtGenericDatabase::ReadDataset(avtDatasetCollection &ds, intVector &domains,
// Hank Childs, Sun Mar 6 09:14:52 PST 2005
// Only do collective communication if we are not in DLB mode.
//
// Hank Childs, Thu Jan 26 10:07:14 PST 2006
// Do not use non-robust ghost nodes. ['6900]
//
// ****************************************************************************
bool
......@@ -5638,6 +5641,20 @@ avtGenericDatabase::CommunicateGhosts(avtGhostDataType ghostType,
" This also counts synchronization.");
int portion2 = visitTimer->StartTimer();
//
// The unstructured mesh domain boundaries code can create situations
// where ghost nodes identify faces as ghost that are actually real.
// Create ghost zones in this case.
//
if (ghostType == GHOST_NODE_DATA)
{
if (hasDomainBoundaryInfo)
if (!dbi->CreatesRobustGhostNodes())
ghostType = GHOST_ZONE_DATA;
if (md->GetMesh(meshname)->meshType == AVT_UNSTRUCTURED_MESH)
ghostType = GHOST_ZONE_DATA;
}
//
// Now its decision time. We know what tools we can use -- whether or not
// we have domain boundary information and whether or not we can use global
......@@ -5836,6 +5853,9 @@ avtGenericDatabase::CommunicateGhostZonesFromDomainBoundariesFromFile(
// Hank Childs, Wed Jun 29 15:24:35 PDT 2005
// Call ResetCachedMembers.
//
// Hank Childs, Fri Jan 27 08:57:17 PST 2006
// Add support for exchanging global node and zone numbers.
//
// ****************************************************************************
bool
......@@ -6267,6 +6287,50 @@ avtGenericDatabase::CommunicateGhostZonesFromDomainBoundaries(
}
}
//
// Exchange GlobalNodeIds.
//
if (spec->NeedGlobalNodeNumbers())
{
vector<vtkDataArray *> nodeNums;
for (j = 0 ; j < doms.size() ; j++)
{
vtkDataSet *ds1 = list[j];
nodeNums.push_back(ds1->GetPointData()->GetArray(
"avtGlobalNodeNumbers"));
}
vector<vtkDataArray *> nodeNumsOut;
nodeNumsOut = dbi->ExchangeIntVector(doms,true,nodeNums);
for (j = 0 ; j < doms.size() ; j++)
{
vtkDataSet *ds1 = ds.GetDataset(j, 0);
ds1->GetPointData()->AddArray(nodeNumsOut[j]);
nodeNumsOut[j]->Delete();
}
}
//
// Exchange GlobalZoneNumbers Arrays.
//
if (spec->NeedGlobalZoneNumbers())
{
vector<vtkDataArray *> cellNums;
for (j = 0 ; j < doms.size() ; j++)
{
vtkDataSet *ds1 = list[j];
cellNums.push_back(ds1->GetCellData()->GetArray(
"avtGlobalZoneNumbers"));
}
vector<vtkDataArray *> cellNumsOut;
cellNumsOut = dbi->ExchangeIntVector(doms,false,cellNums);
for (j = 0 ; j < doms.size() ; j++)
{
vtkDataSet *ds1 = ds.GetDataset(j, 0);
ds1->GetCellData()->AddArray(cellNumsOut[j]);
cellNumsOut[j]->Delete();
}
}
//
// We added references to the mesh with no ghost zones so that we could
// reference it through the communication. Now that we are done,
......
......@@ -48,6 +48,9 @@ class avtMaterial;
// Hank Childs, Mon Jun 27 16:28:22 PDT 2005
// Added virtual method ResetCachedMembers.
//
// Hank Childs, Thu Jan 26 10:04:34 PST 2006
// Add virtual method "CreatesRobustGhostNodes".
//
// ****************************************************************************
class DATABASE_API avtDomainBoundaries
......@@ -80,6 +83,8 @@ class DATABASE_API avtDomainBoundaries
virtual void CreateGhostNodes(vector<int> domainNum,
vector<vtkDataSet*> meshes,
vector<int> &) =0;
virtual bool CreatesRobustGhostNodes(void)
{ return true; };
virtual bool RequiresCommunication(avtGhostDataType) = 0;
virtual bool ConfirmMesh(vector<int> domainNum,
vector<vtkDataSet*> meshes) =0;
......
......@@ -47,6 +47,9 @@ class avtMaterial;
// Hank Childs, Sun Feb 27 12:12:03 PST 2005
// Added RequiresCommunication. Also added argument to CreateGhostNodes.
//
// Hank Childs, Thu Jan 26 10:04:34 PST 2006
// Add virtual method "CreatesRobustGhostNodes".
//
// ****************************************************************************
class DATABASE_API avtUnstructuredDomainBoundaries : public avtDomainBoundaries
......@@ -92,6 +95,8 @@ class DATABASE_API avtUnstructuredDomainBoundaries : public avtDomainBoundaries
virtual void CreateGhostNodes(vector<int> domainNum,
vector<vtkDataSet*> meshes,
vector<int> &allDomains);
virtual bool CreatesRobustGhostNodes(void)
{ return false; };
virtual bool RequiresCommunication(avtGhostDataType);
virtual bool ConfirmMesh(vector<int> domainNum,
......
......@@ -37,13 +37,13 @@ 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
QT_BIN=$VISITHOME/qt/3.3.2/chaos_2_ia32_elan3_gcc_3.2.3/bin
fi
if test -z "$QT_INCLUDE"; then
QT_INCLUDE=$VISITHOME/qt/3.3.2/linux_chaos_gcc_3.3.3/include
QT_INCLUDE=$VISITHOME/qt/3.3.2/chaos_2_ia32_elan3_gcc_3.2.3/include
fi
if test -z "$QT_LIB"; then
QT_LIB=$VISITHOME/qt/3.3.2/linux_chaos_gcc_3.3.3/lib
QT_LIB=$VISITHOME/qt/3.3.2/chaos_2_ia32_elan3_gcc_3.2.3/lib
fi
##
......
......@@ -37,13 +37,13 @@ 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
QT_BIN=$VISITHOME/qt/3.3.2/chaos_2_ia32_elan3_gcc_3.2.3/bin
fi
if test -z "$QT_INCLUDE"; then
QT_INCLUDE=$VISITHOME/qt/3.3.2/linux_chaos_gcc_3.3.3/include
QT_INCLUDE=$VISITHOME/qt/3.3.2/chaos_2_ia32_elan3_gcc_3.2.3/include
fi
if test -z "$QT_LIB"; then
QT_LIB=$VISITHOME/qt/3.3.2/linux_chaos_gcc_3.3.3/lib
QT_LIB=$VISITHOME/qt/3.3.2/chaos_2_ia32_elan3_gcc_3.2.3/lib
fi
##
......
......@@ -37,13 +37,13 @@ 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
QT_BIN=$VISITHOME/qt/3.3.2/chaos_2_ia32_elan3_gcc_3.2.3/bin
fi
if test -z "$QT_INCLUDE"; then
QT_INCLUDE=$VISITHOME/qt/3.3.2/linux_chaos_gcc_3.3.3/include
QT_INCLUDE=$VISITHOME/qt/3.3.2/chaos_2_ia32_elan3_gcc_3.2.3/include
fi
if test -z "$QT_LIB"; then
QT_LIB=$VISITHOME/qt/3.3.2/linux_chaos_gcc_3.3.3/lib
QT_LIB=$VISITHOME/qt/3.3.2/chaos_2_ia32_elan3_gcc_3.2.3/lib
fi
##
......
......@@ -6,8 +6,8 @@ VISITHOME=/usr/gapps/visit
##
## Use the g++ 3.3.3 compiler.
##
CC=gcc-3.3.3
CXX=g++-3.3.3
CC=gcc-3.2.3
CXX=g++-3.2.3
##
## If MESA is not set, use VisIt's mesa.
......@@ -27,13 +27,13 @@ fi
## If QT is not set, use VisIt's Qt.
##
if test -z "$QT_BIN"; then
QT_BIN=$VISITHOME/qt/3.3.2/chaos_3_ia64_elan4_gcc_3.3.3/bin
QT_BIN=$VISITHOME/qt/3.3.2/chaos_3_ia64_elan4_gcc_3.2.3/bin
fi
if test -z "$QT_INCLUDE"; then
QT_INCLUDE=$VISITHOME/qt/3.3.2/chaos_3_ia64_elan4_gcc_3.3.3/include
QT_INCLUDE=$VISITHOME/qt/3.3.2/chaos_3_ia64_elan4_gcc_3.2.3/include
fi
if test -z "$QT_LIB"; then
QT_LIB=$VISITHOME/qt/3.3.2/chaos_3_ia64_elan4_gcc_3.3.3/lib
QT_LIB=$VISITHOME/qt/3.3.2/chaos_3_ia64_elan4_gcc_3.2.3/lib
fi
##
......
......@@ -6,8 +6,8 @@ VISITHOME=/usr/gapps/visit
##
## Use the g++ 3.3.3 compiler.
##
CC=gcc-3.3.3
CXX=g++-3.3.3
CC=gcc-3.2.3
CXX=g++-3.2.3
##
## If MESA is not set, use VisIt's mesa.
......@@ -27,13 +27,13 @@ fi
## If QT is not set, use VisIt's Qt.
##
if test -z "$QT_BIN"; then
QT_BIN=$VISITHOME/qt/3.3.2/chaos_3_ia64_elan4_gcc_3.3.3/bin
QT_BIN=$VISITHOME/qt/3.3.2/chaos_3_ia64_elan4_gcc_3.2.3/bin
fi
if test -z "$QT_INCLUDE"; then
QT_INCLUDE=$VISITHOME/qt/3.3.2/chaos_3_ia64_elan4_gcc_3.3.3/include
QT_INCLUDE=$VISITHOME/qt/3.3.2/chaos_3_ia64_elan4_gcc_3.2.3/include
fi
if test -z "$QT_LIB"; then
QT_LIB=$VISITHOME/qt/3.3.2/chaos_3_ia64_elan4_gcc_3.3.3/lib
QT_LIB=$VISITHOME/qt/3.3.2/chaos_3_ia64_elan4_gcc_3.2.3/lib
fi
##
......
......@@ -6,8 +6,8 @@ VISITHOME=/usr/gapps/visit
##
## Use the g++ 3.3.3 compiler.
##
CC=gcc-3.3.3
CXX=g++-3.3.3
CC=gcc-3.2.3
CXX=g++-3.2.3
##
## If MESA is not set, use VisIt's mesa.
......@@ -27,13 +27,13 @@ fi
## If QT is not set, use VisIt's Qt.
##
if test -z "$QT_BIN"; then
QT_BIN=$VISITHOME/qt/3.3.2/chaos_3_ia64_elan4_gcc_3.3.3/bin
QT_BIN=$VISITHOME/qt/3.3.2/chaos_3_ia64_elan4_gcc_3.2.3/bin
fi
if test -z "$QT_INCLUDE"; then
QT_INCLUDE=$VISITHOME/qt/3.3.2/chaos_3_ia64_elan4_gcc_3.3.3/include
QT_INCLUDE=$VISITHOME/qt/3.3.2/chaos_3_ia64_elan4_gcc_3.2.3/include
fi
if test -z "$QT_LIB"; then
QT_LIB=$VISITHOME/qt/3.3.2/chaos_3_ia64_elan4_gcc_3.3.3/lib
QT_LIB=$VISITHOME/qt/3.3.2/chaos_3_ia64_elan4_gcc_3.2.3/lib
fi
##
......
......@@ -6,8 +6,8 @@ VISITHOME=/usr/gapps/visit
##
## Use the g++ 3.3.3 compiler.
##
CC=gcc-3.3.3
CXX=g++-3.3.3
CC=gcc-3.2.3
CXX=g++-3.2.3
##
## If MESA is not set, use VisIt's mesa.
......@@ -27,13 +27,13 @@ fi
## If QT is not set, use VisIt's Qt.
##
if test -z "$QT_BIN"; then
QT_BIN=$VISITHOME/qt/3.3.2/chaos_3_ia64_elan4_gcc_3.3.3/bin
QT_BIN=$VISITHOME/qt/3.3.2/chaos_3_ia64_elan4_gcc_3.2.3/bin
fi
if test -z "$QT_INCLUDE"; then
QT_INCLUDE=$VISITHOME/qt/3.3.2/chaos_3_ia64_elan4_gcc_3.3.3/include
QT_INCLUDE=$VISITHOME/qt/3.3.2/chaos_3_ia64_elan4_gcc_3.2.3/include
fi
if test -z "$QT_LIB"; then
QT_LIB=$VISITHOME/qt/3.3.2/chaos_3_ia64_elan4_gcc_3.3.3/lib
QT_LIB=$VISITHOME/qt/3.3.2/chaos_3_ia64_elan4_gcc_3.2.3/lib
fi
##
......
......@@ -76,6 +76,9 @@ dune_getline(std::ifstream &ifile, std::string &str)
// Hank Childs, Mon Nov 21 11:25:48 PST 2005
// Replace getline with dune_getline.
//
// Hank Childs, Thu Jan 26 11:06:59 PST 2006
// NULL terminate ostrstreams.
//
// ****************************************************************************
avtDuneFileFormat::avtDuneFileFormat(const char *filename)
......@@ -185,9 +188,9 @@ avtDuneFileFormat::avtDuneFileFormat(const char *filename)
// based on the number of materials
for (int i = 0; i < max_species; i++) {
ostrstream ss;
ss << SPECIES_BASE << i+1;
ss << SPECIES_BASE << i+1 << '\0';
ostrstream sm;
sm << MATERIAL_BASE << i+1;
sm << MATERIAL_BASE << i+1 << '\0';
matnames.push_back(sm.str());
species_names.push_back(ss.str());
species_to_matname[ss.str()] = sm.str();
......@@ -455,6 +458,8 @@ avtDuneFileFormat::FreeUpResources(void)
// Fri Sep 16 09:20:59 PDT 2005
// (DMS) - Simplified AddMaterialToMetaData section.
//
// Hank Childs, Thu Jan 26 11:06:59 PST 2006
// NULL terminate ostrstreams.
//
// ****************************************************************************
......@@ -548,7 +553,7 @@ avtDuneFileFormat::PopulateDatabaseMetaData(avtDatabaseMetaData *md, int timeSta
string material_name = "fragments";
if (matnames.size() == 0) {
ostrstream ss;
ss << "material_" << 1;
ss << "material_" << 1 << '\0';
matnames.push_back(ss.str());
}
......
......@@ -458,6 +458,10 @@ avtSubsetPlot::ApplyOperators(avtDataObject_p input)
// Jeremy Meredith, Thu Jun 12 10:03:53 PDT 2003
// Reverted back to old version now that we have an unfilled boundary.
//
// Hank Childs, Thu Jan 26 11:38:15 PST 2006
// No longer do face consolidation with feature edges because ghost nodes
// can screw it up.
//
// ****************************************************************************
avtDataObject_p
......@@ -467,6 +471,8 @@ avtSubsetPlot::ApplyRenderingTransformation(avtDataObject_p input)
if (!atts.GetWireframe())
{
gzfl->SetForceFaceConsolidation(true);
fl->SetForceFaceConsolidation(true);
if ((type == SubsetAttributes::Domain ||
type == SubsetAttributes::Group)
&& atts.GetDrawInternal())
......@@ -525,6 +531,8 @@ avtSubsetPlot::ApplyRenderingTransformation(avtDataObject_p input)
}
else
{
gzfl->SetForceFaceConsolidation(false);
fl->SetForceFaceConsolidation(false);
if (type==SubsetAttributes::Domain || type==SubsetAttributes::Group)
{
// We're doing a wireframe domain subset plot:
......
# Copyright 2000 - 2006
# The Regents of the University of California.
# All rights reserved.
#
# This work was produced at the University of California, Lawrence Livermore
# National Laboratory (UC LLNL) under contract no. W-7405-ENG-48 (Contract
# 48) between the U.S. Department of Energy (DOE) and The Regents of the
# University of California (University) for the operation of UC LLNL.
# Copyright is reserved to the University for purposes of controlled
# dissemination, commercialization through formal licensing, or other
# disposition under terms of Contract 48; DOE policies, regulations and
# orders; and U.S. statutes. The rights of the Federal Government are
# reserved under Contract 48 subject to the restrictions agreed upon by DOE
# and University.
#