Commit fc1ce106 authored by hrchilds's avatar hrchilds
Browse files

Update from May 10, 2005

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@465 18c085ea-50e0-402c-830e-de6fd14e8384
parent 072ea37d
......@@ -101,6 +101,7 @@ hold the name of the architecture specific directory. Some examples
include:
setenv VISITARCH aix_5_gcc_3.3.3
setenv VISITARCH aix_5_xlc_64
setenv VISITARCH irix64_cc_7.3.1.2_64
setenv VISITARCH irix64_cc_7.4_64
setenv VISITARCH linux_chaos_gcc_3.3.3
......@@ -743,11 +744,21 @@ in the file ccse-mpi.H.
# 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.
#
# If you are building with xlC, you should change "COMP = KCC" to
# "COMP = xlC" and add the following lines to ../mk/Make.defs.
#
# ifeq ($(COMP),xlC)
# CXXPRFF := -p
# CXXOPTF += -O2
# CXXDEBF += -g
# CXX := xlC -qrtti=dynamiccast
# endif
#
#
# Start off by building the 3d version.
#
make -f GNUmakefile
gmake -f GNUmakefile
#
# Install the 3d version in the visit directory under the boxlib directory.
......@@ -761,13 +772,13 @@ cp libbox3d*.a $VISITDIR/boxlib/$VISITARCH/lib/libbox3D.a
#
# Now build the 2d version.
#
make clean
gmake clean
#
# You will need to modify the GNUmakefile to set the dimension to 2. This
# will involve replacing "3" with "2" in the line "DIM = 3".
#
make -f GNUmakefile
gmake -f GNUmakefile
#
# Install the 2d version in the visit directory under the boxlib directory.
......
......@@ -50,6 +50,7 @@ esac
# Parse the execute line, providing default values for error checking.
#
kickit=true
hoth=true
sunspot=true
hyper=true
gps=true
......@@ -69,6 +70,7 @@ do
case $1 in
-none)
kickit=false
hoth=false
sunspot=false
hyper=false
gps=false
......@@ -85,6 +87,14 @@ do
kickit=true
shift
;;
-hoth)
hoth=false
shift
;;
+hoth)
hoth=true
shift
;;
-sunspot)
sunspot=false
shift
......@@ -209,6 +219,56 @@ then
fi
fi
#
# Build on hoth.
#
rm -f hoth
cat <<EOF > hoth
#!/bin/sh
if test ! -e /var/tmp/$user ; then
mkdir /var/tmp/$user
fi
if test ! -e /var/tmp/$user/hoth ; then
mkdir /var/tmp/$user/hoth
fi
rm -rf /var/tmp/$user/hoth/visitbuild
mkdir /var/tmp/$user/hoth/visitbuild
mv hoth_$dist.tar.gz /var/tmp/$user/hoth/visitbuild/$dist.tar.gz
cd /var/tmp/$user/hoth/visitbuild
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
make -j 4 >> ../buildlog 2>&1
clearcase_bin/visit-bin-dist >> ../buildlog 2>&1
mv visit\$ver2.linux.tar.gz ..
cd ..
rm -f resultlog
echo " build of visit on hoth" > resultlog 2>&1
echo " ------------------------" >> resultlog 2>&1
echo "" >> resultlog 2>&1
ls -l >> resultlog 2>&1
echo "" >> resultlog 2>&1
echo "number of database plugins = "\`ls $dist/plugins/databases/libI* | wc -l\` >> resultlog 2>&1
echo "number of operator plugins = "\`ls $dist/plugins/operators/libI* | wc -l\` >> resultlog 2>&1
echo "number of plot plugins = "\`ls $dist/plugins/plots/libI* | wc -l\` >> resultlog 2>&1
echo "" >> resultlog 2>&1
echo "The database plugins:" >> resultlog 2>&1
ls $dist/plugins/databases/libI* | sed "s/$dist\/plugins\/databases\/libI//" | sed "s/Database.so//" >> resultlog 2>&1
mail $emailName < resultlog
EOF
if [ $hoth = true ]
then
if [ $test = no ]
then
scp hoth hoth:hoth_buildit
scp $dist.tar.gz hoth:hoth_$dist.tar.gz
ssh hoth "chmod 750 hoth_buildit;./hoth_buildit" &
fi
fi
#
# Build on sunspot.
#
......@@ -514,5 +574,5 @@ fi
#
if [ $test = no ]
then
rm -f kickit sunspot hyper gps berg pengra thunder
rm -f kickit hoth sunspot hyper gps berg pengra thunder
fi
......@@ -50,6 +50,13 @@ class vtkDataArray;
// Added ConfirmMesh.
//
// ****************************************************************************
typedef struct {
int level;
vector<int> childDomains;
vector<int> logicalExtents;
} avtNestedDomainInfo_t;
class DATABASE_API avtStructuredDomainNesting : public avtDomainNesting
{
public:
......@@ -85,12 +92,6 @@ class DATABASE_API avtStructuredDomainNesting : public avtDomainNesting
void GetSelectedDescendents(const vector<int>& allDomainList,
int dom, vector<int>& selectedDescendents) const;
typedef struct {
int level;
vector<int> childDomains;
vector<int> logicalExtents;
} avtNestedDomainInfo_t;
int numDimensions;
vector<avtNestedDomainInfo_t> domainNesting;
......
##
## 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, thus the maxdata flag
## We can only use 2GB/node without large pages (-blpdata)
## Temporarily disable large pages because of AIX bug.
##
##LDFLAGS="-Wl,-blpdata -Wl,-bmaxdata:0x70000000 $LDFLAGS"
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.3/aix_5_ll/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.3/aix_5_ll/lib
##
## ViSUS
##
DEFAULT_VISUS_INCLUDE=/usr/gapps/visit/visus/AIX_powerpc_xlc/include
DEFAULT_VISUS_LIB=/usr/gapps/visit/visus/AIX_powerpc_xlc/lib
......@@ -270,7 +270,7 @@ QvisEngineWindow::UpdateWindow(bool doAll)
if (!sim[i].empty())
{
int lastSlashPos = QString(sim[i].c_str()).findRev('/');
QString newsim = sim[i].substr(lastSlashPos+1);
QString newsim = QString(sim[i].substr(lastSlashPos+1).c_str());
int lastDotPos = newsim.findRev('.');
int firstDotPos = newsim.find('.');
......
......@@ -265,7 +265,7 @@ QvisSimulationWindow::UpdateWindow(bool doAll)
simulationToEngineListMap[simCombo->count()] = i;
int lastSlashPos = QString(sim[i].c_str()).findRev('/');
QString newsim = sim[i].substr(lastSlashPos+1);
QString newsim = QString(sim[i].substr(lastSlashPos+1).c_str());
int lastDotPos = newsim.findRev('.');
int firstDotPos = newsim.find('.');
......@@ -459,7 +459,7 @@ QvisSimulationWindow::UpdateInformation(int index)
simInfo->insertItem(item);
int lastSlashPos = QString(sim.c_str()).findRev('/');
QString newsim = sim.substr(lastSlashPos+1);
QString newsim = QString(sim.substr(lastSlashPos+1).c_str());
int lastDotPos = newsim.findRev('.');
int firstDotPos = newsim.find('.');
......@@ -516,8 +516,9 @@ QvisSimulationWindow::UpdateInformation(int index)
bool e = md->GetSimInfo().GetAvtSimulationCommandSpecification(c).GetEnabled();
if (t == avtSimulationCommandSpecification::CmdArgNone)
{
cmdButtons[c]->setText(md->GetSimInfo().
GetAvtSimulationCommandSpecification(c).GetName());
cmdButtons[c]->setText(QString(md->GetSimInfo().
GetAvtSimulationCommandSpecification(c).
GetName().c_str()));
cmdButtons[c]->setEnabled(e);
cmdButtons[c]->show();
}
......
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