Commit 223deef9 authored by hrchilds's avatar hrchilds

Update from January 31, 2006

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@610 18c085ea-50e0-402c-830e-de6fd14e8384
parent b64465c5
......@@ -236,10 +236,20 @@ make
# after it has been built.
cd src
vi Makefile
Change TARGET0 to libqt.dylib
Add -install_name @executable_path/../lib/libqt.dylib -undefined dynamic_lookup to LFLAGS and save
rm ../lib/libqt*
make
# We must also change the qui library that comes with Qt.
cd ../tools/designer/uilib
vi Makefile
Change -lqt-mt to -lqt
Add -install_name @executable_path/../lib/libqui.dylib -undefined dynamic_lookup to LFLAGS and save
rm ../../../lib/libqui*
make
cd ../../../
# Install Qt
mkdir $VISITPATH/qt
mkdir $VISITPATH/qt/bin
......@@ -251,6 +261,7 @@ cd include; cp *.h $VISITPATH/qt/include
cp private/*.h $VISITPATH/qt/include/private
cd ../lib
cp libqt-mt.3.3.1.dylib $VISITPATH/qt/lib/libqt.dylib
cp libqui.dylib $VISITPATH/qt/lib/libqui.dylib
cd ../..
==============================================================================
......
......@@ -8,8 +8,9 @@
# Date: October 26, 2000
#
# Usage:
# visit-bin-dist [-c] [-g] [-h] [-md <visit_dir>] [-nd] [-nmesa] [-npython]
# [-nqt] [-nstrip] [-nvtk] [-os <operating_system>]
# visit-bin-dist [-c] [-g] [-h] [-make <make_command>] [-md <visit_dir>]
# [-nd] [-nmesa] [-npython] [-nqt] [-nstrip] [-nvtk]
# [-os <operating_system>]
#
# Modifications:
# Jeremy Meredith, Fri May 11 14:15:01 PDT 2001
......@@ -215,6 +216,10 @@
# Mark C. Miller, Tue Nov 22 09:42:57 PST 2005
# Removed refs to sl_io library
#
# Eric Brugger, Mon Jan 30 14:52:21 PST 2006
# I added the -make argument, which allows the user to specify the make
# command.
#
#------------------------------------------------------------------------------
set DataFiles = "TRUE"
......@@ -228,6 +233,7 @@ set OSGiven = "FALSE"
set CompilerGiven = "FALSE"
set compiler = ""
set Strip = "TRUE"
set Make = "make"
set Help = "FALSE"
#
......@@ -248,6 +254,11 @@ while ($#argv >= 1)
set Help = TRUE
breaksw
case -make:
shift
set Make = $1
breaksw
case -md:
shift
set VisItDir = $1
......@@ -304,13 +315,15 @@ while ($#argv >= 1)
end
if ($Help == TRUE) then
echo "Usage: visit-bin-dist [-c] [-g] [-h] [-md <visit_dir>] [-nd] [-nmesa]"
echo "Usage: visit-bin-dist [-c] [-g] [-h] [-make <make_command>]"
echo " [-md <visit_dir>] [-nd] [-nmesa]"
echo " [-npython] [-nqt] [-nstrip] [-nvtk]"
echo " [-os <operating_system>]"
echo ""
echo " -c Compress the resultant package."
echo " -g Gzip the resultant package. (default)"
echo " -h Print this message."
echo " -make make Make command."
echo " -md dir Set where to find the distribution."
echo " -nd No data files."
echo " -nmesa No Mesa libraries."
......@@ -500,7 +513,7 @@ if ($DataFiles == "TRUE") then
echo "Creating data generation programs..."
set pwd = `pwd`
cd $VisItDir/data
make
$Make
echo "Generating data files..."
./globe
./multi_test
......
......@@ -24,7 +24,7 @@ sunset=true
sc=true
tidalwave=true
white=true
uv=true
pu=true
lilac=true
dist=undefined
......@@ -43,7 +43,7 @@ do
sc=false
tidalwave=false
white=false
uv=false
pu=false
lilac=false
shift
;;
......@@ -87,12 +87,12 @@ do
white=true
shift
;;
-uv)
uv=false
-pu)
pu=false
shift
;;
+uv)
uv=true
+pu)
pu=true
shift
;;
-lilac)
......@@ -248,7 +248,7 @@ ver=\`cat VERSION\`
ver2=\`echo \$ver | tr "." "_"\`
env CXXFLAGS=-O2 MAKE=gmake ./configure --enable-parallel >> ../buildlog 2>&1
gmake -j 3 >> ../buildlog 2>&1
clearcase_bin/visit-bin-dist >> ../buildlog 2>&1
clearcase_bin/visit-bin-dist -make gmake >> ../buildlog 2>&1
mv visit\$ver2.osf1.tar.gz ..
cd ..
echo " build of visit on sc" > resultlog 2>&1
......@@ -346,7 +346,7 @@ ver=\`cat VERSION\`
ver2=\`echo \$ver | tr "." "_"\`
env CXXFLAGS=-O2 MAKE=gmake ./configure --enable-parallel >> ../buildlog 2>&1
gmake -j 6 >> ../buildlog 2>&1
clearcase_bin/visit-bin-dist >> ../buildlog 2>&1
clearcase_bin/visit-bin-dist -make gmake >> ../buildlog 2>&1
mv visit\$ver2.aix.tar.gz ..
cd ..
echo " build of visit on white" > resultlog 2>&1
......@@ -373,32 +373,32 @@ then
fi
#
# Build on uv, both serial and parallel versions.
# Build on pu, both serial and parallel versions.
#
rm -f uv
cat <<EOF > uv
rm -f pu
cat <<EOF > pu
#!/bin/sh
PATH=/usr/local/bin:$PATH
if test ! -d /p/guv1/$user ; then
mkdir /p/guv1/$user
if test ! -d /p/gpu1/$user ; then
mkdir /p/gpu1/$user
fi
if test ! -d /p/guv1/$user/uv ; then
mkdir /p/guv1/$user/uv
if test ! -d /p/gpu1/$user/pu ; then
mkdir /p/gpu1/$user/pu
fi
rm -rf /p/guv1/$user/uv/visitbuild
mkdir /p/guv1/$user/uv/visitbuild
mv uv_$dist.tar.gz /p/guv1/$user/uv/visitbuild/$dist.tar.gz
cd /p/guv1/$user/uv/visitbuild
rm -rf /p/gpu1/$user/pu/visitbuild
mkdir /p/gpu1/$user/pu/visitbuild
mv pu_$dist.tar.gz /p/gpu1/$user/pu/visitbuild/$dist.tar.gz
cd /p/gpu1/$user/pu/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 4 >> ../buildlog 2>&1
clearcase_bin/visit-bin-dist -compiler xlc >> ../buildlog 2>&1
clearcase_bin/visit-bin-dist -compiler xlc -make gmake >> ../buildlog 2>&1
mv visit\$ver2.aix64-xlc.tar.gz ..
cd ..
echo " build of visit on uv" > resultlog 2>&1
echo " build of visit on pu" > resultlog 2>&1
echo " ----------------------" >> resultlog 2>&1
echo "" >> resultlog 2>&1
ls -l >> resultlog 2>&1
......@@ -411,13 +411,13 @@ 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
EOF
if [ $uv = true ]
if [ $pu = true ]
then
if [ $test = no ]
then
scp uv uv:uv_buildit
scp $dist.tar.gz uv:uv_$dist.tar.gz
ssh uv "chmod 750 uv_buildit;./uv_buildit" &
scp pu pu:pu_buildit
scp $dist.tar.gz pu:pu_$dist.tar.gz
ssh pu "chmod 750 pu_buildit;./pu_buildit" &
fi
fi
......@@ -474,5 +474,5 @@ fi
#
if [ $test = no ]
then
rm -f hitit sunset sc tidalwave white uv lilac
rm -f hitit sunset sc tidalwave white pu lilac
fi
......@@ -360,7 +360,7 @@ cd $dist
ver=\`cat VERSION\`
ver2=\`echo \$ver | tr "." "_"\`
env CXXFLAGS=-O2 ./configure --enable-parallel >> ../buildlog 2>&1
gmake -j 4 >> ../buildlog 2>&1
env PARALLEL=4 make -P >> ../buildlog 2>&1
clearcase_bin/visit-bin-dist >> ../buildlog 2>&1
mv visit\$ver2.irix6.tar.gz ..
cd ..
......@@ -411,7 +411,7 @@ ver=\`cat VERSION\`
ver2=\`echo \$ver | tr "." "_"\`
env CXXFLAGS=-O2 MAKE=gmake ./configure --enable-parallel >> ../buildlog 2>&1
gmake >> ../buildlog 2>&1
clearcase_bin/visit-bin-dist >> ../buildlog 2>&1
clearcase_bin/visit-bin-dist -make gmake >> ../buildlog 2>&1
mv visit\$ver2.osf1.tar.gz ..
cd ..
rm -f resultlog
......@@ -461,7 +461,7 @@ ver=\`cat VERSION\`
ver2=\`echo \$ver | tr "." "_"\`
env CXXFLAGS=-O2 MAKE=gmake ./configure --enable-parallel >> ../buildlog 2>&1
gmake -j 4 >> ../buildlog 2>&1
clearcase_bin/visit-bin-dist >> ../buildlog 2>&1
clearcase_bin/visit-bin-dist -make gmake >> ../buildlog 2>&1
mv visit\$ver2.aix.tar.gz ..
cd ..
rm -f resultlog
......@@ -512,7 +512,7 @@ ver=\`cat VERSION\`
ver2=\`echo \$ver | tr "." "_"\`
env CXXFLAGS=-O2 MAKE=gmake ./configure --enable-parallel >> ../buildlog 2>&1
gmake -j 4 >> ../buildlog 2>&1
clearcase_bin/visit-bin-dist -compiler xlc >> ../buildlog 2>&1
clearcase_bin/visit-bin-dist -compiler xlc -make gmake >> ../buildlog 2>&1
mv visit\$ver2.aix64-xlc.tar.gz ..
cd ..
echo " build of visit on up" > resultlog 2>&1
......
......@@ -24,7 +24,7 @@ sunset=true
sc=true
tidalwave=true
white=true
uv=true
pu=true
lilac=true
ver=undefined
......@@ -44,7 +44,7 @@ do
sc=false
tidalwave=false
white=false
uv=false
pu=false
lilac=false
shift
;;
......@@ -57,7 +57,7 @@ do
sc=true
tidalwave=true
white=true
uv=true
pu=true
lilac=true
shift
;;
......@@ -101,12 +101,12 @@ do
white=true
shift
;;
-uv)
uv=false
-pu)
pu=false
shift
;;
+uv)
uv=true
+pu)
pu=true
shift
;;
-lilac)
......@@ -360,14 +360,14 @@ then
fi
#
# Install on uv.
# Install on pu.
#
rm -f uv
cat <<EOF > uv
rm -f pu
cat <<EOF > pu
./visit-install -private -c closed -g visit -gw -l $ver aix64-xlc /usr/gapps/visit > installlog 2>&1
echo "" >> resultlog 2>&1
echo " install of visit on uv" >> resultlog 2>&1
echo " install of visit on pu" >> resultlog 2>&1
echo " ------------------------" >> resultlog 2>&1
echo "" >> resultlog 2>&1
df -k /usr/gapps/visit >> resultlog 2>&1
......@@ -382,13 +382,13 @@ echo "The database plugins:" >> resultlog 2>&1
ls /usr/gapps/visit/$ver/ibm-aix-pwr64-xlc/plugins/databases/libI* | sed "s/\/usr\/gapps\/visit\/$ver\/ibm-aix-pwr64-xlc\/plugins\/databases\/libI//" | sed "s/Database.so//" >> resultlog 2>&1
EOF
if [ $uv = true ]
if [ $pu = true ]
then
if [ $test = no ]
then
cat uv >> lc
cat pu >> lc
scp uv:/p/guv1/$user/uv/visitbuild/visit$ver2.aix64-xlc.tar.gz .
scp pu:/p/gpu1/$user/pu/visitbuild/visit$ver2.aix64-xlc.tar.gz .
scp visit$ver2.aix64-xlc.tar.gz sc1:
fi
fi
......@@ -442,5 +442,5 @@ fi
#
if [ $test = no ]
then
rm -f bdiv hitit sunset lc sc tidalwave white uv lilac
rm -f bdiv hitit sunset lc sc tidalwave white pu lilac
fi
......@@ -685,7 +685,7 @@ ParentProcess::GetLocalUserName()
if((users_passwd_entry = getpwuid(getuid())) != NULL)
localUserName = std::string(users_passwd_entry->pw_name);
#endif
debug5 << localUserName << endl;
debug5 << localUserName.c_str() << endl;
}
return localUserName;
......
......@@ -1058,7 +1058,7 @@ RemoteProcess::Open(const std::string &rHost,
createAsThoughLocal);
for(int i = 0; i < commandLine.size(); ++i)
{
debug5 << commandLine[i];
debug5 << commandLine[i].c_str();
if(i < commandLine.size()-1)
debug5 << ", ";
}
......
......@@ -19,7 +19,9 @@
#include <DebugStream.h>
#if !defined(_WIN32)
#if defined(_WIN32)
#include <direct.h>
#else
#include <unistd.h>
#ifndef HAVE_FTIME_PROTOTYPE
extern "C" {
......
......@@ -431,6 +431,10 @@ avtDatabaseFactory::SetupDatabase(CommonDatabasePluginInfo *info,
//
// Mark C. Miller, Tue May 31 20:12:42 PDT 2005
// Added bool arg to forceReadAllCyclesTimes
//
// Brad Whitlock, Tue Jan 31 14:55:35 PST 2006
// Fixed a problem that lead to !NBLOCKS failing on win32.
//
// ****************************************************************************
avtDatabase *
......@@ -469,7 +473,8 @@ avtDatabaseFactory::VisitFile(const char *visitFile, int timestep,
// If the filename contains a colon, assume that it contains
// the whole path to the file. We don't need to prepend a
// path if it already contains one.
if(fileName.find(":") != std::string::npos)
if((fileName.find(":") != std::string::npos) ||
(fileName.size() > 0 && fileName[0] == '!')
continue;
// If the filename begins with "./", remove it.
......
# Copyright 2000 - 2005
# Copyright 2000 - 2006
# The Regents of the University of California.
# All rights reserved.
#
......@@ -118,6 +118,9 @@
# Brad Whitlock, Fri Apr 29 12:07:54 PDT 2005
# Moved -lmir to -lmir_ser, -lmir_par for parallel MacOS X build.
#
# Brad Whitlock, Thu Jan 26 15:38:25 PST 2006
# Added -lbz2 for Mac.
#
##############################################################################
@SET_MAKE@
......@@ -161,7 +164,8 @@ CPPFLAGS=-I../../include @COMPONENT_CPPFLAGS@ @CPPFLAGS@
SEROBJ=$(SRC:.C=.o)
PAROBJ=$(SRC:.C=_par.o)
LIB=libdatabase
COMMONLIBS=-ldbatts -lavtexceptions -lstate -lcomm -lmisc -lplugin -lexpr -lparser -lutility -lvisit_vtk -llightweight_visit_vtk
LIBS_FOR_MACOSX_PREBINDING=$(BZIP2_LIBS)
COMMONLIBS=-ldbatts -lavtexceptions -lstate -lcomm -lmisc -lplugin -lexpr -lparser -lutility -lvisit_vtk -llightweight_visit_vtk $(LIBS_FOR_MACOSX_PREBINDING)
SERLIBS=$(COMMONLIBS) -lmir_ser -lpipeline_ser -lavtmath_ser $(VTK_LIBS)
PARLIBS=$(COMMONLIBS) -lmir_par -lpipeline_par -lavtmath_par $(VTK_LIBS) @SHLIB_MPI_LIBS@
......
......@@ -99,10 +99,9 @@ class EXPRESSION_API avtPosCMFEAlgorithm
public:
SpatialPartition();
virtual ~SpatialPartition();
void CreatePartition(
avtPosCMFEAlgorithm::DesiredPoints &,
avtPosCMFEAlgorithm::FastLookupGrouping &,
double *);
void CreatePartition(DesiredPoints &,
FastLookupGrouping &,
double *);
int GetProcessor(float *);
int GetProcessor(vtkCell *);
......
# Copyright 2000 - 2005
# Copyright 2000 - 2006
# The Regents of the University of California.
# All rights reserved.
#
......@@ -126,6 +126,9 @@
# Hank Childs, Sun Jan 22 10:52:01 PST 2006
# Add new expressions for symmetry.
#
# Brad Whitlock, Thu Jan 26 15:39:36 PST 2006
# Added libs for Mac build.
#
##############################################################################
@SET_MAKE@
......@@ -289,9 +292,11 @@ CPPFLAGS=@COMPONENT_CPPFLAGS@ @CPPFLAGS@
SEROBJ=$(SRC:.C=.o)
PAROBJ=$(SRC:.C=_par.o)
LIB=libexpressions
SERLIBS_FOR_MACOSX_PREBINDING=$(BZIP2_LIBS) -lavtfilters_ser
PARLIBS_FOR_MACOSX_PREBINDING=$(BZIP2_LIBS) -lavtfilters_par
COMMONLIBS=-ldbatts -lavtexceptions -lstate -lcomm -lmisc -lexpr -lparser -lutility -lplugin -lvisit_vtk -llightweight_visit_vtk -lavtview
SERLIBS=$(COMMONLIBS) -lpipeline_ser -lavtmath_ser -ldatabase_ser -lmir_ser $(VTK_LIBS) $(X_LIBS) @LIBS@
PARLIBS=$(COMMONLIBS) -lpipeline_par -lavtmath_par -ldatabase_par -lmir_par $(VTK_LIBS) $(X_LIBS) @LIBS@ @SHLIB_MPI_LIBS@
SERLIBS=$(COMMONLIBS) -lpipeline_ser -lavtmath_ser -ldatabase_ser -lmir_ser $(VTK_LIBS) $(SERLIBS_FOR_MACOSX_PREBINDING) $(X_LIBS) @LIBS@
PARLIBS=$(COMMONLIBS) -lpipeline_par -lavtmath_par -ldatabase_par -lmir_par $(VTK_LIBS) $(PARLIBS_FOR_MACOSX_PREBINDING) $(X_LIBS) @LIBS@ @SHLIB_MPI_LIBS@
##
## Standard targets...
......
# Copyright 1991 - 2005
# Copyright 1991 - 2006
# The Regents of the University of California.
# All rights reserved.
#
......@@ -62,8 +62,9 @@ CPPFLAGS=-I../../include/visit @COMPONENT_CPPFLAGS@ @CPPFLAGS@
SEROBJ=$(SRC:.C=.o)
PAROBJ=$(SRC:.C=_par.o)
LIB=libavtwriter
SERLIBS=-ldbatts -lpipeline_ser -lavtmath_ser -lavtexceptions -lvisit_vtk -llightweight_visit_vtk -lmisc -lstate -lcomm -lexpr -lparser -lutility $(VTK_LIBS) $(X_LIBS)
PARLIBS=-ldbatts -lpipeline_par -lavtmath_par -lavtexceptions -lvisit_vtk -llightweight_visit_vtk -lmisc -lstate -lcomm -lexpr -lparser -lutility $(VTK_LIBS) $(X_LIBS)
LIBS_FOR_MACOSX_PREBINDING=$(BZIP2_LIBS)
SERLIBS=-ldbatts -lpipeline_ser -lavtmath_ser -lavtexceptions -lvisit_vtk -llightweight_visit_vtk -lmisc -lstate -lcomm -lexpr -lparser -lutility $(LIBS_FOR_MACOSX_PREBINDING) $(VTK_LIBS) $(X_LIBS)
PARLIBS=-ldbatts -lpipeline_par -lavtmath_par -lavtexceptions -lvisit_vtk -llightweight_visit_vtk -lmisc -lstate -lcomm -lexpr -lparser -lutility $(LIBS_FOR_MACOSX_PREBINDING) $(VTK_LIBS) $(X_LIBS)
##
## Standard targets...
......
# Copyright 2001-2005
# Copyright 2001-2006
# The Regents of the University of California.
# All rights reserved.
#
......@@ -62,6 +62,9 @@
# Hank Childs, Sun Jan 22 10:27:32 PST 2006
# Added avtCustomTransform.
#
# Brad Whitlock, Thu Jan 26 15:29:46 PST 2006
# Added more libs for MacOS X prebinding.
#
##############################################################################
##
......@@ -113,7 +116,8 @@ CPPFLAGS=-I../../include @COMPONENT_CPPFLAGS@ @CPPFLAGS@
SEROBJ=$(SRC:.C=.o)
PAROBJ=$(SRC:.C=_par.o)
LIB=libavtfilters
COMMONLIBS=-ldbatts -lstate -lcomm -lmisc -lavtexceptions -lexpr -lparser -lutility -lavtview -lvisit_vtk -llightweight_visit_vtk
LIBS_FOR_MACOSX_PREBINDING=$(BZIP2_LIBS)
COMMONLIBS=-ldbatts -lstate -lcomm -lmisc -lavtexceptions -lexpr -lparser -lutility -lavtview -lvisit_vtk -llightweight_visit_vtk $(LIBS_FOR_MACOSX_PREBINDING)
SERLIBS=$(COMMONLIBS) -lpipeline_ser -lavtmath_ser $(VTK_LIBS)
PARLIBS=$(COMMONLIBS) -lpipeline_par -lavtmath_par $(VTK_LIBS)
......
# Copyright 2000 - 2005
# Copyright 2000 - 2006
# The Regents of the University of California.
# All rights reserved.
#
......@@ -54,6 +54,9 @@
# triggered accidentally on occasion and trying to rebuild read-only files
# in the VOB. It never changes anymore anyway.....
#
# Brad Whitlock, Thu Jan 26 15:30:52 PST 2006
# Added libs for MacOS X.
#
##############################################################################
@SET_MAKE@
......@@ -89,8 +92,9 @@ CPPFLAGS=-I../../include @COMPONENT_CPPFLAGS@ @CPPFLAGS@
SEROBJ=$(SRC:.C=.o)
PAROBJ=$(SRC:.C=_par.o)
LIB=libmir
SERLIBS=-ldbatts -lpipeline_ser -lavtmath_ser -lavtexceptions -lstate -lutility -lmisc -lcomm -lexpr -lparser -llightweight_visit_vtk $(VTK_LIBS)
PARLIBS=-ldbatts -lpipeline_par -lavtmath_par -lavtexceptions -lstate -lutility -lmisc -lcomm -lexpr -lparser -llightweight_visit_vtk $(VTK_LIBS)
LIBS_FOR_MACOSX_PREBINDING=$(BZIP2_LIBS)
SERLIBS=-ldbatts -lpipeline_ser -lavtmath_ser -lavtexceptions -lstate -lutility -lmisc -lcomm -lexpr -lparser -llightweight_visit_vtk $(VTK_LIBS) $(LIBS_FOR_MACOSX_PREBINDING)
PARLIBS=-ldbatts -lpipeline_par -lavtmath_par -lavtexceptions -lstate -lutility -lmisc -lcomm -lexpr -lparser -llightweight_visit_vtk $(VTK_LIBS) $(LIBS_FOR_MACOSX_PREBINDING)
##
## Standard targets...
......
# Copyright 2000 - 2005
# Copyright 2000 - 2006
# The Regents of the University of California.
# All rights reserved.
#
......@@ -203,6 +203,9 @@
# Mark C. Miller, Tue Aug 16 19:28:18 PDT 2005
# Added avtResampleSelection.C
#
# Brad Whitlock, Thu Jan 26 15:27:04 PST 2006
# Added -lbz2 for MacOS X
#
##############################################################################
@SET_MAKE@
......@@ -350,8 +353,9 @@ CPPFLAGS=@COMPONENT_CPPFLAGS@ @CPPFLAGS@
SEROBJ=$(SRC:.C=.o)
PAROBJ=$(SRC:.C=_par.o)
LIB=libpipeline
SERLIBS=-ldbatts -lavtexceptions -lstate -lcomm -lmisc -lutility -lexpr -lparser -lavtmath_ser -llightweight_visit_vtk @VTK_LIBS@ $(X_LIBS) @LIBS@
PARLIBS=-ldbatts -lavtexceptions -lstate -lcomm -lmisc -lutility -lexpr -lparser -lavtmath_par -llightweight_visit_vtk @VTK_LIBS@ $(X_LIBS) @LIBS@ @SHLIB_MPI_LIBS@
LIBS_FOR_MACOSX_PREBINDING=$(BZIP2_LIBS)
SERLIBS=-ldbatts -lavtexceptions -lstate -lcomm -lmisc -lutility -lexpr -lparser -lavtmath_ser -llightweight_visit_vtk @VTK_LIBS@ $(LIBS_FOR_MACOSX_PREBINDING) $(X_LIBS) @LIBS@
PARLIBS=-ldbatts -lavtexceptions -lstate -lcomm -lmisc -lutility -lexpr -lparser -lavtmath_par -llightweight_visit_vtk @VTK_LIBS@ $(LIBS_FOR_MACOSX_PREBINDING) $(X_LIBS) @LIBS@ @SHLIB_MPI_LIBS@
##
## Standard targets...
......
# Copyright 1991 - 2005
# Copyright 1991 - 2006
# The Regents of the University of California.
# All rights reserved.
#
......@@ -203,8 +203,9 @@ CPPFLAGS=-I../../include/visit @COMPONENT_CPPFLAGS@ @CPPFLAGS@
SEROBJ=$(SRC:.C=.o) $(SEROPENGL_OBJ) $(SERMESA_OBJ)
PAROBJ=$(SRC:.C=_par.o) $(PAROPENGL_OBJ) $(PARMESA_OBJ)
LIB=libplotter
SERLIBS=-ldbatts -lmisc -lcomm -lstate -lexpr -lparser -lutility -lpipeline_ser -lavtview -lavtmath_ser -lavtfilters_ser -lavtexceptions -lvisit_vtk -llightweight_visit_vtk -lparallel_visit_vtk_ser $(VTK_LIBS) $(X_LIBS)
PARLIBS=-ldbatts -lmisc -lcomm -lstate -lexpr -lparser -lutility -lpipeline_par -lavtview -lavtmath_par -lavtfilters_par -lavtexceptions -lvisit_vtk -llightweight_visit_vtk -lparallel_visit_vtk_par $(VTK_LIBS) $(X_LIBS)
LIBS_FOR_MACOSX_PREBINDING=$(BZIP2_LIBS)
SERLIBS=-ldbatts -lmisc -lcomm -lstate -lexpr -lparser -lutility -lpipeline_ser -lavtview -lavtmath_ser -lavtfilters_ser -lavtexceptions -lvisit_vtk -llightweight_visit_vtk -lparallel_visit_vtk_ser $(LIBS_FOR_MACOSX_PREBINDING) $(VTK_LIBS) $(X_LIBS)
PARLIBS=-ldbatts -lmisc -lcomm -lstate -lexpr -lparser -lutility -lpipeline_par -lavtview -lavtmath_par -lavtfilters_par -lavtexceptions -lvisit_vtk -llightweight_visit_vtk -lparallel_visit_vtk_par $(LIBS_FOR_MACOSX_PREBINDING) $(VTK_LIBS) $(X_LIBS)
##
## Standard targets...
......
# Copyright 1991 - 2005
# Copyright 1991 - 2006
# The Regents of the University of California.
# All rights reserved.
#
......@@ -46,6 +46,9 @@
# Brad Whitlock, Fri Apr 29 11:57:13 PDT 2005
# I changed -lplotter to -lplotter_ser and -lviswindow to -lviswindow_ser.
#
# Brad Whitlock, Mon Jan 30 11:05:00 PDT 2006
# Added another MacOS X lib.
#
##############################################################################
##
......@@ -65,7 +68,8 @@ CPPFLAGS=@COMPONENT_CPPFLAGS@ @CPPFLAGS@ @VTKQT_CPPFLAGS@
OBJ=$(SRC:.C=.o)
LIB=libqtviswindow
LIBS=-ldbatts -lviswindow_ser -lpipeline_ser -lavtfilters_ser -lavtmath_ser -lavtview -lavtexceptions -lplotter_ser -lvisit_vtk -llightweight_visit_vtk -lparallel_visit_vtk_ser -lmisc -lstate -lcomm -lexpr -lparser -lutility @VTKQT_LIBS@ $(VTK_LIBS) $(X_LIBS)
LIBS_FOR_MACOSX_PREBINDING=$(BZIP2_LIBS)
LIBS=-ldbatts -lviswindow_ser -lpipeline_ser -lavtfilters_ser -lavtmath_ser -lavtview -lavtexceptions -lplotter_ser -lvisit_vtk -llightweight_visit_vtk -lparallel_visit_vtk_ser -lmisc -lstate -lcomm -lexpr -lparser -lutility $(LIBS_FOR_MACOSX_PREBINDING) @VTKQT_LIBS@ $(VTK_LIBS) $(X_LIBS)
##
## Standard targets...
......
# Copyright 2000 - 2005
# Copyright 2000 - 2006
# The Regents of the University of California.
# All rights reserved.
#
......@@ -116,6 +116,9 @@
# Brad Whitlock, Wed Nov 23 10:35:24 PDT 2005
# Added libs required for Mac linking.
#
# Kathleen Bonnell, Tue Jan 31 15:49:04 PST 2006
# Added OriginalData SpatialExtents query.
#
##############################################################################
@SET_MAKE@
......@@ -173,6 +176,7 @@ Queries_src= \
Queries/avtOriginalDataMinMaxQuery.C \
Queries/avtOriginalDataNumNodesQuery.C \
Queries/avtOriginalDataNumZonesQuery.C \
Queries/avtOriginalDataSpatialExtentsQuery.C \
Queries/avtSkewnessQuery.C \
Queries/avtSphericalCompactnessFactorQuery.C \
Queries/avtSummationQuery.C \
......@@ -197,7 +201,8 @@ CPPFLAGS=@COMPONENT_CPPFLAGS@ @CPPFLAGS@
SEROBJ=$(SRC:.C=.o)
PAROBJ=$(SRC:.C=_par.o)
LIB=libquery
COMMONLIBS=-ldbatts -lavtexceptions -lstate -lcomm -lmisc -lexpr -lparser -lutility -lplugin -lavtview -lvisit_vtk -llightweight_visit_vtk
LIBS_FOR_MACOSX_PREBINDING=$(BZIP2_LIBS)
COMMONLIBS=-ldbatts -lavtexceptions -lstate -lcomm -lmisc -lexpr -lparser -lutility -lplugin -lavtview -lvisit_vtk -llightweight_visit_vtk $(LIBS_FOR_MACOSX_PREBINDING)
SERLIBS=$(COMMONLIBS) -lpipeline_ser -lavtmath_ser -lavtfilters_ser -lexpressions_ser -ldatabase_ser -lmir_ser $(VTK_LIBS) $(X_LIBS) @LIBS@
PARLIBS=$(COMMONLIBS) -lpipeline_par -lavtmath_par -lavtfilters_par -lexpressions_par -ldatabase_par -lmir_par $(VTK_LIBS) $(X_LIBS) @LIBS@ @SHLIB_MPI_LIBS@
......
......@@ -21,6 +21,7 @@
#include <avtOriginalDataMinMaxQuery.h>
#include <avtOriginalDataNumNodesQuery.h>
#include <avtOriginalDataNumZonesQuery.h>
#include <avtOriginalDataSpatialExtentsQuery.h>
#include <avtSkewnessQuery.h>
#include <avtSphericalCompactnessFactorQuery.h>
#include <avtTimeQuery.h>
......@@ -155,6 +156,9 @@ avtQueryFactory::Instance()
// Brad Whitlock, Thu Nov 17 10:18:41 PDT 2005
// Added Best Fit Line.
//
// Kathleen Bonnell, Tue Jan 31 15:52:18 PST 2006
// Added OriginalData SpatialExtents query.
//
// ****************************************************************************
......@@ -333,6 +337,10 @@ avtQueryFactory::CreateQuery(const QueryAttributes *qa)
{
query = new avtBestFitLineQuery();
}
else if (qname == "SpatialExtents")
{
query = new avtOriginalDataSpatialExtentsQuery();
}
return query;
}
......
// ************************************************************************* //
// avtOriginalDataSpatialExtentsQuery.C //
// ************************************************************************* //
#include <avtOriginalDataSpatialExtentsQuery.h>
#include <avtDatasetExaminer.h>
#include <avtParallel.h>
#include <avtTerminatingSource.h>
#include <ParsingExprList.h>
#include <snprintf.h>
// ****************************************************************************
// Method: avtOriginalDataSpatialExtentsQuery constructor
//
// Programmer: Kathleen Bonnell
// Creation: January 31, 2006
//
// Modifications:
//
// ****************************************************************************
avtOriginalDataSpatialExtentsQuery::avtOriginalDataSpatialExtentsQuery() : avtDatasetQuery()
{
}
// ****************************************************************************
// Method: avtOriginalDataSpatialExtentsQuery destructor
//
// Programmer: Kathleen Bonnell
// Creation: January 31, 2006
//
// Modifications:
//
// ****************************************************************************
avtOriginalDataSpatialExtentsQuery::~avtOriginalDataSpatialExtentsQuery()
{
}
// ****************************************************************************
// Method: avtOriginalDataSpatialExtentsQuery::ApplyFilters
//
// Purpose:
// Makes sure the entire SIL is used.
//
// Programmer: Kathleen Bonnell
// Creation: January 31, 2006
//
// Modifications:
//
// ****************************************************************************
avtDataObject_p
avtOriginalDataSpatialExtentsQuery::ApplyFilters(avtDataObject_p inData)