Commit 9baaaabc authored by hrchilds's avatar hrchilds
Browse files

Update from July 11, 2005

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@498 18c085ea-50e0-402c-830e-de6fd14e8384
parent c4726b7c
......@@ -812,9 +812,9 @@ env command for configure.
#
# Build and install it in the visit directory.
#
gunzip visit050516.tar.gz
tar xf visit050516.tar
cd visit050516/config-site
gunzip visit050718.tar.gz
tar xf visit050718.tar
cd visit050718/config-site
echo VISITHOME=$VISITDIR > `hostname`.conf
sed "s/ARCH/$VISITARCH/" Template.conf >> `hostname`.conf
cd ..
......@@ -823,12 +823,12 @@ 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.3 aix $VISITDIR
clearcase_bin/visit-install 1.4.3 irix6 $VISITDIR
clearcase_bin/visit-install 1.4.3 linux $VISITDIR
clearcase_bin/visit-install 1.4.3 linux-ia64 $VISITDIR
clearcase_bin/visit-install 1.4.3 osf1 $VISITDIR
clearcase_bin/visit-install 1.4.3 sunos5 $VISITDIR
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
When running the configure script you can enable or disable certain dependent
packages. All the configure options are listed at the beginning of the
......
......@@ -682,9 +682,9 @@ More information about building VisIt follows after that.
#
# Unzipping VisIt's source code distribution
#
gunzip visit050516.tar.gz
tar xf visit050516.tar
cd visit050516
gunzip visit050718.tar.gz
tar xf visit050718.tar
cd visit050718
#
# HDF5 and Silo
......
......@@ -17,7 +17,7 @@ Unix and Mac OS X:
where
"version" will be 1.4.3 for the current distribution.
"version" will be 1.4.4 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.3 irix6 /usr/local/visit
visit-install 1.4.4 irix6 /usr/local/visit
will install the irix6, 1.4.3 version of visit in the directory
will install the irix6, 1.4.4 version of visit in the directory
"/usr/local/visit". Note that you will need to have the file
"visit1_4_3.irix6.tar.gz" present in the current directory for this
"visit1_4_4.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.3 linux /usr/local/visit
visit-install 1.4.4 linux /usr/local/visit
to add a linux, 1.4.3 version of visit to the same directory.
to add a linux, 1.4.4 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.3.exe to your desktop.
1. Copy the file visit1.4.4.exe to your desktop.
2. Double click on the visit1.4.3.exe icon to run the installer.
2. Double click on the visit1.4.4.exe icon to run the installer.
3. Follow the directions provided by the installer.
......@@ -375,16 +375,16 @@ fi
rm -f gps
cat <<EOF > gps
#!/bin/sh
if test ! -e /nfs/tmp3/$user ; then
mkdir /nfs/tmp3/$user
if test ! -e /nfs/tmp0/$user ; then
mkdir /nfs/tmp0/$user
fi
if test ! -e /nfs/tmp3/$user/gps; then
mkdir /nfs/tmp3/$user/gps
if test ! -e /nfs/tmp0/$user/gps; then
mkdir /nfs/tmp0/$user/gps
fi
rm -rf /nfs/tmp3/$user/gps/visitbuild
mkdir /nfs/tmp3/$user/gps/visitbuild
mv gps_$dist.tar.gz /nfs/tmp3/$user/gps/visitbuild/$dist.tar.gz
cd /nfs/tmp3/$user/gps/visitbuild
rm -rf /nfs/tmp0/$user/gps/visitbuild
mkdir /nfs/tmp0/$user/gps/visitbuild
mv gps_$dist.tar.gz /nfs/tmp0/$user/gps/visitbuild/$dist.tar.gz
cd /nfs/tmp0/$user/gps/visitbuild
gunzip -c $dist.tar.gz | tar xvf - > buildlog 2>&1
cd $dist
ver=\`cat VERSION\`
......
......@@ -321,7 +321,7 @@ if [ $gps = true ]
then
if [ $test = no ]
then
scp gps15:/nfs/tmp3/$user/gps/visitbuild/visit$ver2.osf1.tar.gz .
scp gps15:/nfs/tmp0/$user/gps/visitbuild/visit$ver2.osf1.tar.gz .
scp visit$ver2.osf1.tar.gz gps15:
scp visit-install gps15:
scp gps gps15:gps_install
......
......@@ -73,7 +73,7 @@ avtRoundFilter::DoOperation(vtkDataArray *in, vtkDataArray *out,
for (int j = 0 ; j < ncomponents ; j++)
{
float val = in->GetComponent(i, j);
out->SetComponent(i, j, round(val));
out->SetComponent(i, j, floor(val+0.5));
}
}
}
......
......@@ -1188,6 +1188,9 @@ inline int FindIndex(const float &pt, const int &last_hit, const int &n,
// Hank Childs, Fri Nov 19 14:50:58 PST 2004
// Renamed from Extract.
//
// Hank Childs, Mon Jul 11 14:01:28 PDT 2005
// Fix indexing issue with ghost zones ['5712].
//
// ****************************************************************************
void
......@@ -1298,7 +1301,7 @@ avtMassVoxelExtractor::ExtractImageSpaceGrid(vtkRectilinearGrid *rgrid)
//
if (ghosts != NULL)
{
int index = (zind)*nX*nY + (yind)*nX + (xind);
int index = zind*((nX-1)*(nY-1)) + yind*(nX-1) + xind;
if (ghosts->GetValue(index) != 0)
continue;
}
......
......@@ -480,7 +480,7 @@ avtLine2DColleague::SetOptions(const AnnotationObject &annot)
else if(beginArrowStyle == 2)
allData->AddInput(beginArrowSolid);
if(endArrowStyle && not allData)
if(endArrowStyle && ! allData)
allData = vtkAppendPolyData::New();
if(endArrowStyle == 1)
......
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