Commit 551bda68 authored by hrchilds's avatar hrchilds

Update from November 22, 2005

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@575 18c085ea-50e0-402c-830e-de6fd14e8384
parent 88e997f9
......@@ -240,6 +240,8 @@ cd VTK
# files that cmake finds are not C++ compliant. Change "/usr/lpp/X11/include"
# to "/usr/include" for CMAKE_X_CFLAGS, X11_X11_INCLUDE_PATH,
# X11_Xlib_INCLUDE_PATH and X11_Xutil_INCLUDE_PATH.
# If this should lead to errors related to standard C++ headers (e.g. stdio),
# remove the CMAKE_X_CFLAGS string and re-run cmake.
#
../cmake-1.8.1/bin/cmake .
#
......
......@@ -110,6 +110,9 @@ $0 = shift @ARGV;
# Kathlene Bonnell, Wed Nov 9 16:23:19 PST 2005
# Added qsub launch command.
#
# Mark C. Miller, Tue Nov 22 09:42:57 PST 2005
# Removed refs to sl_io subdirectory
#
###############################################################################
......@@ -1334,7 +1337,6 @@ else
print GDBFILE "directory $ENV{VISITHOME}/visitpy\n";
print GDBFILE "directory $ENV{VISITHOME}/visit_vtk/full\n";
print GDBFILE "directory $ENV{VISITHOME}/visit_vtk/lightweight\n";
print GDBFILE "directory $ENV{VISITHOME}/visit_vtk/sl_io\n";
print GDBFILE "directory $ENV{VISITHOME}/vtkqt\n";
print GDBFILE "directory $ENV{VISITHOME}/winutil\n";
......
......@@ -348,6 +348,8 @@ $0 = shift @ARGV;
# Moved this script over to legacy support only. It will no longer
# be used to launch development versions or new public versions.
#
# Mark C. Miller, Tue Nov 22 09:42:57 PST 2005
# Removed refs to sl_io subdirectory
###############################################################################
......@@ -1494,7 +1496,6 @@ else
print GDBFILE "directory $ENV{VISITHOME}/visitpy\n";
print GDBFILE "directory $ENV{VISITHOME}/visit_vtk/full\n";
print GDBFILE "directory $ENV{VISITHOME}/visit_vtk/lightweight\n";
print GDBFILE "directory $ENV{VISITHOME}/visit_vtk/sl_io\n";
print GDBFILE "directory $ENV{VISITHOME}/vtkqt\n";
print GDBFILE "directory $ENV{VISITHOME}/winutil\n";
......
......@@ -212,6 +212,9 @@
# Brad Whitlock, Fri Oct 7 13:16:49 PST 2005
# Copy dbA00.pdb and dbB00.pdb to the distribution.
#
# Mark C. Miller, Tue Nov 22 09:42:57 PST 2005
# Removed refs to sl_io library
#
#------------------------------------------------------------------------------
set DataFiles = "TRUE"
......@@ -740,7 +743,6 @@ endif
echo "Copying libraries to the distribution..."
cp `ls $VisItDir/lib/*.$SHLIB_SOEXT | grep -v libvtk | grep -v libqt | grep -v libpython` $libdir
cp $VisItDir/lib/libvtkqt.$SHLIB_SOEXT $libdir
cp $VisItDir/lib/libvtk_sl_io.$SHLIB_SOEXT $libdir
cp $VisItDir/lib/libqtviswindow.$SHLIB_SOEXT $libdir
#
......
......@@ -69,7 +69,7 @@ DEFAULT_HDF5_LIB=/usr/local/hdf5/hdf5-1.6.0/serial/64/lib
##
## Mili
##
MILI_DIR=/usr/gapps/visit/mili/1.06/irix64_cc_7.3.1.2_64
MILI_DIR=/usr/gapps/visit/mili/current/irix64_cc_7.3.1.2_64
##
## Silo
......
......@@ -9884,7 +9884,7 @@ if test "${ac_cv_lib_X11_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lX11 -lXt $X_LIBS $LIBS"
LIBS="-lX11 $X_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
......@@ -17060,7 +17060,6 @@ TOOLS_FILES="tools/Makefile
VISIT_VTK_FILES="visit_vtk/Makefile
visit_vtk/lightweight/Makefile
visit_vtk/full/Makefile
visit_vtk/sl_io/Makefile
visit_vtk/parallel/Makefile"
COMPONENT_FILES="components/Makefile
components/DBAtts/Makefile
......
......@@ -3224,7 +3224,6 @@ TOOLS_FILES="tools/Makefile
VISIT_VTK_FILES="visit_vtk/Makefile
visit_vtk/lightweight/Makefile
visit_vtk/full/Makefile
visit_vtk/sl_io/Makefile
visit_vtk/parallel/Makefile"
COMPONENT_FILES="components/Makefile
components/DBAtts/Makefile
......
......@@ -36,14 +36,13 @@
#define __vtkSTLReader_h
#include "vtkPolyDataSource.h"
#include <vtk_sl_io_exports.h>
class vtkCellArray;
class vtkFloatArray;
class vtkPointLocator;
class vtkPoints;
class VTK_SL_IO_API vtkSTLReader : public vtkPolyDataSource
class vtkSTLReader : public vtkPolyDataSource
{
public:
vtkTypeRevisionMacro(vtkSTLReader,vtkPolyDataSource);
......
......@@ -2876,6 +2876,9 @@ avtSiloFileFormat::GetConnectivityAndGroupInformation(DBfile *dbfile)
// ended up with a partially completed structure that eventually caused a
// crash.
//
// Mark C. Miller, Tue Nov 22 13:28:31 PST 2005
// Added alternative group information
//
// ****************************************************************************
void
......@@ -2965,6 +2968,23 @@ avtSiloFileFormat::GetConnectivityAndGroupInformationFromFile(DBfile *dbfile,
DBSetDir(dbfile, "/");
}
//
// Check for alternative definition of group information
// from "_visit_domain_groups"
//
if (numGroups == -1 && DBInqVarExists(dbfile, "_visit_domain_groups") != 0)
{
int numEntries = DBGetVarLength(dbfile, "_visit_domain_groups");
groupIds = new int[numEntries];
DBReadVar(dbfile, "_visit_domain_groups", groupIds);
map<int, bool> groupMap;
for (int i = 0; i < numEntries; i++)
groupMap[groupIds[i]] = true;
numGroups = groupMap.size();
}
}
}
......
......@@ -26,9 +26,8 @@
#define __vtkOBJReader_h
#include "vtkPolyDataSource.h"
#include <vtk_sl_io_exports.h>
class VTK_SL_IO_API vtkOBJReader : public vtkPolyDataSource
class vtkOBJReader : public vtkPolyDataSource
{
public:
static vtkOBJReader *New();
......
......@@ -21,6 +21,13 @@ void foogl(void)
GLfloat mad[] = {0.1, 0.5, 0.8, 1.0};
glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE, mad);
}
#ifdef HAVE_LIBBZ2
#include <bzlib.h>
void foobz2(void)
{
BZ2_bzlibVersion();
}
#endif
#endif
//
// END HACK
......
......@@ -11,6 +11,16 @@
// Prototypes.
bool ProcessCommandLine(int argc, char *argv[]);
#ifdef AIX
#ifdef HAVE_LIBBZ2
#include <bzlib.h>
void foobz2(void)
{
BZ2_bzlibVersion();
}
#endif
#endif
// ****************************************************************************
// Function: main
//
......
......@@ -5,6 +5,8 @@
# Hank Childs, Fri Jan 28 13:17:16 PST 2005
# Updated directories.
#
# Mark C. Miller, Tue Nov 22 09:42:57 PST 2005
# Removed refs to sl_io subdirectory
# ****************************************************************************
set VISITDIR = "/data_vobs/VisIt"
......@@ -87,7 +89,6 @@ escan $VISITDIR/viewer/rpc/*.C
escan $VISITDIR/visit_vtk/full/*.C
escan $VISITDIR/visit_vtk/lightweight/*.C
escan $VISITDIR/visit_vtk/parallel/*.C
escan $VISITDIR/visit_vtk/sl_io/*.C
escan $VISITDIR/visitpy/*.C
escan $VISITDIR/vtkqt/*.C
escan $VISITDIR/winutil/*.C
......
......@@ -15,6 +15,16 @@
static void ErrorCallback(void *, const char *);
static void ViewerWarningCallback(void *, const char *);
#ifdef AIX
#ifdef HAVE_LIBBZ2
#include <bzlib.h>
void foobz2(void)
{
BZ2_bzlibVersion();
}
#endif
#endif
// ****************************************************************************
// Method: main
//
......
# Copyright 1991 - 2003
# The Regents of the University of California.
# All rights reserved.
#
# This work was produced at the University of California, Lawrence Livermore
# National Laboratory (UC LLNL) under contract no. W-7405-ENG-48 (Contract
# 48) between the U.S. Department of Energy (DOE) and The Regents of the
# University of California (University) for the operation of UC LLNL.
# Copyright is reserved to the University for purposes of controlled
# dissemination, commercialization through formal licensing, or other
# disposition under terms of Contract 48; DOE policies, regulations and
# orders; and U.S. statutes. The rights of the Federal Government are
# reserved under Contract 48 subject to the restrictions agreed upon by DOE
# and University.
#
# DISCLAIMER
#
# This software was prepared as an account of work sponsored by an agency of
# the United States Government. Neither the United States Government nor the
# University of California nor any of their employees, makes any warranty,
# express or implied, or assumes any liability or responsiblity for the
# accuracy, completeness, or usefullness of any information, apparatus,
# product, or process disclosed, or represents that its use would not infringe
# privately owned rights. Reference herein to any specific commercial
# products, process, or service by trade name, trademark, manufacturer, or
# otherwise, does not necessarily constitute or imply its endorsement,
# recommendation, or favoring by the United States Government or the
# University of California. The views and opinions of authors expressed herein
# do not necessarily state or reflect those of the United States Government or
# the University of California, and shall not be used for advertising or
# product endorsement purposes.
#
# Modifications:
#
# Hank Childs, Thu Jan 22 17:15:33 PST 2004
# Created.
#
# Kathleen Bonnell, Thu Feb 12 16:42:39 PST 2004
# Removed EnSight readers (moved to EnSight database plugin).
#
# Hank Childs, Wed Aug 24 15:45:14 PDT 2005
# Add vtkCleanPolyData.
#
##############################################################################
##
## Programs and options...
##
@SET_MAKE@
@VARIABLES@
##
## Files...
##
SRC=\
vtkAppendFilter.C \
vtkAppendPolyData.C \
vtkCleanPolyData.C \
vtkDataObjectReader.C \
vtkDataObjectWriter.C \
vtkDataReader.C \
vtkDataSetReader.C \
vtkDataSetWriter.C \
vtkDataWriter.C \
vtkOBJReader.C \
vtkPolyDataReader.C \
vtkPolyDataWriter.C \
vtkRectilinearGridReader.C \
vtkRectilinearGridWriter.C \
vtkSTLReader.C \
vtkStructuredGridReader.C \
vtkStructuredGridWriter.C \
vtkStructuredPointsReader.C \
vtkStructuredPointsWriter.C \
vtkUnstructuredGridReader.C \
vtkUnstructuredGridWriter.C \
vtkWriter.C
CPPFLAGS=@VISIT_VTK_CPPFLAGS@ @CPPFLAGS@ @ANNOTATION_FLAGS@ -I. @MESA_INCLUDE@
OBJ=$(SRC:.C=.o)
LIB=libvtk_sl_io
LIBS=@VTK_LIBS@ $(X_LIBS) -lmisc
##
## Standard targets...
##
all: message $(LIBSHARED)
clean:
$(RM) $(OBJ) $(LIBSHARED)
##
## Other targets...
##
message:
@echo
@echo "****************************************************************************"
@echo "*** Building visit_vtk Library ($(LIB))"
@echo "****************************************************************************"
##
## Automatic dependency stuff
##
@TARGETS@
@LIBTARGETS@
/*=========================================================================
Program: Visualization Toolkit
Module: $RCSfile: vtkAppendFilter.cxx,v $
Language: C++
Date: $Date: 2003/03/20 13:15:27 $
Version: $Revision: 1.63 $
Copyright (c) 1993-2002 Ken Martin, Will Schroeder, Bill Lorensen
All rights reserved.
See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notice for more information.
=========================================================================*/
#include "vtkAppendFilter.h"
#include "vtkCell.h"
#include "vtkCellData.h"
#include "vtkDataSetAttributes.h"
#include "vtkDataSetCollection.h"
#include "vtkObjectFactory.h"
#include "vtkPointData.h"
#include "vtkUnstructuredGrid.h"
vtkCxxRevisionMacro(vtkAppendFilter, "$Revision: 1.63 $");
vtkStandardNewMacro(vtkAppendFilter);
//----- This hack needed to compile using gcc3 on OSX until new stdc++.dylib
#ifdef __APPLE_CC__
extern "C"
{
void oft_initGraphics()
{
extern void _ZNSt8ios_base4InitC4Ev();
_ZNSt8ios_base4InitC4Ev();
}
}
#endif
//----------------------------------------------------------------------------
vtkAppendFilter::vtkAppendFilter()
{
this->InputList = NULL;
}
//----------------------------------------------------------------------------
vtkAppendFilter::~vtkAppendFilter()
{
if (this->InputList != NULL)
{
this->InputList->Delete();
this->InputList = NULL;
}
}
//----------------------------------------------------------------------------
// Add a dataset to the list of data to append.
void vtkAppendFilter::AddInput(vtkDataSet *ds)
{
this->vtkProcessObject::AddInput(ds);
}
//----------------------------------------------------------------------------
vtkDataSet *vtkAppendFilter::GetInput(int idx)
{
if (idx >= this->NumberOfInputs || idx < 0)
{
return NULL;
}
return (vtkDataSet *)(this->Inputs[idx]);
}
//----------------------------------------------------------------------------
// Remove a dataset from the list of data to append.
void vtkAppendFilter::RemoveInput(vtkDataSet *ds)
{
this->vtkProcessObject::RemoveInput(ds);
}
//----------------------------------------------------------------------------
vtkDataSetCollection *vtkAppendFilter::GetInputList()
{
int idx;
if (this->InputList)
{
this->InputList->Delete();
}
this->InputList = vtkDataSetCollection::New();
for (idx = 0; idx < this->NumberOfInputs; ++idx)
{
if (this->Inputs[idx] != NULL)
{
this->InputList->AddItem((vtkDataSet*)(this->Inputs[idx]));
}
}
return this->InputList;
}
//----------------------------------------------------------------------------
// Append data sets into single unstructured grid
void vtkAppendFilter::Execute()
{
vtkIdType numPts, numCells, ptOffset, cellOffset;
int tenth, count, abort=0;
float decimal;
vtkPoints *newPts;
vtkPointData *pd = NULL;
vtkCellData *cd = NULL;
vtkIdList *ptIds, *newPtIds;
int i, idx;
vtkDataSet *ds;
vtkIdType ptId, cellId, newCellId;
vtkUnstructuredGrid *output = this->GetOutput();
vtkPointData *outputPD = output->GetPointData();
vtkCellData *outputCD = output->GetCellData();
vtkDebugMacro(<<"Appending data together");
// Loop over all data sets, checking to see what data is common to
// all inputs. Note that data is common if 1) it is the same attribute
// type (scalar, vector, etc.), 2) it is the same native type (int,
// float, etc.), and 3) if a data array in a field, if it has the same name.
count = 0;
decimal = 0.0;
numPts = 0;
numCells = 0;
vtkDataSetAttributes::FieldList ptList(this->NumberOfInputs);
vtkDataSetAttributes::FieldList cellList(this->NumberOfInputs);
int firstPD=1;
int firstCD=1;
for (idx = 0; idx < this->NumberOfInputs; ++idx)
{
ds = (vtkDataSet *)(this->Inputs[idx]);
if (ds != NULL)
{
if ( ds->GetNumberOfPoints() <= 0 && ds->GetNumberOfCells() <= 0 )
{
continue; //no input, just skip
}
numPts += ds->GetNumberOfPoints();
numCells += ds->GetNumberOfCells();
pd = ds->GetPointData();
if ( firstPD )
{
ptList.InitializeFieldList(pd);
firstPD = 0;
}
else
{
ptList.IntersectFieldList(pd);
}
cd = ds->GetCellData();
if ( firstCD )
{
cellList.InitializeFieldList(cd);
firstCD = 0;
}
else
{
cellList.IntersectFieldList(cd);
}
}//if non-empty dataset
}//for all inputs
if ( numPts < 1 || numCells < 1 )
{
vtkErrorMacro(<<"No data to append!");
return;
}
// Now can allocate memory
output->Allocate(numCells); //allocate storage for geometry/topology
outputPD->CopyAllocate(ptList,numPts);
outputCD->CopyAllocate(cellList,numCells);
newPts = vtkPoints::New();
newPts->SetNumberOfPoints(numPts);
ptIds = vtkIdList::New(); ptIds->Allocate(VTK_CELL_SIZE);
newPtIds = vtkIdList::New(); newPtIds->Allocate(VTK_CELL_SIZE);
// Append each input dataset together
//
tenth = (numPts + numCells)/10 + 1;
ptOffset=0;
cellOffset=0;
for (idx = 0; idx < this->NumberOfInputs && !abort; ++idx)
{
ds = (vtkDataSet *)(this->Inputs[idx]);
if (ds != NULL)
{
numPts = ds->GetNumberOfPoints();
numCells = ds->GetNumberOfCells();
pd = ds->GetPointData();
// copy points and point data
for (ptId=0; ptId < numPts && !abort; ptId++)
{
newPts->SetPoint(ptId+ptOffset,ds->GetPoint(ptId));
outputPD->CopyData(ptList,pd,idx,ptId,ptId+ptOffset);
// Update progress
count++;
if ( !(count % tenth) )
{
decimal += 0.1;
this->UpdateProgress (decimal);
abort = this->GetAbortExecute();
}
}
cd = ds->GetCellData();
// copy cell and cell data
for (cellId=0; cellId < numCells && !abort; cellId++)
{
ds->GetCellPoints(cellId, ptIds);
newPtIds->Reset ();
for (i=0; i < ptIds->GetNumberOfIds(); i++)
{
newPtIds->InsertId(i,ptIds->GetId(i)+ptOffset);
}
newCellId = output->InsertNextCell(ds->GetCellType(cellId),newPtIds);
outputCD->CopyData(cellList,cd,idx,cellId,newCellId);
// Update progress
count++;
if ( !(count % tenth) )
{
decimal += 0.1;
this->UpdateProgress (decimal);
abort = this->GetAbortExecute();
}
}
ptOffset+=numPts;
cellOffset+=numCells;
}
}
// Update ourselves and release memory
//
output->SetPoints(newPts);
newPts->Delete();
ptIds->Delete();
newPtIds->Delete();
}
//----------------------------------------------------------------------------
void vtkAppendFilter::PrintSelf(ostream& os, vtkIndent indent)
{
this->Superclass::PrintSelf(os,indent);
}
/*=========================================================================
Program: Visualization Toolkit
Module: $RCSfile: vtkAppendFilter.h,v $
Language: C++
Date: $Date: 2002/11/03 15:57:42 $
Version: $Revision: 1.44 $
Copyright (c) 1993-2002 Ken Martin, Will Schroeder, Bill Lorensen
All rights reserved.
See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notice for more information.
=========================================================================*/
// .NAME vtkAppendFilter - appends one or more datasets together into a single unstructured grid
// .SECTION Description
// vtkAppendFilter is a filter that appends one of more datasets into a single
// unstructured grid. All geometry is extracted and appended, but point
// attributes (i.e., scalars, vectors, normals, field data, etc.) are extracted
// and appended only if all datasets have the point attributes available.
// (For example, if one dataset has scalars but another does not, scalars will
// not be appended.)
// .SECTION See Also
// vtkAppendPolyData
#ifndef __vtkAppendFilter_h
#define __vtkAppendFilter_h
#include "vtkDataSetToUnstructuredGridFilter.h"
#include <vtk_sl_io_exports.h>
class vtkDataSetCollection;
class VTK_SL_IO_API vtkAppendFilter : public vtkDataSetToUnstructuredGridFilter
{
public:
static vtkAppendFilter *New();
vtkTypeRevisionMacro(vtkAppendFilter,vtkDataSetToUnstructuredGridFilter);
void PrintSelf(ostream& os, vtkIndent indent);
// Description:
// Add a dataset to the list of data to append.
void AddInput(vtkDataSet *in);
// Description:
// Get any input of this filter.
vtkDataSet *GetInput(int idx);
vtkDataSet *GetInput()
{return this->GetInput( 0 );}
// Description:
// Remove a dataset from the list of data to append.
void RemoveInput(vtkDataSet *in);
// Description:
// Returns a copy of the input array. Modifications to this list
// will not be reflected in the actual inputs.
vtkDataSetCollection *GetInputList();
protected:
vtkAppendFilter();
~vtkAppendFilter();
// Usual data generation method
void Execute();
// list of data sets to append together.
// Here as a convenience. It is a copy of the input array.
vtkDataSetCollection *InputList;
private:
// hide the superclass' AddInput() from the user and the compiler
void AddInput(vtkDataObject *)
{ vtkErrorMacro( << "AddInput() must be called with a vtkDataSet not a vtkDataObject."); };
void RemoveInput(vtkDataObject *input)
{ this->vtkProcessObject::RemoveInput(input); };
private:
vtkAppendFilter(const vtkAppendFilter&); // Not implemented.
void operator=(const vtkAppendFilter&); // Not implemented.
};
#endif
This diff is collapsed.
/*=========================================================================
Program: Visualization Toolkit
Module: $RCSfile: vtkAppendPolyData.h,v $
Language: C++
Date: $Date: 2002/09/03 12:52:22 $
Version: $Revision: 1.54 $
Copyright (c) 1993-2002 Ken Martin, Will Schroeder, Bill Lorensen
All rights reserved.
See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
This software is distributed WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notice for more information.
=========================================================================*/
// .NAME vtkAppendPolyData - appends one or more polygonal datasets together
// .SECTION Description
//
// vtkAppendPolyData is a filter that appends one of more polygonal datasets
// into a single polygonal dataset. All geometry is extracted and appended,
// but point and cell attributes (i.e., scalars, vectors, normals) are
// extracted and appended only if all datasets have the point and/or cell
// attributes available. (For example, if one dataset has point scalars but
// another does not, point scalars will not be appended.)
// .SECTION See Also
// vtkAppendFilter
#ifndef __vtkAppendPolyData_h
#define __vtkAppendPolyData_h
#include "vtkPolyDataToPolyDataFilt