Commit 90623cfe authored by hrchilds's avatar hrchilds

Update from August 18, 2004

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@303 18c085ea-50e0-402c-830e-de6fd14e8384
parent 054a661c
......@@ -43,7 +43,7 @@ operating systems. It is suggested that you use the same compilers.
Operating System Compiler
================ ========
AIX 5.1 g++ 3.3.3
AIX 5.1 g++ 3.2.3
IRIX64 6.5 MIPSpro 7.3.1.2m and MIPSpro 7.4
Linux 7.1 and 7.2 g++ 2.96 or g++ 3.2.3
Solaris 7 g++ 2.95.2 or g++ 3.2
......@@ -55,6 +55,7 @@ compile VisIt or will generate bad code.
Operating System Compiler
================ ========
Linux 7.1 and 7.2 g++ 3.3 -> 3.3.3
AIX 5.1 g++ 3.3 -> 3.3.3
It is essential that you build all the dependent packages and VisIt using
the same c++ compiler or you will encounter linking problems because different
......@@ -248,6 +249,16 @@ cd VTK
# of <sstream>, which requires rtti.
#
#
# On linux systems the link line generated for the Hybrid and Rendering
# libraries will have the X11 library directory listed before the mesa
# library directory which may cause the library to be linked against the
# osmesa library in the X11 directory instead of the one that comes with
# our version of mangled mesa. To correct this problem you will need to
# edit the Makefiles in the Hybrid and Rendering directories to swap the
# order of the X11 library directory and the mesa library directory.
#
#
# On tru64 systems using g++ 3.0.4, several files in the Imaging directory
# will not compile because of an internal compiler error. You will need to
......@@ -348,9 +359,7 @@ make
mkdir $VISITDIR/qt
mkdir $VISITDIR/qt/2.3.0
mkdir $VISITDIR/qt/2.3.0/$VISITARCH
mkdir $VISITDIR/qt/2.3.0/$VISITARCH/bin
mkdir $VISITDIR/qt/2.3.0/$VISITARCH/include
mkdir $VISITDIR/qt/2.3.0/$VISITARCH/lib
mkdir $VISITDIR/qt/2.3.0/$VISITARCH/{bin,include,lib}
cp bin/{designer,findtr,moc,qt20fix,qtrename140} $VISITDIR/qt/2.3.0/$VISITARCH/bin
cd include; cp *.h $VISITDIR/qt/2.3.0/$VISITARCH/include
cd ../lib;find . -print | cpio -pvmud $VISITDIR/qt/2.3.0/$VISITARCH/lib
......@@ -397,9 +406,7 @@ make
mkdir $VISITDIR/qt
mkdir $VISITDIR/qt/3.0.2
mkdir $VISITDIR/qt/3.0.2/$VISITARCH
mkdir $VISITDIR/qt/3.0.2/$VISITARCH/bin
mkdir $VISITDIR/qt/3.0.2/$VISITARCH/include
mkdir $VISITDIR/qt/3.0.2/$VISITARCH/lib
mkdir $VISITDIR/qt/2.3.0/$VISITARCH/{bin,include,lib}
cp bin/{designer,findtr,moc,qt20fix,qtrename140} $VISITDIR/qt/3.0.2/$VISITARCH/bin
cd include; cp *.h $VISITDIR/qt/3.0.2/$VISITARCH/include
cp private/*.h $VISITDIR/qt/3.0.2/$VISITARCH/include/private
......@@ -472,11 +479,21 @@ setenv LD_LIBRARY64_PATH $QTDIR/lib:$LD_LIBRARY64_PATH # SGI
# # define NAN (::nan())
# #endif
#
# On aix systems you will need to make the following changes to
# the file mkspecs/aix-g++/qmake.conf:
# On aix systems qt will normally find non c++ compliant X11 header files in
# /usr/lpp/X11/include. You will need to make the following changes to the
# file mkspecs/aix-g++/qmake.conf:
# remove "/usr/X11R6/include" from QMAKE_INCDIR_X11
# remove "/usr/X11R6/include" from QMAKE_INCDIR_OPENGL
#
# On linux systems if the OpenGL library is built with threading support,
# qt won't by default compile the QGL widget. To overcome this problem you
# will need to add "-thread" to the configure line. When qt creates the
# qt library it will name it qt-mt instead of qt. This will cause problems
# linking visit. To fix this you should first build qt, having it create
# libqt-mt.so. Then remove all occurances of "-mt" from src/Makefile and
# issue the make command again. It will now create the qt library properly
# named for visit.
#
make
#
......@@ -485,10 +502,8 @@ make
mkdir $VISITDIR/qt
mkdir $VISITDIR/qt/3.3.2
mkdir $VISITDIR/qt/3.3.2/$VISITARCH
mkdir $VISITDIR/qt/3.3.2/$VISITARCH/bin
mkdir $VISITDIR/qt/3.3.2/$VISITARCH/include
mkdir $VISITDIR/qt/3.3.2/$VISITARCH/{bin,include,lib}
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/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
......@@ -507,6 +522,7 @@ Silo
Silo is a self-describing, machine-independent scientific file format.
Silo is one of the file formats supported by VisIt. Follow the directions
listed below to build Silo. If you have any problems building or installing
Silo, read the BUILD_NOTES file in the Silo distribution for more information.
On itanium (ia64) systems, the -fpic flag is needed. You can replace
CFLAGS=-O2 with CFLAGS="-fpic -O2" in the configure command below.
......@@ -528,13 +544,10 @@ make
mkdir $VISITDIR/silo
mkdir $VISITDIR/silo/4.4
mkdir $VISITDIR/silo/4.4/$VISITARCH
mkdir $VISITDIR/silo/4.4/$VISITARCH/include
mkdir $VISITDIR/silo/4.4/$VISITARCH/lib
cp silo/silo/silo.h $VISITDIR/silo/4.4/$VISITARCH/include
cp silo/silo/silo.inc $VISITDIR/silo/4.4/$VISITARCH/include
cp silo/sdx/sdx.h $VISITDIR/silo/4.4/$VISITARCH/include
cp silo/sdx/sdx.inc $VISITDIR/silo/4.4/$VISITARCH/include
cp lib/libsilo.a $VISITDIR/silo/4.4/$VISITARCH/lib
mkdir $VISITDIR/silo/4.4/$VISITARCH/{include,lib}
cp silo/silo/silo.{h,inc} $VISITDIR/silo/4.4/$VISITARCH/include
cp silo/sdx/sdx.{h,inc} $VISITDIR/silo/4.4/$VISITARCH/include
cp lib/libsilo.a $VISITDIR/silo/4.4/$VISITARCH/lib
cd ..
......@@ -612,9 +625,9 @@ env command for configure.
#
# Build and install it in the visit directory.
#
gunzip visit040719.tar.gz
tar xf visit040719.tar
cd visit040719/config-site
gunzip visit040816.tar.gz
tar xf visit040816.tar
cd visit040816/config-site
echo VISITHOME=$VISITDIR > `hostname`.conf
sed "s/ARCH/$VISITARCH/" Template.conf >> `hostname`.conf
cd ..
......@@ -623,11 +636,11 @@ 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.3.3 aix $VISITDIR
clearcase_bin/visit-install 1.3.3 irix6 $VISITDIR
clearcase_bin/visit-install 1.3.3 linux $VISITDIR
clearcase_bin/visit-install 1.3.3 osf1 $VISITDIR
clearcase_bin/visit-install 1.3.3 sunos5 $VISITDIR
clearcase_bin/visit-install 1.3.4 aix $VISITDIR
clearcase_bin/visit-install 1.3.4 irix6 $VISITDIR
clearcase_bin/visit-install 1.3.4 linux $VISITDIR
clearcase_bin/visit-install 1.3.4 osf1 $VISITDIR
clearcase_bin/visit-install 1.3.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
......
......@@ -17,7 +17,7 @@ Unix and Mac OS X:
where
"version" will be 1.3.3 for the current distribution.
"version" will be 1.3.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.3.3 irix6 /usr/local/visit
visit-install 1.3.4 irix6 /usr/local/visit
will install the irix6, 1.3.3 version of visit in the directory
will install the irix6, 1.3.4 version of visit in the directory
"/usr/local/visit". Note that you will need to have the file
"visit1_3_3.irix6.tar.gz" present in the current directory for this
"visit1_3_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.3.3 linux /usr/local/visit
visit-install 1.3.4 linux /usr/local/visit
to add a linux, 1.3.3 version of visit to the same directory.
to add a linux, 1.3.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.3.3.exe to your desktop.
1. Copy the file visit1.3.4.exe to your desktop.
2. Double click on the visit1.3.3.exe icon to run the installer.
2. Double click on the visit1.3.4.exe icon to run the installer.
3. Follow the directions provided by the installer.
......@@ -73,15 +73,31 @@ avtMagnitudeFilter::~avtMagnitudeFilter()
// Kathleen Bonnell, Thu Jan 2 15:16:50 PST 2003
// Replace MakeObject() with NewInstance() to match new vtk api.
//
// Kathleen Bonnell, Wed Aug 18 16:55:49 PDT 2004
// Retrieve vectorValues array based on activeVariableName. (There may be
// a Vectors array in both the CellData and the PointData, and the old way
// would always retrieve the PointData vectors in this instance). We are
// assuming that the PoinData Vectors and CellData Vectors will have
// different names.
//
// ****************************************************************************
vtkDataArray *
avtMagnitudeFilter::DeriveVariable(vtkDataSet *in_ds)
{
vtkDataArray *vectorValues = in_ds->GetPointData()->GetVectors();
//
// The base class will set the variable of interest to be the
// 'activeVariable'. This is a by-product of how the base class sets its
// input. If that method should change (SetActiveVariable), this
// technique for inferring the variable name may stop working.
//
const char *varname = activeVariable;
vtkDataArray *vectorValues = in_ds->GetPointData()->GetArray(varname);
if (vectorValues == NULL)
{
vectorValues = in_ds->GetCellData()->GetVectors();
vectorValues = in_ds->GetCellData()->GetArray(varname);
}
if (vectorValues == NULL)
{
......
......@@ -4,47 +4,42 @@
VISITHOME=/usr/gapps/visit
##
## Use the g++ 3.2.3 compiler.
## Use the g++ 2.96 compiler.
##
CXX=/usr/local/bin/g++-3.2.3
CXX=/usr/local/bin/g++-2.96
##
## If MESA is not set, use VisIt's mesa.
##
if test -z "$MESA"; then
MESA=$VISITHOME/mesa/5.0/linux_chaos_gcc_3.3.3
MESA=$VISITHOME/mesa/5.0/redhat_7a_ia32_qsw
fi
##
## If VTK is not set, use VisIt's vtk.
##
if test -z "$VTK"; then
VTK=$VISITHOME/vtk/2003.10.28/linux_chaos_gcc_3.3.3
VTK=$VISITHOME/vtk/2003.10.28/redhat_7a_ia32_qsw
fi
##
## If QTDIR is not set, use our Qt
##
if test -z "$QTDIR"; then
QTDIR=$VISITHOME/qt/3.3.2/linux_chaos_gcc_3.3.3
QTDIR=$VISITHOME/qt/2.3.0/redhat_7a_ia32_qsw
fi
##
## Use VisIt's Python.
##
PYDIR=$VISITHOME/python/linux_chaos_gcc_3.3.3
PYDIR=$VISITHOME/python/redhat_7a_ia32_qsw
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"
CXXFLAGS="-I/usr/lib/mpi/include $CXXFLAGS"
MPI_LIBS="-L/usr/lib/mpi/lib -lmpi -lelan -lelan3 -lrmscall"
##
## Database reader plugin support libraries
......@@ -54,10 +49,10 @@ MPI_LIBS="-L/usr/lib/mpi_gnu/lib -Wl,-rpath=/usr/lib/mpi/mpi_gnu/lib -lmpi -lela
##
## 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
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
##
## HDF5
......@@ -73,5 +68,5 @@ MILI_DIR=/usr/gapps/visit/mili/current/redhat_7
##
## Silo
##
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
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
......@@ -4,47 +4,42 @@
VISITHOME=/usr/gapps/visit
##
## Use the g++ 3.2.3 compiler.
## Use the g++ 2.96 compiler.
##
CXX=/usr/local/bin/g++-3.2.3
CXX=/usr/local/bin/g++-2.96
##
## If MESA is not set, use VisIt's mesa.
##
if test -z "$MESA"; then
MESA=$VISITHOME/mesa/5.0/linux_chaos_gcc_3.3.3
MESA=$VISITHOME/mesa/5.0/redhat_7a_ia32_qsw
fi
##
## If VTK is not set, use VisIt's vtk.
##
if test -z "$VTK"; then
VTK=$VISITHOME/vtk/2003.10.28/linux_chaos_gcc_3.3.3
VTK=$VISITHOME/vtk/2003.10.28/redhat_7a_ia32_qsw
fi
##
## If QTDIR is not set, use our Qt
##
if test -z "$QTDIR"; then
QTDIR=$VISITHOME/qt/3.3.2/linux_chaos_gcc_3.3.3
QTDIR=$VISITHOME/qt/2.3.0/redhat_7a_ia32_qsw
fi
##
## Use VisIt's Python.
##
PYDIR=$VISITHOME/python/linux_chaos_gcc_3.3.3
PYDIR=$VISITHOME/python/redhat_7a_ia32_qsw
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"
CXXFLAGS="-I/usr/lib/mpi/include $CXXFLAGS"
MPI_LIBS="-L/usr/lib/mpi/lib -lmpi -lelan -lelan3 -lrmscall"
##
## Database reader plugin support libraries
......@@ -54,10 +49,10 @@ MPI_LIBS="-L/usr/lib/mpi_gnu/lib -Wl,-rpath=/usr/lib/mpi/mpi_gnu/lib -lmpi -lela
##
## 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
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
##
## HDF5
......@@ -73,5 +68,5 @@ MILI_DIR=/usr/gapps/visit/mili/current/redhat_7
##
## Silo
##
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
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
......@@ -4,47 +4,42 @@
VISITHOME=/usr/gapps/visit
##
## Use the g++ 3.2.3 compiler.
## Use the g++ 2.96 compiler.
##
CXX=/usr/local/bin/g++-3.2.3
CXX=/usr/local/bin/g++-2.96
##
## If MESA is not set, use VisIt's mesa.
##
if test -z "$MESA"; then
MESA=$VISITHOME/mesa/5.0/linux_chaos_gcc_3.3.3
MESA=$VISITHOME/mesa/5.0/redhat_7a_ia32_qsw
fi
##
## If VTK is not set, use VisIt's vtk.
##
if test -z "$VTK"; then
VTK=$VISITHOME/vtk/2003.10.28/linux_chaos_gcc_3.3.3
VTK=$VISITHOME/vtk/2003.10.28/redhat_7a_ia32_qsw
fi
##
## If QTDIR is not set, use our Qt
##
if test -z "$QTDIR"; then
QTDIR=$VISITHOME/qt/3.3.2/linux_chaos_gcc_3.3.3
QTDIR=$VISITHOME/qt/2.3.0/redhat_7a_ia32_qsw
fi
##
## Use VisIt's Python.
##
PYDIR=$VISITHOME/python/linux_chaos_gcc_3.3.3
PYDIR=$VISITHOME/python/redhat_7a_ia32_qsw
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"
CXXFLAGS="-I/usr/lib/mpi/include $CXXFLAGS"
MPI_LIBS="-L/usr/lib/mpi/lib -lmpi -lelan -lelan3 -lrmscall"
##
## Database reader plugin support libraries
......@@ -54,10 +49,10 @@ MPI_LIBS="-L/usr/lib/mpi_gnu/lib -Wl,-rpath=/usr/lib/mpi/mpi_gnu/lib -lmpi -lela
##
## 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
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
##
## HDF5
......@@ -73,5 +68,5 @@ MILI_DIR=/usr/gapps/visit/mili/current/redhat_7
##
## Silo
##
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
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
......@@ -4,47 +4,42 @@
VISITHOME=/usr/gapps/visit
##
## Use the g++ 3.2.3 compiler.
## Use the g++ 2.96 compiler.
##
CXX=/usr/local/bin/g++-3.2.3
CXX=/usr/local/bin/g++-2.96
##
## If MESA is not set, use VisIt's mesa.
##
if test -z "$MESA"; then
MESA=$VISITHOME/mesa/5.0/linux_chaos_gcc_3.3.3
MESA=$VISITHOME/mesa/5.0/redhat_7a_ia32_qsw
fi
##
## If VTK is not set, use VisIt's vtk.
##
if test -z "$VTK"; then
VTK=$VISITHOME/vtk/2003.10.28/linux_chaos_gcc_3.3.3
VTK=$VISITHOME/vtk/2003.10.28/redhat_7a_ia32_qsw
fi
##
## If QTDIR is not set, use our Qt
##
if test -z "$QTDIR"; then
QTDIR=$VISITHOME/qt/3.3.2/linux_chaos_gcc_3.3.3
QTDIR=$VISITHOME/qt/2.3.0/redhat_7a_ia32_qsw
fi
##
## Use VisIt's Python.
##
PYDIR=$VISITHOME/python/linux_chaos_gcc_3.3.3
PYDIR=$VISITHOME/python/redhat_7a_ia32_qsw
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"
CXXFLAGS="-I/usr/lib/mpi/include $CXXFLAGS"
MPI_LIBS="-L/usr/lib/mpi/lib -lmpi -lelan -lelan3 -lrmscall"
##
## Database reader plugin support libraries
......@@ -54,10 +49,10 @@ MPI_LIBS="-L/usr/lib/mpi_gnu/lib -Wl,-rpath=/usr/lib/mpi/mpi_gnu/lib -lmpi -lela
##
## 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
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
##
## HDF5
......@@ -73,5 +68,5 @@ MILI_DIR=/usr/gapps/visit/mili/current/redhat_7
##
## Silo
##
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
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
......@@ -6,33 +6,33 @@ VISITHOME=/usr/gapps/visit
##
## Use the g++ 3.1 compiler.
##
CXX=g++-3.3.3
CXX=g++-3.1
##
## If MESA is not set, use VisIt's mesa.
##
if test -z "$MESA"; then
MESA=$VISITHOME/mesa/5.0/aix_5_gcc_3.3.3
MESA=$VISITHOME/mesa/5.0/aix_5_ll
fi
##
## If VTK is not set, use VisIt's vtk.
##
if test -z "$VTK"; then
VTK=$VISITHOME/vtk/2003.10.28/aix_5_gcc_3.3.3
VTK=$VISITHOME/vtk/2003.10.28/aix_5_ll
fi
##
## If QTDIR is not set, use VisIt's Qt.
##
if test -z "$QTDIR"; then
QTDIR=$VISITHOME/qt/3.3.2/aix_5_gcc_3.3.3
QTDIR=$VISITHOME/qt/3.3.2/aix_5_gcc_3.1
fi
##
## Use VisIt's Python
##
PYDIR=$VISITHOME/python/aix_5_gcc_3.3.3
PYDIR=$VISITHOME/python/aix_5_ll
PYVERSION=python2.1
##
......@@ -40,6 +40,11 @@ PYVERSION=python2.1
##
CXXFLAGS="-Wno-deprecated $CXXFLAGS"
##
## Turn on fake exceptions.
##
FAKE_EXCEPTIONS_BY_DEFAULT="yes"
##
## Set the pthread flags.
##
......@@ -93,5 +98,5 @@ MILI_DIR=/usr/gapps/visit/mili/current/aix_5_ll
##
## Silo
##
DEFAULT_SILO_INCLUDES=/usr/gapps/visit/silo/4.4/aix_5_gcc_3.3.3/include
DEFAULT_SILO_LIBRARY=/usr/gapps/visit/silo/4.4/aix_5_gcc_3.3.3/lib
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4/aix_5_ll/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4/aix_5_ll/lib
......@@ -4,35 +4,35 @@
VISITHOME=/usr/gapps/visit
##
## Use the g++ 3.3.3 compiler.
## Use the g++ 3.1 compiler.
##
CXX=g++-3.3.3
CXX=g++-3.1
##
## If MESA is not set, use VisIt's mesa.
##
if test -z "$MESA"; then
MESA=$VISITHOME/mesa/5.0/aix_5_gcc_3.3.3
MESA=$VISITHOME/mesa/5.0/aix
fi
##
## If VTK is not set, use VisIt's vtk.
##
if test -z "$VTK"; then
VTK=$VISITHOME/vtk/2003.10.28/aix_5_gcc_3.3.3
VTK=$VISITHOME/vtk/2003.10.28/aix_5
fi
##
## If QTDIR is not set, use VisIt's Qt.
##
if test -z "$QTDIR"; then
QTDIR=$VISITHOME/qt/3.3.2/aix_5_gcc_3.3.3
QTDIR=$VISITHOME/qt/3.3.2/aix_5_gcc_3.1
fi
##
## Use VisIt's Python
##
PYDIR=$VISITHOME/python/aix_5_gcc_3.3.3
PYDIR=$VISITHOME/python/aix_4
PYVERSION=python2.1
##
......@@ -40,6 +40,11 @@ PYVERSION=python2.1
##
CXXFLAGS="-Wno-deprecated $CXXFLAGS"
##