Commit f36a3a91 authored by hrchilds's avatar hrchilds
Browse files

Update from March 14, 2007

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@831 18c085ea-50e0-402c-830e-de6fd14e8384
parent 2d5be377
......@@ -17,7 +17,7 @@ shell prompt.
Python 2.5 Scripting Language http://www.python.org
Qt 3.3.2 GUI Toolkit http://www.trolltech.com
Silo 4.5.1 File I/O library http://www.llnl.gov/bdiv/meshtv
VTK 5.0.0b Visualization Toolkit http://www.kitware.com
VTK 5.0.0c Visualization Toolkit http://www.kitware.com
The public version of VisIt has been built with the above listed versions
......@@ -38,6 +38,7 @@ build and install those libraries prior to building VisIt.
Library Version Description For More Information
======= ======= =========== ====================
Boxlib ??? An AMR I/O library ???
ExodusII 4.46 File I/O library http://www.sourceforge.net/projects/exodusII
HDF4 2.4.1 File I/O library http://hdf.ncsa.uiuc.edu/hdf4.html
HDF5 1.6.5 File I/O library http://hdf.ncsa.uiuc.edu/HDF5/
Mili 1.10 File I/O library (none)
......@@ -241,8 +242,8 @@ make
# Build VTK
#
cd ..
gunzip vtk-5.0.0b.tar.gz
tar xf vtk-5.0.0b.tar
gunzip vtk-5.0.0c.tar.gz
tar xf vtk-5.0.0c.tar
cd VTK
#
# On irix systems we have experienced problems with CMake not using the
......@@ -367,34 +368,34 @@ make
# Install it in the visit directory under the vtk directory.
#
mkdir $VISITDIR/vtk
mkdir $VISITDIR/vtk/5.0.0b
mkdir $VISITDIR/vtk/5.0.0b/$VISITARCH
mkdir $VISITDIR/vtk/5.0.0b/$VISITARCH/{Common,Filtering,GenericFiltering,Graphics,Hybrid,IO,Imaging,MangleMesaInclude,Rendering,Utilities,VolumeRendering,lib,vtkstd,Utilities/vtktiff,Utilities/vtkexpat,Utilities/vtkzlib}
cp vtkConfigure.h $VISITDIR/vtk/5.0.0b/$VISITARCH
cp vtkToolkits.h $VISITDIR/vtk/5.0.0b/$VISITARCH
cp vtk*Instantiator.h $VISITDIR/vtk/5.0.0b/$VISITARCH
cp Common/*.h $VISITDIR/vtk/5.0.0b/$VISITARCH/Common
cp Common/*.txx $VISITDIR/vtk/5.0.0b/$VISITARCH/Common
cp Filtering/*.h $VISITDIR/vtk/5.0.0b/$VISITARCH/Filtering
cp Filtering/*.txx $VISITDIR/vtk/5.0.0b/$VISITARCH/Filtering
cp GenericFiltering/*.h $VISITDIR/vtk/5.0.0b/$VISITARCH/GenericFiltering
cp Graphics/*.h $VISITDIR/vtk/5.0.0b/$VISITARCH/Graphics
cp Hybrid/*.h $VISITDIR/vtk/5.0.0b/$VISITARCH/Hybrid
cp IO/*.h $VISITDIR/vtk/5.0.0b/$VISITARCH/IO
cp Imaging/*.h $VISITDIR/vtk/5.0.0b/$VISITARCH/Imaging
cp Rendering/*.h $VISITDIR/vtk/5.0.0b/$VISITARCH/Rendering
cp Utilities/*.h $VISITDIR/vtk/5.0.0b/$VISITARCH/Utilities
cp Utilities/vtktiff/*.h $VISITDIR/vtk/5.0.0b/$VISITARCH/Utilities/vtktiff
cp Utilities/vtkexpat/*.h $VISITDIR/vtk/5.0.0b/$VISITARCH/Utilities/vtkexpat
cp Utilities/vtkzlib/*.h $VISITDIR/vtk/5.0.0b/$VISITARCH/Utilities/vtkzlib
cp VolumeRendering/*.h $VISITDIR/vtk/5.0.0b/$VISITARCH/VolumeRendering
cp MangleMesaInclude/*.h $VISITDIR/vtk/5.0.0b/$VISITARCH/MangleMesaInclude
cp vtkstd/* $VISITDIR/vtk/5.0.0b/$VISITARCH/vtkstd
cp -d bin/*.so* $VISITDIR/vtk/5.0.0b/$VISITARCH/lib
mkdir $VISITDIR/vtk/5.0.0c
mkdir $VISITDIR/vtk/5.0.0c/$VISITARCH
mkdir $VISITDIR/vtk/5.0.0c/$VISITARCH/{Common,Filtering,GenericFiltering,Graphics,Hybrid,IO,Imaging,MangleMesaInclude,Rendering,Utilities,VolumeRendering,lib,vtkstd,Utilities/vtktiff,Utilities/vtkexpat,Utilities/vtkzlib}
cp vtkConfigure.h $VISITDIR/vtk/5.0.0c/$VISITARCH
cp vtkToolkits.h $VISITDIR/vtk/5.0.0c/$VISITARCH
cp vtk*Instantiator.h $VISITDIR/vtk/5.0.0c/$VISITARCH
cp Common/*.h $VISITDIR/vtk/5.0.0c/$VISITARCH/Common
cp Common/*.txx $VISITDIR/vtk/5.0.0c/$VISITARCH/Common
cp Filtering/*.h $VISITDIR/vtk/5.0.0c/$VISITARCH/Filtering
cp Filtering/*.txx $VISITDIR/vtk/5.0.0c/$VISITARCH/Filtering
cp GenericFiltering/*.h $VISITDIR/vtk/5.0.0c/$VISITARCH/GenericFiltering
cp Graphics/*.h $VISITDIR/vtk/5.0.0c/$VISITARCH/Graphics
cp Hybrid/*.h $VISITDIR/vtk/5.0.0c/$VISITARCH/Hybrid
cp IO/*.h $VISITDIR/vtk/5.0.0c/$VISITARCH/IO
cp Imaging/*.h $VISITDIR/vtk/5.0.0c/$VISITARCH/Imaging
cp Rendering/*.h $VISITDIR/vtk/5.0.0c/$VISITARCH/Rendering
cp Utilities/*.h $VISITDIR/vtk/5.0.0c/$VISITARCH/Utilities
cp Utilities/vtktiff/*.h $VISITDIR/vtk/5.0.0c/$VISITARCH/Utilities/vtktiff
cp Utilities/vtkexpat/*.h $VISITDIR/vtk/5.0.0c/$VISITARCH/Utilities/vtkexpat
cp Utilities/vtkzlib/*.h $VISITDIR/vtk/5.0.0c/$VISITARCH/Utilities/vtkzlib
cp VolumeRendering/*.h $VISITDIR/vtk/5.0.0c/$VISITARCH/VolumeRendering
cp MangleMesaInclude/*.h $VISITDIR/vtk/5.0.0c/$VISITARCH/MangleMesaInclude
cp vtkstd/* $VISITDIR/vtk/5.0.0c/$VISITARCH/vtkstd
cp -d bin/*.so* $VISITDIR/vtk/5.0.0c/$VISITARCH/lib
# For IRIX, solaris
# cp -R bin/*.so* $VISITDIR/vtk/5.0.0b/$VISITARCH/lib
# cp -R bin/*.so* $VISITDIR/vtk/5.0.0c/$VISITARCH/lib
# For true64,
# cp bin/*.so $VISITDIR/vtk/5.0.0b/$VISITARCH/lib
# cp bin/*.so $VISITDIR/vtk/5.0.0c/$VISITARCH/lib
cd ..
#
......@@ -1122,6 +1123,76 @@ make install
cd ..
ExodusII (Optional)
====================
EXODUS II is a library for reading and writing data for finite element
analyses. It is used for preprocessing (problem definition), postprocessing
(results visualization), as well as code to code data transfer. An EXODUS II
data file is a random access, machine independent, binary file that is
written and read via C, C++, or Fortran routines.
The EXODUS II library depends on the NetCDF library, so you will need to
build it first. When you build NetCDF, you can either modify the source
files as described in the README file that comes with EXODUS, or you can
use the NetCDF sources that we have already modified.
#
# Build and install the netcdf libraries.
#
gunzip netcdf-3.6.0-exodusii.tar.gz
tar xf netcdf-3.6.0-exodusii.tar
cd netcdf-3.6.0-exodusii/src
mkdir $VISITDIR/exodus
mkdir $VISITDIR/exodus/4.46
mkdir $VISITDIR/exodus/4.46/$VISITARCH
mkdir $VISITDIR/exodus/4.46/$VISITARCH/{inc,lib}
#
# On itanium (ia64) systems, you should add "-fPIC" to the following CFLAGS
# and CXXFLAGS. On opteron systems, you should add "-fPIC -m64" to the
# following CFLAGS and CXXFLAGS.
#
./configure --prefix=$VISITDIR/netcdf/3.6.0/$VISITARCH FC="" CFLAGS="-O2" CXXFLAGS="-O2"
make
#
# Install it under the exodus directory.
#
cp libsrc/netcdf.h $VISITDIR/exodus/4.46/$VISITARCH/inc
cp libsrc/libnetcdf.a $VISITDIR/exodus/4.46/$VISITARCH/lib
cd ../..
#
# Build and install the exodus libraries.
#
gunzip exodusii-4.46.tar.gz
tar xf exodusii-4.46.tar
cd exodusii-4.46
#
# To modify the build flags you will need to modify Makefile.standalone.
# The top of the Makefile sets a collection of flags based on the operating
# system and compiler. Add -I$(VISITDIR)/exodus/4.46/$(VISITARCH)/inc to
# CCOPTIONS under the appropriate target in the Makefile.
#
# On itanium (ia64) systems, you should add "-fPIC" to the CCOPTIONS. On
# opteron systems, you should add "-fPIC -m64" to the CCOPTIONS.
#
make -f Makefile.standalone
#
# Install it under the exodus directory.
#
cp cbind/include/exodusII.h $VISITDIR/exodus/4.46/$VISITARCH/inc
cp cbind/include/exodusII_ext.h $VISITDIR/exodus/4.46/$VISITARCH/inc
cp libexoIIv2c.a $VISITDIR/exodus/4.46/$VISITARCH/lib
cd ..
VisIt
======
......
......@@ -266,6 +266,10 @@
# Added the header files in include/vtk/Utilities/{expat,vtktiff,vtkzlib}
# to the distribution.
#
# Eric Brugger, Tue Mar 13 08:34:59 PDT 2007
# Deleted the vtk exodus and netcdf libraries from the list of required
# vtk libraries.
#
#------------------------------------------------------------------------------
set DataFiles = "TRUE"
......@@ -508,7 +512,7 @@ set GLEWLibName = "libGLEW.$SHLIB_SOEXT"
#
# Set the names of the VTK shared libraries.
#
set vtklibs="libvtkCommon libvtkDICOMParser libvtkFiltering libvtkGraphics libvtkHybrid libvtkIO libvtkImaging libvtkMPEG2Encode libvtkNetCDF libvtkRendering libvtkexoIIc libvtkexpat libvtkfreetype libvtkftgl libvtkjpeg libvtkpng libvtksys libvtktiff libvtkzlib"
set vtklibs="libvtkCommon libvtkDICOMParser libvtkFiltering libvtkGraphics libvtkHybrid libvtkIO libvtkImaging libvtkMPEG2Encode libvtkRendering libvtkexpat libvtkfreetype libvtkftgl libvtkjpeg libvtkpng libvtksys libvtktiff libvtkzlib"
#
# Check that the VTK libraries exist.
......
......@@ -770,7 +770,19 @@ fi
rm -f davinci
cat <<EOF > davinci
#!/bin/sh
mv davinci_$dist.tar.gz $dist.tar.gz
if test ! -d tmp ; then
mkdir tmp
fi
if test ! -d tmp/$user ; then
mkdir tmp/$user
fi
if test ! -d tmp/$user/davinci; then
mkdir tmp/$user/davinci
fi
rm -rf tmp/$user/davinci/visitbuild
mkdir tmp/$user/davinci/visitbuild
mv davinci_$dist.tar.gz tmp/$user/davinci/visitbuild/$dist.tar.gz
cd tmp/$user/davinci/visitbuild
gunzip -c $dist.tar.gz | tar xvf - > buildlog 2>&1
cd $dist
ver=\`cat VERSION\`
......
......@@ -652,7 +652,7 @@ if [ $davinci = true ]
then
if [ $test = no ]
then
scp davinci.nersc.gov:visit$ver2.linux-ia64.tar.gz visit$ver2.linux-altix.tar.gz
scp davinci.nersc.gov:tmp/$user/davinci/visitbuild/visit$ver2.linux-ia64.tar.gz visit$ver2.linux-altix.tar.gz
scp visit$ver2.linux-altix.tar.gz davinci.nersc.gov:
scp visit-install davinci.nersc.gov:
scp davinci davinci.nersc.gov:davinci_install
......
......@@ -179,6 +179,9 @@ SocketConnection::Fill()
// I made it use MSG_NOSIGNAL so we don't get a signal in the event that
// we can't write to the socket.
//
// Eric Brugger, Tue Mar 13 09:18:48 PDT 2007
// I made the use of MSG_NOSIGNAL conditional on its definition.
//
// ****************************************************************************
void
......@@ -199,7 +202,11 @@ SocketConnection::Flush()
#if defined(_WIN32)
send(descriptor, (const char FAR *)buf, count, 0);
#else
#ifdef MSG_NOSIGNAL
send(descriptor, (const void *)buf, count, MSG_NOSIGNAL);
#else
send(descriptor, (const void *)buf, count, 0);
#endif
#endif
count = 0;
......
......@@ -10,7 +10,7 @@ MESA=$VISITHOME/mesa/5.0/ARCH
##
## Specify the location of the vtk include files and libraries.
##
VTK=$VISITHOME/vtk/5.0.0b/ARCH
VTK=$VISITHOME/vtk/5.0.0c/ARCH
##
## Specify the location of the qt include files and libraries.
......
......@@ -14,7 +14,7 @@ fi
## If VTK is not set, use VisIt's vtk.
##
if test -z "$VTK"; then
VTK=$VISITHOME/vtk/5.0.0b/linux_rhel3_gcc_3.2.3
VTK=$VISITHOME/vtk/5.0.0c/linux_rhel3_gcc_3.2.3
fi
##
......@@ -76,8 +76,8 @@ DEFAULT_CGNS_LIB=/usr/gapps/visit/cgns/2.4/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
DEFAULT_EXODUS_INCLUDES=$VISITHOME/exodus/4.46/linux_rhel3_gcc_3.2.3/inc
DEFAULT_EXODUS_LIBRARY=$VISITHOME/exodus/4.46/linux_rhel3_gcc_3.2.3/lib
##
## GDAL
......
......@@ -14,7 +14,7 @@ MESA=$VISITHOME/mesa/5.0/suse_x86_64_gcc_4.0.2
##
## Specify the location of the vtk include files and libraries.
##
VTK=$VISITHOME/vtk/5.0.0b/suse_x86_64_gcc_4.0.2
VTK=$VISITHOME/vtk/5.0.0c/suse_x86_64_gcc_4.0.2
##
## Specify the location of the qt include files and libraries.
......
......@@ -11,7 +11,7 @@ MESA=$VISITHOME/mesa/5.0/x86_64-suse-linux_gcc
##
## Specify the location of the vtk include files and libraries.
##
VTK=$VISITHOME/vtk/5.0.0b/x86_64-suse-linux_gcc
VTK=$VISITHOME/vtk/5.0.0c/x86_64-suse-linux_gcc
##
## Specify the location of the qt include files and libraries.
......
......@@ -11,7 +11,7 @@ MESA=$VISITHOME/mesa/5.0/x86_64-suse-linux_gcc
##
## Specify the location of the vtk include files and libraries.
##
VTK=$VISITHOME/vtk/5.0.0b/x86_64-suse-linux_gcc
VTK=$VISITHOME/vtk/5.0.0c/x86_64-suse-linux_gcc
##
## Specify the location of the qt include files and libraries.
......
## Config-site file for benares, a 1GHz Linux laptop
##
## Set the VISITHOME environment variable.
##
VISITHOME=/usr/local/apps/visit
##
## If VTK is not set, use VisIt's vtk.
##
if test -z "$VTK"; then
VTK=$VISITHOME/vtk
fi
##
## Use VisIt's Silo
##
DEFAULT_SILO_INCLUDES=$VISITHOME/silo/include
DEFAULT_SILO_LIBRARY=$VISITHOME/silo/lib
##
## If QT is not set, use VisIt's Qt.
##
if test -z "$QT_BIN"; then
QT_BIN=$VISITHOME/qt/bin
fi
if test -z "$QT_INCLUDE"; then
QT_INCLUDE=$VISITHOME/qt/include
fi
if test -z "$QT_LIB"; then
QT_LIB=$VISITHOME/qt/lib
fi
......@@ -14,7 +14,7 @@ fi
## If VTK is not set, use VisIt's vtk.
##
if test -z "$VTK"; then
VTK=$VISITHOME/vtk/5.0.0b/linux_rhel3_gcc_3.2.3
VTK=$VISITHOME/vtk/5.0.0c/linux_rhel3_gcc_3.2.3
fi
##
......
......@@ -14,7 +14,7 @@ fi
## If VTK is not set, use VisIt's vtk.
##
if test -z "$VTK"; then
VTK=$VISITHOME/vtk/5.0.0b/linux_rhel3_gcc_3.2.3
VTK=$VISITHOME/vtk/5.0.0c/linux_rhel3_gcc_3.2.3
fi
##
......@@ -76,8 +76,8 @@ DEFAULT_CGNS_LIB=/usr/gapps/visit/cgns/2.4/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
DEFAULT_EXODUS_INCLUDES=$VISITHOME/exodus/4.46/linux_rhel3_gcc_3.2.3/inc
DEFAULT_EXODUS_LIBRARY=$VISITHOME/exodus/4.46/linux_rhel3_gcc_3.2.3/lib
##
## GDAL
......
......@@ -14,7 +14,7 @@ fi
## If VTK is not set, use VisIt's vtk.
##
if test -z "$VTK"; then
VTK=$VISITHOME/vtk/5.0.0b/altix_gcc_3.3.3
VTK=$VISITHOME/vtk/5.0.0c/altix_gcc_3.3.3
fi
##
......
......@@ -14,7 +14,7 @@ fi
## If VTK is not set, use VisIt's vtk.
##
if test -z "$VTK"; then
VTK=$VISITHOME/vtk/5.0.0b/altix_gcc_3.3.3
VTK=$VISITHOME/vtk/5.0.0c/altix_gcc_3.3.3
fi
##
......
......@@ -25,7 +25,7 @@ fi
## If VTK is not set, use VisIt's vtk.
##
if test -z "$VTK"; then
VTK=$VISITHOME/vtk/5.0.0b/linux_rhel3_gcc_3.2.3
VTK=$VISITHOME/vtk/5.0.0c/linux_rhel3_gcc_3.2.3
fi
##
......@@ -80,8 +80,8 @@ DEFAULT_CGNS_LIB=$VISITHOME/cgns/2.4/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
DEFAULT_EXODUS_INCLUDES=$VISITHOME/exodus/4.46/linux_rhel3_gcc_3.2.3/inc
DEFAULT_EXODUS_LIBRARY=$VISITHOME/exodus/4.46/linux_rhel3_gcc_3.2.3/lib
##
## GDAL
......
......@@ -14,7 +14,7 @@ fi
## If VTK is not set, use VisIt's vtk.
##
if test -z "$VTK"; then
VTK=$VISITHOME/vtk/5.0.0b/chaos_3_x86_64_ib_gcc_3.4.4
VTK=$VISITHOME/vtk/5.0.0c/chaos_3_x86_64_ib_gcc_3.4.4
fi
##
......
......@@ -14,7 +14,7 @@ fi
## If VTK is not set, use VisIt's vtk.
##
if test -z "$VTK"; then
VTK=$VISITHOME/vtk/5.0.0b/chaos_3_x86_64_ib_gcc_3.4.4
VTK=$VISITHOME/vtk/5.0.0c/chaos_3_x86_64_ib_gcc_3.4.4
fi
##
......
......@@ -14,7 +14,7 @@ fi
## If VTK is not set, use VisIt's vtk.
##
if test -z "$VTK"; then
VTK=$VISITHOME/vtk/5.0.0b/chaos_3_x86_64_ib_gcc_3.4.4
VTK=$VISITHOME/vtk/5.0.0c/chaos_3_x86_64_ib_gcc_3.4.4
fi
##
......
......@@ -14,7 +14,7 @@ fi
## If VTK is not set, use VisIt's vtk.
##
if test -z "$VTK"; then
VTK=$VISITHOME/vtk/5.0.0b/chaos_3_x86_64_ib_gcc_3.4.4
VTK=$VISITHOME/vtk/5.0.0c/chaos_3_x86_64_ib_gcc_3.4.4
fi
##
......
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