Commit b237ad94 authored by hrchilds's avatar hrchilds

Update from June 29, 2006

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@693 18c085ea-50e0-402c-830e-de6fd14e8384
parent 7d91ed28
......@@ -146,6 +146,9 @@
# Mark C. Miller, Wed Dec 7 14:02:41 PST 2005
# Changed order of SUBDIRS so third_party_builtin is built first, not last
#
# Brad Whitlock, Tue Mar 21 14:27:38 PST 2006
# I made it build libsim.
#
##############################################################################
@SET_MAKE@
......@@ -157,7 +160,7 @@ DISTRIB=configure configure.in VERSION
SUBDIRS=include lib bin third_party_builtin common @VTKQT@ visit_vtk \
components engine launcher @METADATA_SERVER@ winutil @VIEWER@ \
@GUI@ @VISITPY@ @JAVA_TARGET@ plots operators databases @HELP@ \
tools
sim tools
#
# Make sure that the installation directories exist
......
......@@ -507,6 +507,10 @@ foreach platform ($platforms)
mkdir distribution/visit/$Version/$platform/plugins/operators
mkdir distribution/visit/$Version/$platform/plugins/databases
mkdir distribution/visit/$Version/$platform/java
mkdir distribution/visit/$Version/$platform/libsim
mkdir distribution/visit/$Version/$platform/libsim/V1
mkdir distribution/visit/$Version/$platform/libsim/V1/include
mkdir distribution/visit/$Version/$platform/libsim/V1/lib
end
#
......@@ -641,6 +645,7 @@ set incdir = distribution/visit/$Version/$visitbindir/include
set helpdir = distribution/visit/$Version/$visitbindir/help
set plugindir = distribution/visit/$Version/$visitbindir/plugins
set javadir = distribution/visit/$Version/$visitbindir/java
set simv1dir = distribution/visit/$Version/$visitbindir/libsim/V1
set frameworkdir = distribution/visit/$Version/$visitbindir/Frameworks
#
......@@ -958,6 +963,19 @@ if (-e $VisItDir/java/RunViewer.class) then
cp -R $VisItDir/java/RunViewer.class $javadir
endif
#
# Install libsim
#
if (-e $VisItDir/archives/libsim.a) then
cp $VisItDir/archives/libsim.a $simv1dir/lib
cp $VisItDir/sim/lib/VisItControlInterface_V1.h $simv1dir/include
cp $VisItDir/sim/lib/visitfortransiminterface.inc $simv1dir/include
cp $VisItDir/databases/SimV1/VisItDataInterface_V1.h $simv1dir/include
endif
if (-e $VisItDir/archives/libsimf.a) then
cp $VisItDir/archives/libsimf.a $simv1dir/lib
endif
#
# Copy the configuration files.
#
......
......@@ -22,7 +22,7 @@ user=`whoami`
hitit=true
sunset=true
sc=true
tidalwave=true
tidalwave=false
white=true
purple=true
lilac=true
......
......@@ -475,7 +475,7 @@
<Field name="numNodesSet" type="bool">true</Field>
<Field name="numNodes" type="int">4</Field>
<Field name="partitionSet" type="bool">true</Field>
<Field name="partition" type="string">pu,pbatch</Field>
<Field name="partition" type="string">purple,pbatch</Field>
<Field name="bankSet" type="bool">true</Field>
<Field name="bank" type="string">bdivp</Field>
<Field name="timeLimitSet" type="bool">true</Field>
......
......@@ -496,7 +496,7 @@
<Field name="numNodesSet" type="bool">true</Field>
<Field name="numNodes" type="int">4</Field>
<Field name="partitionSet" type="bool">true</Field>
<Field name="partition" type="string">pu,pbatch</Field>
<Field name="partition" type="string">purple,pbatch</Field>
<Field name="bankSet" type="bool">true</Field>
<Field name="bank" type="string">bdivp</Field>
<Field name="timeLimitSet" type="bool">true</Field>
......
......@@ -73,7 +73,6 @@ do
$cmd visit-install >> $output
$cmd jvisit$version.tar.gz >> $output
$cmd visit$version.exe >> $output
# $cmd visit$version-win98.exe >> $output
$cmd visit$version2.aix.tar.gz >> $output
$cmd visit$version2.aix64-xlc.tar.gz >> $output
$cmd visit$version2.darwin.tar.gz >> $output
......@@ -82,7 +81,6 @@ do
$cmd visit$version2.linux-ia64.tar.gz >> $output
$cmd visit$version2.linux-x86_64.tar.gz >> $output
$cmd visit$version2.linux_chaos.tar.gz >> $output
# $cmd visit$version2.linux_rh71.tar.gz >> $output
$cmd visit$version2.linux_rhel3.tar.gz >> $output
$cmd visit$version2.osf1.tar.gz >> $output
$cmd visit$version2.sunos5.tar.gz >> $output
......@@ -98,6 +96,7 @@ do
$cmd CMake_020314.tar.gz >> ../visit$version/$output
$cmd CMake1.4.7-src-unix.tar.gz >> ../visit$version/$output
$cmd cmake-1.8.1.tar.gz >> ../visit$version/$output
$cmd cmake-2.2.3.tar.gz >> ../visit$version/$output
$cmd Mesa-4.1-mangled.tar.gz >> ../visit$version/$output
$cmd Mesa-5.0-mangled.tar.gz >> ../visit$version/$output
$cmd Python-2.1.2.tar.gz >> ../visit$version/$output
......@@ -110,10 +109,12 @@ do
$cmd silo050228.sh >> ../visit$version/$output
$cmd silo050506.sh >> ../visit$version/$output
$cmd silo051121.sh >> ../visit$version/$output
$cmd silo060605.sh >> ../visit$version/$output
$cmd VTK_020314.tar.gz >> ../visit$version/$output
$cmd vtk_cvs_16Dec02.tar.gz >> ../visit$version/$output
$cmd vtk_cvs_2003_10_28.tar.gz >> ../visit$version/$output
$cmd vtk_cvs_2003_10_28c.tar.gz >> ../visit$version/$output
$cmd vtk-5.0.0a.tar.gz >> ../visit$version/$output
cd ../visit$version
shift
......
......@@ -26,7 +26,7 @@ user=`whoami`
hitit=true
sunset=true
sc=true
tidalwave=true
tidalwave=false
white=true
purple=true
lilac=true
......@@ -188,7 +188,7 @@ EOF
rm -f hitit
cat <<EOF > hitit
./visit-install -r -private -c closed -g visit -b bdivp -gw -l $ver linux /usr/gapps/visit > installlog 2>&1
./visit-install -r -private -c closed -g visit -b bdivp -gw -l $ver linux_rhel3 /usr/gapps/visit > installlog 2>&1
echo "" >> resultlog 2>&1
echo " install of visit on hitit" >> resultlog 2>&1
echo " ---------------------------" >> resultlog 2>&1
......@@ -211,8 +211,8 @@ then
then
cat hitit >> bdiv
scp -P 22 hitit:/gscratch/$user/hitit/visitbuild/visit$ver2.linux.tar.gz .
scp -P 22 visit$ver2.linux.tar.gz sunset:
scp -P 22 hitit:/gscratch/$user/hitit/visitbuild/visit$ver2.linux.tar.gz visit$ver2.linux_rhel3.tar.gz
scp -P 22 visit$ver2.linux_rhel3.tar.gz sunset:
fi
fi
......@@ -413,7 +413,7 @@ fi
rm -f lilac
cat <<EOF > lilac
./visit-install -private -c closed -g visit -b bdivp -gw -l $ver linux /usr/gapps/visit > installlog 2>&1
./visit-install -private -c closed -g visit -b bdivp -gw -l $ver linux_chaos /usr/gapps/visit > installlog 2>&1
echo "" >> resultlog 2>&1
echo " install of visit on lilac" >> resultlog 2>&1
echo " ---------------------------" >> resultlog 2>&1
......@@ -436,8 +436,8 @@ then
then
cat lilac >> lc
scp lilac3:/usr/tmp/$user/lilac/visitbuild/visit$ver2.linux.tar.gz .
scp visit$ver2.linux.tar.gz sc1:
scp lilac3:/usr/tmp/$user/lilac/visitbuild/visit$ver2.linux.tar.gz visit$ver2.linux_chaos.tar.gz
scp visit$ver2.linux_chaos.tar.gz sc1:
fi
fi
......@@ -448,7 +448,6 @@ rm -f gauss
cat <<EOF > gauss
./visit-install $verflag -c closed -g visit -b bdivp -gw -l $ver linux-x86_64 /usr/gapps/visit > installlog 2>&1
rm -f resultlog
echo "" >> resultlog 2>&1
echo " install of visit on gauss" >> resultlog 2>&1
echo " ---------------------------" >> resultlog 2>&1
......
......@@ -14,7 +14,7 @@ fi
## If VTK is not set, use VisIt's vtk.
##
if test -z "$VTK"; then
VTK=$VISITHOME/vtk/5.0.0.a/altix_gcc_3.3.3
VTK=$VISITHOME/vtk/5.0.0a/altix_gcc_3.3.3
fi
##
......@@ -85,8 +85,8 @@ DEFAULT_HDF4_LIBS=$VISITHOME/hdf4/2.4.1/altix_gcc_3.3.3/lib
##
## HDF5
##
DEFAULT_HDF5_INCLUDE=$VISITHOME/hdf5/1.6.0/altix_gcc_3.3.3/include
DEFAULT_HDF5_LIB=$VISITHOME/hdf5/1.6.0/altix_gcc_3.3.3/lib
DEFAULT_HDF5_INCLUDE=$VISITHOME/hdf5/1.6.5/altix_gcc_3.3.3/include
DEFAULT_HDF5_LIB=$VISITHOME/hdf5/1.6.5/altix_gcc_3.3.3/lib
##
## Mili
......@@ -102,5 +102,5 @@ DEFAULT_NETCDF_LIB=$VISITHOME/netcdf/3.6.0/altix_gcc_3.3.3/lib
##
## Silo
##
DEFAULT_SILO_INCLUDES=$VISITHOME/silo/4.5/altix_gcc_3.3.3/include
DEFAULT_SILO_LIBRARY=$VISITHOME/silo/4.5/altix_gcc_3.3.3/lib
DEFAULT_SILO_INCLUDES=$VISITHOME/silo/4.5.1/altix_gcc_3.3.3/include
DEFAULT_SILO_LIBRARY=$VISITHOME/silo/4.5.1/altix_gcc_3.3.3/lib
......@@ -14,7 +14,7 @@ fi
## If VTK is not set, use VisIt's vtk.
##
if test -z "$VTK"; then
VTK=$VISITHOME/vtk/5.0.0.a/altix_gcc_3.3.3
VTK=$VISITHOME/vtk/5.0.0a/altix_gcc_3.3.3
fi
##
......@@ -85,8 +85,8 @@ DEFAULT_HDF4_LIBS=$VISITHOME/hdf4/2.4.1/altix_gcc_3.3.3/lib
##
## HDF5
##
DEFAULT_HDF5_INCLUDE=$VISITHOME/hdf5/1.6.0/altix_gcc_3.3.3/include
DEFAULT_HDF5_LIB=$VISITHOME/hdf5/1.6.0/altix_gcc_3.3.3/lib
DEFAULT_HDF5_INCLUDE=$VISITHOME/hdf5/1.6.5/altix_gcc_3.3.3/include
DEFAULT_HDF5_LIB=$VISITHOME/hdf5/1.6.5/altix_gcc_3.3.3/lib
##
## Mili
......@@ -102,5 +102,5 @@ DEFAULT_NETCDF_LIB=$VISITHOME/netcdf/3.6.0/altix_gcc_3.3.3/lib
##
## Silo
##
DEFAULT_SILO_INCLUDES=$VISITHOME/silo/4.5/altix_gcc_3.3.3/include
DEFAULT_SILO_LIBRARY=$VISITHOME/silo/4.5/altix_gcc_3.3.3/lib
DEFAULT_SILO_INCLUDES=$VISITHOME/silo/4.5.1/altix_gcc_3.3.3/include
DEFAULT_SILO_LIBRARY=$VISITHOME/silo/4.5.1/altix_gcc_3.3.3/lib
......@@ -105,5 +105,5 @@ DEFAULT_NETCDF_LIB=/usr/gapps/visit/netcdf/3.6.0/linux_chaos_gcc_3.3.3/lib
##
## Silo
##
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.5.1/chaos_3_x86_elan3/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.5.1/chaos_3_x86_elan3/lib
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.5.1/chaos_3_x86_elan3/gcc/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.5.1/chaos_3_x86_elan3/gcc/lib
......@@ -105,5 +105,5 @@ DEFAULT_NETCDF_LIB=/usr/gapps/visit/netcdf/3.6.0/linux_chaos_gcc_3.3.3/lib
##
## Silo
##
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.5.1/chaos_3_x86_elan3/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.5.1/chaos_3_x86_elan3/lib
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.5.1/chaos_3_x86_elan3/gcc/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.5.1/chaos_3_x86_elan3/gcc/lib
......@@ -105,5 +105,5 @@ DEFAULT_NETCDF_LIB=/usr/gapps/visit/netcdf/3.6.0/linux_chaos_gcc_3.3.3/lib
##
## Silo
##
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.5.1/chaos_3_x86_elan3/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.5.1/chaos_3_x86_elan3/lib
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.5.1/chaos_3_x86_elan3/gcc/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.5.1/chaos_3_x86_elan3/gcc/lib
This diff is collapsed.
......@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce configure.
dnl
dnl
dnl
dnl Copyright 2000 - 2005
dnl Copyright 2000 - 2006
dnl The Regents of the University of California.
dnl All rights reserved.
dnl
......@@ -1296,6 +1296,7 @@ AC_PROG_CXX
AC_PROG_CXXCPP
AC_PROG_CC
AC_PROG_CPP
AC_PROG_F77
# Keep checking for programs.
AC_PROG_MAKE_SET
......@@ -1303,6 +1304,15 @@ AC_PROG_RANLIB
AC_CHECK_PROG(MAKEDEPEND,makedepend,makedepend)
AC_ISC_POSIX
dnl
dnl Set BUILD_FORTRAN based on how F77 is defined
dnl
BUILD_FORTRAN=""
if test -n "$F77"; then
BUILD_FORTRAN="\$(BUILD_FORTRAN)"
fi
AC_SUBST(BUILD_FORTRAN)
dnl
dnl If they didn't specify any CXXFLAGS through an environment variable,
dnl then we should choose optimized for them.
......@@ -3259,6 +3269,10 @@ COMMON_FILES="common/Makefile
common/utility/Makefile"
TOOLS_FILES="tools/Makefile
tools/DataManualExamples/Makefile
tools/DataManualExamples/CreatingCompatible/Makefile
tools/DataManualExamples/CreatingCompatibleAdvanced/Makefile
tools/DataManualExamples/Simulations/Makefile
tools/annotations/Makefile
tools/avtprep/Makefile
tools/clipeditor/Makefile
......@@ -3300,7 +3314,9 @@ OPERATOR_FILES="operators/Makefile"
DATABASE_FILES="databases/Makefile"
DATA_FILES="data/Makefile"
SIMULATION_PROTOTYPE_FILES="sim/lib/Makefile"
SIMULATION_PROTOTYPE_FILES="sim/Makefile
sim/examples/Makefile
sim/lib/Makefile"
CQSCORE_FILES="cqscore/Makefile"
THIRD_PARTY_BUILTIN_FILES="third_party_builtin/Makefile
third_party_builtin/bzip2/Makefile"
......
......@@ -100,6 +100,9 @@ static void GetListOfUniqueCellTypes(vtkUnstructuredGrid *ug,
// Kathleen Bonnell, Thu Sep 22 15:37:13 PDT 2005
// Save the file extension.
//
// Kathleen Bonnell, Thu Jun 29 17:30:40 PDT 2006
// Add vtk_time, to store time from the VTK file if it is available.
//
// ****************************************************************************
avtVTKFileFormat::avtVTKFileFormat(const char *fname, DBOptionsAttributes *)
......@@ -117,6 +120,7 @@ avtVTKFileFormat::avtVTKFileFormat(const char *fname, DBOptionsAttributes *)
start = i;
extension = string(fname, start+1, len-1);
vtk_time = INVALID_TIME;
}
......@@ -172,6 +176,9 @@ avtVTKFileFormat::~avtVTKFileFormat()
// Remove call to SetSource(NULL), as it now removes information necessary
// to the dataset.
//
// Kathleen Bonnell, Thu Jun 29 17:30:40 PDT 2006
// Retrieve TIME from FieldData if available.
//
// ****************************************************************************
void
......@@ -264,6 +271,11 @@ avtVTKFileFormat::ReadInDataset(void)
reader->Delete();
}
vtk_time = INVALID_TIME;
if (dataset->GetFieldData()->GetArray("TIME") != 0)
{
vtk_time = dataset->GetFieldData()->GetArray("TIME")->GetTuple1(0);
}
if (dataset->GetDataObjectType() == VTK_STRUCTURED_POINTS)
{
......@@ -941,3 +953,20 @@ avtVTKFileFormat::GetCycleFromFilename(const char *f) const
{
return GuessCycle(f);
}
// ****************************************************************************
// Method: avtVTKFileFormat::GetTime
//
// Purpose: Return the time associated with this curve file
//
// Programmer: Kathleen Bonnell
// Creation: Jun 29, 2006
//
// ****************************************************************************
double
avtVTKFileFormat::GetTime()
{
return vtk_time;
}
......@@ -78,6 +78,9 @@ class DBOptionsAttributes;
// Kathleen Bonnell, Thu Sep 22 15:37:13 PDT 2005
// Added 'extension' to store file extension.
//
// Kathleen Bonnell, Thu Jun 29 17:30:40 PDT 2006
// Added GetTime method.
//
// ****************************************************************************
class avtVTKFileFormat : public avtSTSDFileFormat
......@@ -99,6 +102,7 @@ class avtVTKFileFormat : public avtSTSDFileFormat
virtual void FreeUpResources(void);
int GetCycleFromFilename(const char *f) const;
virtual double GetTime(void);
protected:
vtkDataSet *dataset;
......@@ -109,7 +113,7 @@ class avtVTKFileFormat : public avtSTSDFileFormat
char *matvarname;
std::vector<int> matnos;
std::vector<std::string> matnames;
double vtk_time;
std::string extension;
......
......@@ -16,11 +16,13 @@
#include "vtkCellArray.h"
#include "vtkFloatArray.h"
#include "vtkInformation.h"
#include "vtkInformationVector.h"
#include "vtkObjectFactory.h"
#include "vtkPointData.h"
#include "vtkPolyData.h"
vtkCxxRevisionMacro(vtkOBJReader, "$Revision: 1.26 $");
vtkCxxRevisionMacro(vtkOBJReader, "$Revision: 1.27 $");
vtkStandardNewMacro(vtkOBJReader);
// Description:
......@@ -28,6 +30,8 @@ vtkStandardNewMacro(vtkOBJReader);
vtkOBJReader::vtkOBJReader()
{
this->FileName = NULL;
this->SetNumberOfInputPorts(0);
}
vtkOBJReader::~vtkOBJReader()
......@@ -89,12 +93,22 @@ int is_whitespace(char c)
return 0;
}
void vtkOBJReader::Execute()
int vtkOBJReader::RequestData(
vtkInformation *vtkNotUsed(request),
vtkInformationVector **vtkNotUsed(inputVector),
vtkInformationVector *outputVector)
{
// get the info object
vtkInformation *outInfo = outputVector->GetInformationObject(0);
// get the ouptut
vtkPolyData *output = vtkPolyData::SafeDownCast(
outInfo->Get(vtkDataObject::DATA_OBJECT()));
if (!this->FileName)
{
vtkErrorMacro(<< "A FileName must be specified.");
return;
return 0;
}
FILE *in = fopen(this->FileName,"r");
......@@ -102,11 +116,11 @@ void vtkOBJReader::Execute()
if (in == NULL)
{
vtkErrorMacro(<< "File " << this->FileName << " not found");
return;
return 0;
}
vtkDebugMacro(<<"Reading file");
// intialise some structures to store the file contents in
vtkPoints *points = vtkPoints::New();
vtkFloatArray *tcoords = vtkFloatArray::New();
......@@ -120,7 +134,7 @@ void vtkOBJReader::Execute()
vtkCellArray *normal_polys = vtkCellArray::New();
int hasNormals=0; // (false)
int normals_same_as_verts=1; // (true)
int everything_ok = 1; // (true) (use of this flag avoids early return and associated memory leak)
// -- work through the file line by line, assigning into the above six structures as appropriate --
......@@ -237,10 +251,11 @@ void vtkOBJReader::Execute()
}
// skip over what we just read
// (find the first whitespace character)
while (!is_whitespace(*pChar) && pChar<pEnd) { pChar++; }
while (!is_whitespace(*pChar) && pChar<pEnd)
{
pChar++;
}
}
}
// count of tcoords and normals must be equal to number of vertices or zero
......@@ -281,20 +296,21 @@ void vtkOBJReader::Execute()
{
vtkDebugMacro(<<"Copying file data into the output directly");
this->GetOutput()->SetPoints(points);
this->GetOutput()->SetPolys(polys);
output->SetPoints(points);
output->SetPolys(polys);
// if there is an exact correspondence between tcoords and vertices then can simply
// assign the tcoords points as point data
if (hasTCoords && tcoords_same_as_verts)
this->GetOutput()->GetPointData()->SetTCoords(tcoords);
output->GetPointData()->SetTCoords(tcoords);
// if there is an exact correspondence between normals and vertices then can simply
// assign the normals as point data
if (hasNormals && normals_same_as_verts)
this->GetOutput()->GetPointData()->SetNormals(normals);
this->GetOutput()->Squeeze();
{
output->GetPointData()->SetNormals(normals);
}
output->Squeeze();
}
// otherwise we can duplicate the vertices as necessary (a bit slower)
else
......@@ -342,10 +358,14 @@ void vtkOBJReader::Execute()
{
// copy the tcoord for this point across (if there is one)
if (n_tcoord_pts>0)
{
new_tcoords->InsertNextTuple(tcoords->GetTuple(tcoord_pts[j]));
}
// copy the normal for this point across (if there is one)
if (n_normal_pts>0)
{
new_normals->InsertNextTuple(normals->GetTuple(normal_pts[j]));
}
// copy the vertex into the new structure and update
// the vertex index in the polys structure (pts is a pointer into it)
pts[j] = new_points->InsertNextPoint(points->GetPoint(pts[j]));
......@@ -356,13 +376,17 @@ void vtkOBJReader::Execute()
}
// use the new structures for the output
this->GetOutput()->SetPoints(new_points);
this->GetOutput()->SetPolys(new_polys);
output->SetPoints(new_points);
output->SetPolys(new_polys);
if (hasTCoords)
this->GetOutput()->GetPointData()->SetTCoords(new_tcoords);
{
output->GetPointData()->SetTCoords(new_tcoords);
}
if (hasNormals)
this->GetOutput()->GetPointData()->SetNormals(new_normals);
this->GetOutput()->Squeeze();
{
output->GetPointData()->SetNormals(new_normals);
}
output->Squeeze();
new_points->Delete();
new_polys->Delete();
......@@ -377,6 +401,8 @@ void vtkOBJReader::Execute()
polys->Delete();
tcoord_polys->Delete();
normal_polys->Delete();
return 1;
}
void vtkOBJReader::PrintSelf(ostream& os, vtkIndent indent)
......@@ -387,4 +413,3 @@ void vtkOBJReader::PrintSelf(ostream& os, vtkIndent indent)
<< (this->FileName ? this->FileName : "(none)") << "\n";
}
......@@ -22,13 +22,13 @@
#ifndef __vtkOBJReader_h
#define __vtkOBJReader_h
#include "vtkPolyDataSource.h"
#include "vtkPolyDataAlgorithm.h"
class vtkOBJReader : public vtkPolyDataSource
class vtkOBJReader : public vtkPolyDataAlgorithm
{
public:
static vtkOBJReader *New();
vtkTypeRevisionMacro(vtkOBJReader,vtkPolyDataSource);
vtkTypeRevisionMacro(vtkOBJReader,vtkPolyDataAlgorithm);
void PrintSelf(ostream& os, vtkIndent indent);
// Description:
......@@ -40,7 +40,7 @@ protected:
vtkOBJReader();
~vtkOBJReader();
void Execute();
int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *);
char *FileName;
private:
......@@ -49,5 +49,3 @@ private:
};
#endif
# Copyright 2000 - 2006
# 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:
#
##############################################################################
@SET_MAKE@
@VARIABLES@
@DIRTARGETS@
SUBDIRS=lib examples
message:
@echo
@echo "****************************************************************************"
@echo "****************************************************************************"
@echo "***"
@echo "*** Building Sim"
@echo "***"
@echo "****************************************************************************"
@echo "****************************************************************************"
# Copyright 2000 - 2006
# 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.
#
##############################################################################
# set TOPDIR to point to where vist is installed
# The standard place is /usr/gapps/visit/current/<plateform> where plateform
# should be replaced with the type of plateform you are running on, eg.
# linux-intel
TOPDIR=../..
## -*- makefile -*-
## Variables
##
CC=gcc
SIMSER=simulation
SIMPAR=psimulation