Commit b682911f authored by hrchilds's avatar hrchilds
Browse files

Update from October 28, 2004

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@350 18c085ea-50e0-402c-830e-de6fd14e8384
parent ac93a858
......@@ -733,7 +733,13 @@ in the file ccse-mpi.H.
#
# You will need to modify GNUmakefile to set the compiler. Typically, this
# will involve replacing "KCC" with the name of your c++ compiler in the
# line "COMP = KCC".
# line "COMP = KCC". If the compiler doesn't match one of the ones
# in the file ../mk/Make.defs, you will need to create an entry for it
# in that file. The only value of COMP that it understands and is relevant
# for VisIt is g++. If the g++ compiler is referenced by anything other
# than g++, the easiest thing is to change all occurances of g++ with the
# other name in the file ../mk/Make.defs. For example if the compiler is
# g++-3.2.3, then change all occurances of g++ to g++-3.2.3.
#
#
......
......@@ -54,7 +54,7 @@ sunspot=true
hyper=true
gps=true
riptide=true
frost=true
berg=true
pengra=true
thunder=true
......@@ -74,7 +74,7 @@ do
hyper=false
gps=false
riptide=false
frost=false
berg=false
pengra=false
thunder=false
shift
......@@ -119,12 +119,12 @@ do
riptide=true
shift
;;
-frost)
frost=false
-berg)
berg=false
shift
;;
+frost)
frost=true
+berg)
berg=true
shift
;;
-pengra)
......@@ -420,33 +420,33 @@ then
fi
#
# Build on frost, both serial and parallel versions.
# Build on berg, both serial and parallel versions.
#
rm -f frost
cat <<EOF > frost
rm -f berg
cat <<EOF > berg
#!/bin/sh
if test ! -e /p/gf1/$user ; then
mkdir /p/gf1/$user
if test ! -e /p/glocal1/$user ; then
mkdir /p/glocal1/$user
fi
if test ! -e /p/gf1/$user/frost ; then
mkdir /p/gf1/$user/frost
if test ! -e /p/glocal1/$user/berg ; then
mkdir /p/glocal1/$user/berg
fi
rm -rf /p/gf1/$user/frost/visitbuild
mkdir /p/gf1/$user/frost/visitbuild
mv frost_$dist.tar.gz /p/gf1/$user/frost/visitbuild/$dist.tar.gz
cd /p/gf1/$user/frost/visitbuild
rm -rf /p/glocal1/$user/berg/visitbuild
mkdir /p/glocal1/$user/berg/visitbuild
mv berg_$dist.tar.gz /p/glocal1/$user/berg/visitbuild/$dist.tar.gz
cd /p/glocal1/$user/berg/visitbuild
gunzip -c $dist.tar.gz | tar xvf - > buildlog 2>&1
cd $dist
ver=\`cat VERSION\`
ver2=\`echo \$ver | tr "." "_"\`
env CXXFLAGS=-O2 MAKE=gmake ./configure --enable-parallel >> ../buildlog 2>&1
gmake -j 6 >> ../buildlog 2>&1
gmake -j 4 >> ../buildlog 2>&1
clearcase_bin/visit-bin-dist >> ../buildlog 2>&1
mv visit\$ver2.aix.tar.gz ..
cd ..
rm -f resultlog
echo " build of visit on frost" > resultlog 2>&1
echo " -------------------------" >> resultlog 2>&1
echo " build of visit on berg" > resultlog 2>&1
echo " ------------------------" >> resultlog 2>&1
echo "" >> resultlog 2>&1
ls -l >> resultlog 2>&1
echo "" >> resultlog 2>&1
......@@ -459,13 +459,13 @@ ls $dist/plugins/databases/libI* | sed "s/$dist\/plugins\/databases\/libI//" | s
mail $emailName < resultlog
EOF
if [ $frost = true ]
if [ $berg = true ]
then
if [ $test = no ]
then
scp frost frost:frost_buildit
scp $dist.tar.gz frost:frost_$dist.tar.gz
ssh frost "chmod 750 frost_buildit;./frost_buildit" &
scp berg berg:berg_buildit
scp $dist.tar.gz berg:berg_$dist.tar.gz
ssh berg "chmod 750 berg_buildit;./berg_buildit" &
fi
fi
......@@ -574,5 +574,5 @@ fi
#
if [ $test = no ]
then
rm -f kickit sunspot hyper gps riptide frost pengra thunder
rm -f kickit sunspot hyper gps riptide berg pengra thunder
fi
......@@ -55,7 +55,7 @@ sunspot=true
hyper=true
gps=true
riptide=true
frost=true
berg=true
pengra=true
alc=true
thunder=true
......@@ -77,7 +77,7 @@ do
hyper=false
gps=false
riptide=false
frost=false
berg=false
pengra=false
alc=false
thunder=false
......@@ -123,12 +123,12 @@ do
riptide=true
shift
;;
-frost)
frost=false
-berg)
berg=false
shift
;;
+frost)
frost=true
+berg)
berg=true
shift
;;
-pengra)
......@@ -376,15 +376,15 @@ then
fi
#
# Install on frost.
# Install on berg.
#
rm -f frost
cat <<EOF > frost
rm -f berg
cat <<EOF > berg
#!/bin/sh
./visit-install -private -c open -g visit -gw -l $ver aix /usr/gapps/visit > installlog 2>&1
rm -f resultlog
echo " install of visit on frost" > resultlog 2>&1
echo " ---------------------------" >> resultlog 2>&1
echo " install of visit on berg" > resultlog 2>&1
echo " --------------------------" >> resultlog 2>&1
echo "" >> resultlog 2>&1
df -k /usr/gapps/visit >> resultlog 2>&1
echo "" >> resultlog 2>&1
......@@ -399,15 +399,15 @@ ls /usr/gapps/visit/$ver/ibm-aix-pwr/plugins/databases/libI* | sed "s/\/usr\/gap
mail $emailName < resultlog
EOF
if [ $frost = true ]
if [ $berg = true ]
then
if [ $test = no ]
then
scp frost:/p/gf1/$user/frost/visitbuild/visit$ver2.aix.tar.gz .
scp berg:/p/glocal1/$user/berg/visitbuild/visit$ver2.aix.tar.gz .
scp visit$ver2.aix.tar.gz gps15:
scp visit-install gps15:
scp frost gps15:frost_install
ssh gps15 "chmod 750 frost_install;./frost_install"
scp berg gps15:berg_install
ssh gps15 "chmod 750 berg_install;./berg_install"
fi
fi
......@@ -532,5 +532,5 @@ fi
#
if [ $test = no ]
then
rm -f kickit sunspot hyper gps riptide frost pengra alc thunder
rm -f kickit sunspot hyper gps riptide berg pengra alc thunder
fi
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -932,22 +932,25 @@ VisWindow::Start2DMode(void)
// Eric Brugger, Fri Aug 17 09:42:17 PDT 2001
// I added code to update the view.
//
// Kathleen Bonnell, Thu Oct 28 17:37:40 PDT 2004
// Moved 'UpdateView' to after the colleagues have started 3D mode.
//
// ****************************************************************************
void
VisWindow::Start3DMode(void)
{
//
// Update the view. In the future this should probably go into
// VisWinView's Start3DMode, but for now we will do it here.
//
UpdateView();
std::vector< VisWinColleague * >::iterator it;
for (it = colleagues.begin() ; it != colleagues.end() ; it++)
{
(*it)->Start3DMode();
}
//
// Update the view. In the future this should probably go into
// VisWinView's Start3DMode, but for now we will do it here.
//
UpdateView();
}
// ****************************************************************************
......
##
## Set the default C++ compiler.
## Set the default C++ and C compilers.
##
if test -z "$CXX"; then
CXX=g++
fi
if test -z "$CC"; then
CC=gcc
fi
##
## Set g++ specific flags.
......
......@@ -4,43 +4,49 @@
VISITHOME=/usr/gapps/visit
##
## Use the g++ 2.96 compiler.
## Use the g++ 3.2.3 compiler.
##
CXX=/usr/local/bin/g++-2.96
CC=/usr/local/bin/gcc-3.2.3
CXX=/usr/local/bin/g++-3.2.3
##
## If MESA is not set, use VisIt's mesa.
##
if test -z "$MESA"; then
MESA=$VISITHOME/mesa/5.0/redhat_7a_ia32_qsw
MESA=$VISITHOME/mesa/5.0/linux_chaos_gcc_3.3.3
fi
##
## If VTK is not set, use VisIt's vtk.
##
if test -z "$VTK"; then
VTK=$VISITHOME/vtk/2003.10.28/redhat_7a_ia32_qsw
VTK=$VISITHOME/vtk/2003.10.28/linux_chaos_gcc_3.3.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_chaos_gcc_3.2.3/bin
QT_BIN=$VISITHOME/qt/3.3.2/linux_chaos_gcc_3.3.3/bin
fi
if test -z "$QT_INCLUDE"; then
QT_INCLUDE=$VISITHOME/qt/3.3.2/linux_chaos_gcc_3.2.3/include
QT_INCLUDE=$VISITHOME/qt/3.3.2/linux_chaos_gcc_3.3.3/include
fi
if test -z "$QT_LIB"; then
QT_LIB=$VISITHOME/qt/3.3.2/linux_chaos_gcc_3.2.3/lib
QT_LIB=$VISITHOME/qt/3.3.2/linux_chaos_gcc_3.3.3/lib
fi
##
## Use VisIt's Python.
##
PYDIR=$VISITHOME/python/redhat_7a_ia32_qsw
PYDIR=$VISITHOME/python/linux_chaos_gcc_3.3.3
PYVERSION=python2.1
##
## Turn off warnings for deprecated features.
##
CXXFLAGS="-Wno-deprecated $CXXFLAGS"
##
## Add parallel arguments.
##
......@@ -55,24 +61,24 @@ MPI_LIBS="-L/usr/lib/mpi/lib -lmpi -lelan -lelan3 -lrmscall"
##
## Boxlib
##
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
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
##
## HDF5
##
DEFAULT_HDF5_INCLUDE=/usr/local/hdf5/hdf5-1.6.0/serial/include
DEFAULT_HDF5_LIB=/usr/local/hdf5/hdf5-1.6.0/serial/lib
DEFAULT_HDF5_INCLUDE=/usr/local/hdf5/hdf5-1.6.0/serial_gcc/include
DEFAULT_HDF5_LIB=/usr/local/hdf5/hdf5-1.6.0/serial_gcc/lib
##
## Mili
##
MILI_DIR=/usr/gapps/visit/mili/current/redhat_7
MILI_DIR=/usr/gapps/visit/mili/current/linux_chaos_gcc_3.3.3
##
## Silo
##
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.1/redhat_7a_ia32_qsw/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.1/redhat_7a_ia32_qsw/lib
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.1/chaos_2_ia32_elan3/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.1/chaos_2_ia32_elan3/lib
......@@ -4,43 +4,49 @@
VISITHOME=/usr/gapps/visit
##
## Use the g++ 2.96 compiler.
## Use the g++ 3.2.3 compiler.
##
CXX=/usr/local/bin/g++-2.96
CC=/usr/local/bin/gcc-3.2.3
CXX=/usr/local/bin/g++-3.2.3
##
## If MESA is not set, use VisIt's mesa.
##
if test -z "$MESA"; then
MESA=$VISITHOME/mesa/5.0/redhat_7a_ia32_qsw
MESA=$VISITHOME/mesa/5.0/linux_chaos_gcc_3.3.3
fi
##
## If VTK is not set, use VisIt's vtk.
##
if test -z "$VTK"; then
VTK=$VISITHOME/vtk/2003.10.28/redhat_7a_ia32_qsw
VTK=$VISITHOME/vtk/2003.10.28/linux_chaos_gcc_3.3.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_chaos_gcc_3.2.3/bin
QT_BIN=$VISITHOME/qt/3.3.2/linux_chaos_gcc_3.3.3/bin
fi
if test -z "$QT_INCLUDE"; then
QT_INCLUDE=$VISITHOME/qt/3.3.2/linux_chaos_gcc_3.2.3/include
QT_INCLUDE=$VISITHOME/qt/3.3.2/linux_chaos_gcc_3.3.3/include
fi
if test -z "$QT_LIB"; then
QT_LIB=$VISITHOME/qt/3.3.2/linux_chaos_gcc_3.2.3/lib
QT_LIB=$VISITHOME/qt/3.3.2/linux_chaos_gcc_3.3.3/lib
fi
##
## Use VisIt's Python.
##
PYDIR=$VISITHOME/python/redhat_7a_ia32_qsw
PYDIR=$VISITHOME/python/linux_chaos_gcc_3.3.3
PYVERSION=python2.1
##
## Turn off warnings for deprecated features.
##
CXXFLAGS="-Wno-deprecated $CXXFLAGS"
##
## Add parallel arguments.
##
......@@ -55,24 +61,24 @@ MPI_LIBS="-L/usr/lib/mpi/lib -lmpi -lelan -lelan3 -lrmscall"
##
## Boxlib
##
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
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
##
## HDF5
##
DEFAULT_HDF5_INCLUDE=/usr/local/hdf5/hdf5-1.6.0/serial/include
DEFAULT_HDF5_LIB=/usr/local/hdf5/hdf5-1.6.0/serial/lib
DEFAULT_HDF5_INCLUDE=/usr/local/hdf5/hdf5-1.6.0/serial_gcc/include
DEFAULT_HDF5_LIB=/usr/local/hdf5/hdf5-1.6.0/serial_gcc/lib
##
## Mili
##
MILI_DIR=/usr/gapps/visit/mili/current/redhat_7
MILI_DIR=/usr/gapps/visit/mili/current/linux_chaos_gcc_3.3.3
##
## Silo
##
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.1/redhat_7a_ia32_qsw/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.1/redhat_7a_ia32_qsw/lib
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.1/chaos_2_ia32_elan3/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.1/chaos_2_ia32_elan3/lib
##
## Set the VISITHOME environment variable.
##
VISITHOME=/usr/gapps/visit
##
## Use the g++ 3.1 compiler.
##
CC=gcc-3.1
CXX=g++-3.1
##
## If MESA is not set, use VisIt's mesa.
##
if test -z "$MESA"; then
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
fi
##
## If QT is not set, use VisIt's Qt.
##
if test -z "$QT_BIN"; then
QT_BIN=$VISITHOME/qt/3.3.2/aix_5_gcc_3.1/bin
fi
if test -z "$QT_INCLUDE"; then
QT_INCLUDE=$VISITHOME/qt/3.3.2/aix_5_gcc_3.1/include
fi
if test -z "$QT_LIB"; then
QT_LIB=$VISITHOME/qt/3.3.2/aix_5_gcc_3.1/lib
fi
##
## Use VisIt's Python
##
PYDIR=$VISITHOME/python/aix_4
PYVERSION=python2.1
##
## Turn off warnings for deprecated features.
##
CXXFLAGS="-Wno-deprecated $CXXFLAGS"
##
## Turn on fake exceptions.
##
FAKE_EXCEPTIONS_BY_DEFAULT="yes"
##
## Set the pthread flags.
##
CFLAGS="-pthread"
PTHREAD_CXXFLAGS="-pthread"
##
## We only get 256MB of memory by default.
##
LDFLAGS="-Wl,-bmaxdata:0x70000000 $LDFLAGS"
##
## Make sure we use the right MPI library (05/04/01 JSM)
##
CPPFLAGS="$CPPFLAGS -I/usr/lpp/ppe.poe/include/"
if test -z "$MPI_LIBS"; then
MPI_LIBS="-L/usr/lpp/ppe.poe/lib/threads -L/usr/lpp/ppe.poe/lib -L/usr/lpp/ppe.poe/lib/ip -Wl,-binitfini:poe_remote_main -lmpi_r -lvtd_r -llapi_r -lpthreads"
SHLIB_MPI_LIBS="-L/usr/lpp/ppe.poe/lib/threads -L/usr/lpp/ppe.poe/lib -L/usr/lpp/ppe.poe/lib/ip -lmpi_r -lvtd_r -llapi_r -lpthreads"
fi
##
## Database reader plugin support libraries
##
###############################################################################
##
## Boxlib
##
DEFAULT_BOXLIB2D_INCLUDE=/usr/gapps/visit/boxlib/aix_4/include/2D
DEFAULT_BOXLIB2D_LIBS=/usr/gapps/visit/boxlib/aix_4/lib
DEFAULT_BOXLIB3D_INCLUDE=/usr/gapps/visit/boxlib/aix_4/include/3D
DEFAULT_BOXLIB3D_LIBS=/usr/gapps/visit/boxlib/aix_4/lib
##
## HDF5
##
DEFAULT_HDF5_INCLUDE=/usr/local/hdf5/hdf5-1.6.0/serial/32/include
DEFAULT_HDF5_LIB=/usr/local/hdf5/hdf5-1.6.0/serial/32/lib
##
## Mili
##
MILI_DIR=/usr/gapps/visit/mili/current/aix_5_ll
##
## Silo
##
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.1/aix_5_ll/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.1/aix_5_ll/lib
......@@ -4,43 +4,49 @@
VISITHOME=/usr/gapps/visit
##
## Use the g++ 2.96 compiler.
## Use the g++ 3.2.3 compiler.
##
CXX=/usr/local/bin/g++-2.96
CC=/usr/local/bin/gcc-3.2.3
CXX=/usr/local/bin/g++-3.2.3
##
## If MESA is not set, use VisIt's mesa.
##
if test -z "$MESA"; then
MESA=$VISITHOME/mesa/5.0/redhat_7a_ia32_qsw
MESA=$VISITHOME/mesa/5.0/linux_chaos_gcc_3.3.3
fi
##
## If VTK is not set, use VisIt's vtk.
##
if test -z "$VTK"; then
VTK=$VISITHOME/vtk/2003.10.28/redhat_7a_ia32_qsw
VTK=$VISITHOME/vtk/2003.10.28/linux_chaos_gcc_3.3.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_chaos_gcc_3.2.3/bin
QT_BIN=$VISITHOME/qt/3.3.2/linux_chaos_gcc_3.3.3/bin
fi
if test -z "$QT_INCLUDE"; then
QT_INCLUDE=$VISITHOME/qt/3.3.2/linux_chaos_gcc_3.2.3/include
QT_INCLUDE=$VISITHOME/qt/3.3.2/linux_chaos_gcc_3.3.3/include
fi
if test -z "$QT_LIB"; then
QT_LIB=$VISITHOME/qt/3.3.2/linux_chaos_gcc_3.2.3/lib
QT_LIB=$VISITHOME/qt/3.3.2/linux_chaos_gcc_3.3.3/lib
fi
##
## Use VisIt's Python.
##
PYDIR=$VISITHOME/python/redhat_7a_ia32_qsw
PYDIR=$VISITHOME/python/linux_chaos_gcc_3.3.3
PYVERSION=python2.1
##
## Turn off warnings for deprecated features.
##
CXXFLAGS="-Wno-deprecated $CXXFLAGS"
##
## Add parallel arguments.
##
......@@ -55,24 +61,24 @@ MPI_LIBS="-L/usr/lib/mpi/lib -lmpi -lelan -lelan3 -lrmscall"
##
## Boxlib
##
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
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
##
## HDF5
##
DEFAULT_HDF5_INCLUDE=/usr/local/hdf5/