Commit aece2771 authored by hrchilds's avatar hrchilds

Update from August 18, 2005

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@524 18c085ea-50e0-402c-830e-de6fd14e8384
parent 9d321885
......@@ -811,9 +811,9 @@ env command for configure.
#
# Build and install it in the visit directory.
#
gunzip visit050718.tar.gz
tar xf visit050718.tar
cd visit050718/config-site
gunzip visit050829.tar.gz
tar xf visit050829.tar
cd visit050829/config-site
echo VISITHOME=$VISITDIR > `hostname`.conf
sed "s/ARCH/$VISITARCH/" Template.conf >> `hostname`.conf
cd ..
......@@ -822,12 +822,14 @@ make
clearcase_bin/visit-bin-dist
# Use the appropriate install command based on the operating system on
# which you built VisIt.
clearcase_bin/visit-install 1.4.4 aix $VISITDIR
clearcase_bin/visit-install 1.4.4 irix6 $VISITDIR
clearcase_bin/visit-install 1.4.4 linux $VISITDIR
clearcase_bin/visit-install 1.4.4 linux-ia64 $VISITDIR
clearcase_bin/visit-install 1.4.4 osf1 $VISITDIR
clearcase_bin/visit-install 1.4.4 sunos5 $VISITDIR
clearcase_bin/visit-install 1.4.5 aix $VISITDIR
clearcase_bin/visit-install 1.4.5 darwin $VISITDIR
clearcase_bin/visit-install 1.4.5 irix6 $VISITDIR
clearcase_bin/visit-install 1.4.5 linux $VISITDIR
clearcase_bin/visit-install 1.4.5 linux-ia64 $VISITDIR
clearcase_bin/visit-install 1.4.5 linux-x86_64 $VISITDIR
clearcase_bin/visit-install 1.4.5 osf1 $VISITDIR
clearcase_bin/visit-install 1.4.5 sunos5 $VISITDIR
When running the configure script you can enable or disable certain dependent
packages. All the configure options are listed at the beginning of the
......
......@@ -172,9 +172,9 @@ take this opportunity to unzip VisIt's source code distribution and set an
environment variable that will be used to identify VisIt's source code
directory.
gunzip visit050718.tar.gz
tar xf visit050718.tar
setenv VISITSOURCE `pwd`/visit050718
gunzip visit050829.tar.gz
tar xf visit050829.tar
setenv VISITSOURCE `pwd`/visit050829
==============================================================================
Building Qt as a set of prebound dynamic libraries
......@@ -835,9 +835,9 @@ More information about building VisIt follows after that.
#
# Unzipping VisIt's source code distribution
#
gunzip visit050718.tar.gz
tar xf visit050718.tar
cd visit050718
gunzip visit050829.tar.gz
tar xf visit050829.tar
cd visit050829
#
# HDF5 and Silo
......
......@@ -17,7 +17,7 @@ Unix and Mac OS X:
where
"version" will be 1.4.4 for the current distribution.
"version" will be 1.4.5 for the current distribution.
"platform" will be one of the following: aix, darwin, irix6, linux,
osf1, or sunos5 depending on the machine. The one you use should
......@@ -28,17 +28,17 @@ Unix and Mac OS X:
For example
visit-install 1.4.4 irix6 /usr/local/visit
visit-install 1.4.5 irix6 /usr/local/visit
will install the irix6, 1.4.4 version of visit in the directory
will install the irix6, 1.4.5 version of visit in the directory
"/usr/local/visit". Note that you will need to have the file
"visit1_4_4.irix6.tar.gz" present in the current directory for this
"visit1_4_5.irix6.tar.gz" present in the current directory for this
to function properly. You can install multiple binaries into the
same directory. For example, you could then execute
visit-install 1.4.4 linux /usr/local/visit
visit-install 1.4.5 linux /usr/local/visit
to add a linux, 1.4.4 version of visit to the same directory.
to add a linux, 1.4.5 version of visit to the same directory.
2. Add the bin directory below the installation directory
(/usr/local/visit/bin in our example) to each user's search path.
......@@ -76,8 +76,8 @@ Unix and Mac OS X:
Windows:
1. Copy the file visit1.4.4.exe to your desktop.
1. Copy the file visit1.4.5.exe to your desktop.
2. Double click on the visit1.4.4.exe icon to run the installer.
2. Double click on the visit1.4.5.exe icon to run the installer.
3. Follow the directions provided by the installer.
......@@ -249,7 +249,7 @@ 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
env CXXFLAGS=-O2 ./configure --enable-parallel >> ../buildlog 2>&1
make -j 4 >> ../buildlog 2>&1
clearcase_bin/visit-bin-dist >> ../buildlog 2>&1
mv visit\$ver2.linux.tar.gz ..
......
......@@ -50,7 +50,7 @@ esac
#
# Parse the execute line, providing default values for error checking.
#
kickit=true
hoth=true
sunspot=true
hyper=true
gps=true
......@@ -72,7 +72,7 @@ for abc
do
case $1 in
-none)
kickit=false
hoth=false
sunspot=false
hyper=false
gps=false
......@@ -83,12 +83,12 @@ do
thunder=false
shift
;;
-kickit)
kickit=false
-hoth)
hoth=false
shift
;;
+kickit)
kickit=true
+hoth)
hoth=true
shift
;;
-sunspot)
......@@ -196,15 +196,20 @@ ver2=`echo $ver | tr "." "_"`
ver=`echo $ver2 | tr "_" "."`
#
# Install on kickit.
# Copy visit from kickit.
#
rm -f kickit
cat <<EOF > kickit
scp kickit:/var/tmp/$user/kickit/visitbuild/visit$ver2.linux.tar.gz visit$ver2.linux_rh71.tar.gz
#
# Install on hoth.
#
rm -f hoth
cat <<EOF > hoth
#!/bin/sh
./visit-install -r -private -c open -g visit -gw -l $ver linux /usr/gapps/visit > installlog 2>&1
./visit-install -r -private -c open -g visit -gw -l $ver linux_rhel3 /usr/gapps/visit > installlog 2>&1
rm -f resultlog
echo " install of visit on kickit" > resultlog 2>&1
echo " ----------------------------" >> resultlog 2>&1
echo " install of visit on hoth" > resultlog 2>&1
echo " --------------------------" >> resultlog 2>&1
echo "" >> resultlog 2>&1
df -k /usr/gapps/visit >> resultlog 2>&1
echo "" >> resultlog 2>&1
......@@ -219,15 +224,15 @@ ls /usr/gapps/visit/$ver/linux-intel/plugins/databases/libI* | sed "s/\/usr\/gap
mail $emailName < resultlog
EOF
if [ $kickit = true ]
if [ $hoth = true ]
then
if [ $test = no ]
then
scp kickit:/var/tmp/$user/kickit/visitbuild/visit$ver2.linux.tar.gz .
scp visit$ver2.linux.tar.gz kickit:
scp hoth:/var/tmp/$user/hoth/visitbuild/visit$ver2.linux.tar.gz visit_$ver2.linux_rhel3.tar.gz
scp visit$ver2.linux_rhel3.tar.gz kickit:
scp visit-install kickit:
scp kickit kickit:kickit_install
ssh kickit "chmod 750 kickit_install;./kickit_install"
scp hoth kickit:hoth_install
ssh kickit "chmod 750 hoth_install;./hoth_install"
fi
fi
......@@ -418,7 +423,7 @@ fi
rm -f pengra
cat <<EOF > pengra
#!/bin/sh
./visit-install $verflag -c open -g visit -gw -l $ver linux /usr/gapps/visit > installlog 2>&1
./visit-install $verflag -c open -g visit -gw -l $ver linux_chaos /usr/gapps/visit > installlog 2>&1
rm -f resultlog
echo " install of visit on pengra" > resultlog 2>&1
echo " ----------------------------" >> resultlog 2>&1
......@@ -441,7 +446,7 @@ then
if [ $test = no ]
then
scp pengra1:/usr/tmp/brugger/pengra/visitbuild/visit$ver2.linux.tar.gz visit$ver2.linux_chaos.tar.gz
scp visit$ver2.linux_chaos.tar.gz gps15:visit$ver2.linux.tar.gz
scp visit$ver2.linux_chaos.tar.gz gps15:
scp visit-install gps15:
scp pengra gps15:pengra_install
ssh gps15 "chmod 750 pengra_install;./pengra_install"
......@@ -454,7 +459,7 @@ fi
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
./visit-install -r -private -c open -g visit -gw -l $ver linux_chaos /usr/gapps/visit > installlog 2>&1
rm -f resultlog
echo " install of visit on alc" > resultlog 2>&1
echo " -------------------------" >> resultlog 2>&1
......@@ -477,7 +482,7 @@ then
if [ $test = no ]
then
scp pengra1:/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$ver2.linux_chaos.tar.gz alc0:
scp visit-install alc0:
scp alc alc0:alc_install
ssh alc0 "chmod 750 alc_install;./alc_install"
......@@ -533,5 +538,5 @@ fi
#
if [ $test = no ]
then
rm -f kickit sunspot hyper gps berg up pengra alc thunder
rm -f hoth sunspot hyper gps berg up pengra alc thunder
fi
......@@ -78,6 +78,14 @@ CellReconstructor::~CellReconstructor()
// Jeremy Meredith, Thu Jun 24 10:38:05 PDT 2004
// Added Voxel and Pixel input shapes.
//
// Jeremy Meredith, Thu Aug 18 13:27:25 PDT 2005
// There was a test for a "real clean" zone that assumed the material
// that wound up being clean would always have a positive (clean) entry
// in the original matlist array. It turns out that occasionally there
// will be cells marked as mixed (negative) in the matlist array where
// all but one material have zero mix_vf's. I changed the test slightly
// to account for this.
//
// ****************************************************************************
void
CellReconstructor::ReconstructCell(int cellid_, int celltype_,
......@@ -120,7 +128,7 @@ CellReconstructor::ReconstructCell(int cellid_, int celltype_,
// of 0.0, so we don't have to worry about other
// materials intersecting with this one. In other words,
// these are the "real clean zones".
if (nm==1 && matno!=mat->GetMatlist()[cellid])
if (nm==1 && allZeros)
continue;
if (allZeros && nextOneAllZeros)
......
......@@ -49,6 +49,10 @@ using std::vector;
// Hank Childs, Sun Feb 13 13:28:52 PST 2005
// Fix a bad test that assumes mixlen is > 0.
//
// Jeremy Meredith, Thu Aug 18 13:25:06 PDT 2005
// Fixed a test that compared a negative 1-origin matlist entry into the
// mix array with mixlen in a way that assumed the entry was 0-origin.
//
// ****************************************************************************
static void
RenumberMaterialsZeroToNminusOne(int nMats, const int *const mats,
......@@ -95,12 +99,12 @@ RenumberMaterialsZeroToNminusOne(int nMats, const int *const mats,
// If we have a valid index into the mixed portion, tag it and
// skip along to the next zone.
//
if ((ml[i] < 0) && (ml[i] > -mixl))
if ((ml[i] < 0) && (ml[i] >= -mixl))
{
newml[i] = ml[i];
continue;
}
else if (ml[i] < 0 && ml[i] <= -mixl)
else if (ml[i] < 0 && ml[i] < -mixl)
{
newml[i] = nMats;
if (!haveIssuedWarning)
......
##
## 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/current/linux_rhel3_gcc_3.2.3
fi
##
## If VTK is not set, use VisIt's vtk.
##
if test -z "$VTK"; then
VTK=$VISITHOME/vtk/2003.10.28/linux_rhel3_gcc_3.2.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_rhel3_gcc_3.2.3/bin
fi
if test -z "$QT_INCLUDE"; then
QT_INCLUDE=$VISITHOME/qt/3.3.2/linux_rhel3_gcc_3.2.3/include
fi
if test -z "$QT_LIB"; then
QT_LIB=$VISITHOME/qt/3.3.2/linux_rhel3_gcc_3.2.3/lib
fi
##
## Use VisIt's Python.
##
PYDIR=$VISITHOME/python/linux_rhel3_gcc_3.2.3
PYVERSION=python2.1
##
## 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"
##
## Database reader plugin support libraries
##
###############################################################################
##
## Boxlib
##
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/linux_rhel3_gcc_3.2.3/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/linux_rhel3_gcc_3.2.3/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/linux_rhel3_gcc_3.2.3/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/linux_rhel3_gcc_3.2.3/lib
##
## Exodus
##
DEFAULT_EXODUS_INCLUDES=$VISITHOME/exodus/linux_rhel3_gcc_3.2.3/inc
DEFAULT_EXODUS_LIBRARY=$VISITHOME/exodus/linux_rhel3_gcc_3.2.3/lib
##
## HDF4
##
DEFAULT_HDF4_FLAGS=/usr/gapps/visit/hdf4/2.0/linux_rhel3_gcc_3.2.3/include
DEFAULT_HDF4_LIBS=/usr/gapps/visit/hdf4/2.0/linux_rhel3_gcc_3.2.3/lib
##
## HDF5
##
DEFAULT_HDF5_INCLUDE=/usr/gapps/hdf5/1.6.0/LinuxE3/serial/64/optim/include
DEFAULT_HDF5_LIB=/usr/gapps/hdf5/1.6.0/LinuxE3/serial/64/optim/lib
##
## Mili
##
MILI_DIR=/usr/gapps/visit/mili/current/linux_rhel3_gcc_3.2.3
##
## Silo
##
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.5-pre2/linux_rhel3_gcc_3.2.3/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.5-pre2/linux_rhel3_gcc_3.2.3/lib
##
## ViSUS
##
DEFAULT_VISUS_INCLUDE=/usr/gapps/visit/visus/linux_rhel3_gcc_3.2.3/include
DEFAULT_VISUS_LIB=/usr/gapps/visit/visus/linux_rhel3_gcc_3.2.3/lib
......@@ -70,6 +70,8 @@ enhancements and bug-fixes that were added to this release.</p>
<li>Pick letters are not visible with an opaque Mesh plot of Boxlib data.</li>
<li>Node pick query over time for expression in Mili file fails.</li>
</ul>
<p>Click the following link to view the release notes for the next version
of VisIt: <a href="relnotes1.4.5.html">VisIt 1.4.5 Release Notes</a>.</p>
<p>Click the following link to view the release notes for the previous version
of VisIt: <a href="relnotes1.4.3.html">VisIt 1.4.3 Release Notes</a>.</p>
</body>
......
This diff is collapsed.
......@@ -372,15 +372,22 @@ avtMeshFilter::RefashionDataObjectInfo(void)
// Kathleen Bonnell, Tue Nov 2 10:37:14 PST 2004
// Handle point meshes differently.
//
// Jeremy Meredith, Thu Aug 18 10:55:35 PDT 2005
// Don't turn on zone numbers for point meshes. It doesn't make sense, and
// it can wind up doing strange things later (e.g. with pick -- see '6550).
//
// ****************************************************************************
avtPipelineSpecification_p
avtMeshFilter::PerformRestriction(avtPipelineSpecification_p spec)
{
avtPipelineSpecification_p rv = new avtPipelineSpecification(spec);
rv->GetDataSpecification()->TurnZoneNumbersOn();
if (GetInput()->GetInfo().GetAttributes().GetTopologicalDimension() == 0)
if (GetInput()->GetInfo().GetAttributes().GetTopologicalDimension() != 0)
{
rv->GetDataSpecification()->TurnZoneNumbersOn();
}
else
{
string pointVar = atts.GetPointSizeVar();
avtDataSpecification_p dspec = spec->GetDataSpecification();
......
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