Commit 2b07227e authored by whitlocb's avatar whitlocb

This update gets VisIt working on VTK 5.8.



git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@16330 18c085ea-50e0-402c-830e-de6fd14e8384
parent 0d87ca0b
......@@ -57,7 +57,7 @@ INCLUDE(${VISIT_SOURCE_DIR}/CMake/SetUpThirdParty.cmake)
IF (WIN32)
SET_UP_THIRD_PARTY(MESA lib/${VISIT_MSVC_VERSION} include MesaGL32 osmesa32)
ELSE (WIN32)
SET_UP_THIRD_PARTY(MESA lib include MesaGL OSMesa)
SET_UP_THIRD_PARTY(MESA lib include OSMesa)
# If we're on Apple, set up MesaGLU too. This is mostly to ensure that it gets installed.
IF(APPLE)
......
#*****************************************************************************
#
# Copyright (c) 2000 - 2011, Lawrence Livermore National Security, LLC
# Copyright (c) 2000 - 2010, Lawrence Livermore National Security, LLC
# Produced at the Lawrence Livermore National Laboratory
# LLNL-CODE-400142
# All rights reserved.
......@@ -52,6 +52,13 @@
# Kathleen Bonnell, Thu Dec 2 15:30:05 MST 2010
# Add .lib files for Install on Windows.
#
# Tom Fogal, Fri Jan 28 13:35:29 MST 2011
# Account for new VTK installation structure.
#
# Kathleen Bonnell, Tue Jun 7 11:10:51 PDT 2011
# Don't add VTK's MangledMesa directory to VTK_INCLUDE_DIRS unless VTK
# was built with MangledMesa.
#
#****************************************************************************/
INCLUDE(${VISIT_SOURCE_DIR}/CMake/ThirdPartyInstallLibrary.cmake)
......@@ -62,17 +69,19 @@ INCLUDE(${VISIT_SOURCE_DIR}/CMake/ThirdPartyInstallLibrary.cmake)
# We rely on FindVTK to set it to the right value.
SET(VTK_USE_MANGLED_MESA OFF CACHE INTERNAL "Set a cache variable that FindVTK can override")
INCLUDE(${CMAKE_ROOT}/Modules/FindVTK.cmake)
SET(VTK_DIR ${VISIT_VTK_DIR}/lib)
# Add path to the directory that includes MangledMesa to the include
# directories.
GET_FILENAME_COMPONENT(MANGLEMESADIR ${VTK_DIR}/../../include ABSOLUTE)
SET(VTK_INCLUDE_DIRS ${VTK_INCLUDE_DIRS} ${MANGLEMESADIR})
MESSAGE(STATUS "Checking for VTK in ${VTK_DIR}")
INCLUDE(${CMAKE_ROOT}/Modules/FindVTK.cmake)
# Set the VisIt mangled mesa off of the VTK mangled mesa variable.
IF("${VTK_USE_MANGLED_MESA}" STREQUAL "ON")
MESSAGE(STATUS "VTK uses mangled mesa")
SET(VISIT_USE_MANGLED_MESA "ON" CACHE BOOL "Use mangled mesa in VisIt")
# Add path to the directory that includes MangledMesa to the include
# directories.
GET_FILENAME_COMPONENT(MANGLEMESADIR ${VTK_DIR}/../../include ABSOLUTE)
SET(VTK_INCLUDE_DIRS ${VTK_INCLUDE_DIRS} ${MANGLEMESADIR})
ENDIF("${VTK_USE_MANGLED_MESA}" STREQUAL "ON")
# Add install commands for all of the VTK libraries. Is there a better way?
......@@ -88,7 +97,6 @@ ENDIF(APPLE)
FOREACH(VTKLIB vtkCommon
vtkCommonPythonD
vtkDICOMParser
vtkFiltering
vtkFilteringPythonD
vtkGenericFiltering
......@@ -101,12 +109,10 @@ FOREACH(VTKLIB vtkCommon
vtkIOPythonD
vtkImaging
vtkImagingPythonD
vtkMPEG2Encode
vtkRendering
vtkRenderingPythonD
vtkVolumeRendering
vtkVolumeRenderingPythonD
vtkexpat
vtkfreetype
vtkftgl
vtkjpeg
......
......@@ -127,7 +127,7 @@ SET(VISIT_SLIVR @VISIT_SLIVR@)
SET(VISIT_TUVOK @VISIT_TUVOK@)
# Set up VTK
SET(VTK_INCLUDE_DIRS ${VISIT_INCLUDE_DIR}/vtk/include/vtk-5.0)
SET(VTK_INCLUDE_DIRS ${VISIT_INCLUDE_DIR}/vtk/include/vtk-5.6)
SET(VTK_LIBRARY_DIRS ${VISIT_LIBRARY_DIR})
# Set up Mesa
......
......@@ -508,7 +508,9 @@ ENDMACRO(VISIT_3RDPARTY_DEP libvar comment)
VISIT_3RDPARTY_VAR(VTK_DIR "Path containing the VTK library's bin and lib")
VISIT_3RDPARTY_VAR(QT_BIN "Path to the Qt library's bin (path containing qmake)")
VISIT_3RDPARTY_VAR(PYTHON_DIR "Path containing the Python library's include and lib")
VISIT_3RDPARTY_VAR(MESA_DIR "Path containing the Mesa library's include and lib")
IF (NOT WIN32)
VISIT_3RDPARTY_VAR(MESA_DIR "Path containing the Mesa library's include and lib")
ENDIF (NOT WIN32)
VISIT_3RDPARTY_VAR(ICET_DIR "Path containing the Ice-T library's include and lib")
VISIT_3RDPARTY_VAR(TCMALLOC_DIR "Path containing the tcmalloc library's include and lib")
......@@ -777,9 +779,9 @@ IF(NOT VISIT_DBIO_ONLY)
ENDIF(NOT VISIT_DBIO_ONLY)
# Configure Mesa support.
IF(NOT VISIT_DBIO_ONLY)
IF(NOT WIN32 AND NOT VISIT_DBIO_ONLY)
INCLUDE(${VISIT_SOURCE_DIR}/CMake/FindVisItMesa.cmake)
ENDIF(NOT VISIT_DBIO_ONLY)
ENDIF(NOT WIN32 AND NOT VISIT_DBIO_ONLY)
# Configure VTK support.
INCLUDE(${VISIT_SOURCE_DIR}/CMake/FindVisItVTK.cmake)
......@@ -1563,8 +1565,14 @@ IF(NOT VISIT_DISABLE_SELECT)
ENDIF(WIN32)
ENDIF(NOT VISIT_DISABLE_SELECT)
MESSAGE(STATUS "Setting VISIT_RENDERING_SIZE_LIMIT to ${OSMESA_SIZE_LIMIT}")
SET(VISIT_RENDERING_SIZE_LIMIT ${OSMESA_SIZE_LIMIT} CACHE INTERNAL "rendering size limit")
IF (NOT WIN32)
MESSAGE(STATUS "Setting VISIT_RENDERING_SIZE_LIMIT to ${OSMESA_SIZE_LIMIT}")
SET(VISIT_RENDERING_SIZE_LIMIT ${OSMESA_SIZE_LIMIT} CACHE INTERNAL "rendering size limit")
ELSE(NOT WIN32)
# totally arbitrary, but it is what Mesa was set to when built on Windows
MESSAGE(STATUS "Setting VISIT_RENDERING_SIZE_LIMIT to 16384")
SET(VISIT_RENDERING_SIZE_LIMIT 16384 CACHE INTERNAL "rendering size limit")
ENDIF(NOT WIN32)
CONFIGURE_FILE(${VISIT_SOURCE_DIR}/include/visit-cmake.h.in
${VISIT_BINARY_DIR}/include/visit-config.h @ONLY IMMEDIATE)
......
......@@ -2859,6 +2859,10 @@ avtGenericDatabase::GetLabelVariable(const char *varname, int ts, int domain,
// Handle curve objects that are the result of re-interpreting some 1D
// scalar variables by requesting them from the plugin as we would any
// other scalar variable (e.g. GetScalarVarDataset())
//
// Tom Fogal, Tue Sep 27 14:53:50 MDT 2011
// Ensure static VTK memory gets cleaned up.
//
// ****************************************************************************
vtkDataSet *
......@@ -2935,7 +2939,12 @@ avtGenericDatabase::GetMesh(const char *meshname, int ts, int domain,
// of trivial producers. Make one trivial producer for all
// data sets here.
//
static vtkTrivialProducer *tp = vtkTrivialProducer::New();
static vtkTrivialProducer* tp = NULL;
if(tp == NULL)
{
tp = vtkTrivialProducer::New();
vtkVisItUtility::RegisterStaticVTKObject(tp);
}
tp->SetOutput(mesh);
tp->SetOutput(NULL);
......
......@@ -43,6 +43,7 @@
#include <avtBinaryMathExpression.h>
#include <vtkCellData.h>
#include <vtkDataArray.h>
#include <vtkDataSet.h>
#include <vtkPointData.h>
......
......@@ -45,6 +45,7 @@
#include <math.h>
#include <float.h>
#include <vtkDataArray.h>
#include <vtkDataSet.h>
#include <vtkPointData.h>
#include <vtkRectilinearGrid.h>
......
......@@ -45,6 +45,7 @@
#include <math.h>
#include <vtkCellData.h>
#include <vtkDataArray.h>
#include <vtkDataSet.h>
#include <vtkPointData.h>
......
......@@ -169,6 +169,9 @@ avtVerdictExpression::~avtVerdictExpression()
// Jeremy Meredith, Thu Aug 7 14:30:46 EDT 2008
// Made string literal const char*, not char*.
//
// Dave Pugmire, Fri Jul 22 07:21:02 EDT 2011
// vtkIdType != int.
//
// ****************************************************************************
vtkDataArray *
......@@ -198,7 +201,7 @@ avtVerdictExpression::DeriveVariable(vtkDataSet *in_ds)
double coordinates[MAXPOINTS][3];
for (i = 0; i < nCells; i++)
{
vtkCell *cell = in_ds->GetCell(i);
vtkCell *cell = in_ds->GetCell((vtkIdType)i);
int numPointsForThisCell = cell->GetNumberOfPoints();
// Grab a pointer to the cell's points' underlying data array
......
......@@ -602,8 +602,7 @@ FixWraparounds(vtkDataSet *in_ds, int comp_idx)
int cellCnt = 0;
for (i = 0 ; i < ncells ; i++)
{
vtkIdType *ids;
int cellNPts;
vtkIdType *ids, cellNPts;
ugrid->GetCellPoints(i, cellNPts, ids);
bool closeToZero = false;
bool closeToTwoPi = false;
......
......@@ -190,7 +190,7 @@ avtFeatureEdgesFilter::ExecuteData(vtkDataSet *inDS, int, string)
outCD->CopyData(inCD, 0, i);
vtkCell *edge = cell->GetEdge(i);
vtkIdList *edge_ids = edge->GetPointIds();
int line[2];
vtkIdType line[2];
int origId0 = edge_ids->GetId(0);
int origId1 = edge_ids->GetId(1);
int newId0 = 0, newId1 = 0;
......
......@@ -90,6 +90,17 @@ avtICAlgorithm::avtICAlgorithm( avtPICSFilter *f ) :
picsFilter = f;
numDomains = picsFilter->numDomains;
numTimeSteps = picsFilter->numTimeSteps;
domainsUsed = 0;
totDomainsLoaded = 0;
domainLoadedMin = 0;
domainLoadedMax = 0;
globalDomainsUsed = 0;
globalTotDomainsLoaded = 0;
globalDomainLoadedMin = 0;
globalDomainLoadedMax = 0;
avgDomainLoaded = 0.f;
globalAvgDomainLoaded = 0.f;
}
// ****************************************************************************
......
......@@ -347,7 +347,7 @@ avtMassVoxelExtractor::SetGridsAreInWorldSpace(bool val, const avtViewInfo &v,
vtkCamera *cam = vtkCamera::New();
view.SetCameraFromView(cam);
cam->GetClippingRange(cur_clip_range);
vtkMatrix4x4 *mat = cam->GetCompositePerspectiveTransformMatrix(aspect,
vtkMatrix4x4 *mat = cam->GetCompositeProjectionTransformMatrix(aspect,
cur_clip_range[0], cur_clip_range[1]);
if (xform)
......
......@@ -997,7 +997,7 @@ avtXRayFilter::CartesianExecute(vtkDataSet *ds, int &nLinesPerDataset,
vtkIdType *nl = cells->GetPointer();
unsigned char *ct = cellTypes->GetPointer(0);
int *cl = cellLocations->GetPointer(0);
vtkIdType *cl = cellLocations->GetPointer(0);
for (i = 0 ; i < linesForThisPass ; i++)
{
......@@ -1037,7 +1037,7 @@ avtXRayFilter::CartesianExecute(vtkDataSet *ds, int &nLinesPerDataset,
int nInter = 0;
double inter[100];
int *ids = &(nl[cl[iCell]+1]);
vtkIdType *ids = &(nl[cl[iCell]+1]);
if (ct[iCell] == VTK_HEXAHEDRON)
{
double p0[3]={pts[ids[0]*3],pts[ids[0]*3+1],pts[ids[0]*3+2]};
......
......@@ -143,8 +143,8 @@ MIRConnectivity::SetUpConnectivity(vtkDataSet *ds)
int cell_idx = 0;
cellindex = new int[ncells];
celltype = new int[ncells];
connectivity = new int[9*ncells];
int *c = connectivity;
connectivity = new vtkIdType[9*ncells];
vtkIdType *c = connectivity;
for (int k = 0 ; k < nz ; k++)
{
int zOff = k*(nx+1)*(ny+1);
......@@ -192,8 +192,8 @@ MIRConnectivity::SetUpConnectivity(vtkDataSet *ds)
int cell_idx = 0;
cellindex = new int[ncells];
celltype = new int[ncells];
connectivity = new int[5*ncells];
int *c = connectivity;
connectivity = new vtkIdType[5*ncells];
vtkIdType *c = connectivity;
for (int j = 0 ; j < ny ; j++)
{
int yOff = j*(nx+1);
......@@ -229,9 +229,9 @@ MIRConnectivity::SetUpConnectivity(vtkDataSet *ds)
vtkCellArray *ca = ug->GetCells();
ncells = ca->GetNumberOfCells();
int buff_size = ca->GetSize();
connectivity = new int[buff_size];
connectivity = new vtkIdType[buff_size];
vtkIdType *ptr = ca->GetPointer();
memcpy(connectivity, ptr, buff_size*sizeof(int));
memcpy(connectivity, ptr, buff_size*sizeof(vtkIdType));
debug5 << "Setting up connectivity array for " << ncells
<< " (unstructured grid)." << endl;
......
......@@ -38,6 +38,7 @@
#ifndef MIR_CONNECTIVITY
#define MIR_CONNECTIVITY
#include <vtkType.h>
class vtkDataSet;
......@@ -57,7 +58,7 @@ class vtkDataSet;
// ****************************************************************************
struct MIRConnectivity
{
int *connectivity;
vtkIdType *connectivity;
int ncells;
int *celltype;
int *cellindex;
......
/*****************************************************************************
*
* Copyright (c) 2000 - 2008, Lawrence Livermore National Security, LLC
* Copyright (c) 2000 - 2011, Lawrence Livermore National Security, LLC
* Produced at the Lawrence Livermore National Laboratory
* LLNL-CODE-400142
* All rights reserved.
......@@ -543,7 +543,7 @@ DiscreteMIR::ReconstructMesh(vtkDataSet *mesh_orig, avtMaterial *mat_orig, int d
// cleanish. Cleanish cells are non-mixed cells incident to mixed
// cells. They'll need some special handling to connect with
// mixed cells.
int *conn_ptr = conn.connectivity;
vtkIdType *conn_ptr = conn.connectivity;
zonesList.reserve(nCells);
for(int k = 0; k < dimensions[2]; ++k)
for(int j = 0; j < dimensions[1]; ++j)
......@@ -553,7 +553,7 @@ DiscreteMIR::ReconstructMesh(vtkDataSet *mesh_orig, avtMaterial *mat_orig, int d
int cellid = id(cell);
int nIds = *conn_ptr;
const int *ids = conn_ptr+1;
const vtkIdType *ids = conn_ptr+1;
conn_ptr += nIds+1;
......@@ -1443,7 +1443,7 @@ DiscreteMIR::GetDataset(std::vector<int> mats, vtkDataSet *ds,
vtkIdTypeArray *cellLocations = vtkIdTypeArray::New();
cellLocations->SetNumberOfValues(ncells);
int *cl = cellLocations->GetPointer(0);
vtkIdType *cl = cellLocations->GetPointer(0);
int offset = 0;
for (int i=0; i<ncells; i++)
......@@ -1454,7 +1454,7 @@ DiscreteMIR::GetDataset(std::vector<int> mats, vtkDataSet *ds,
const int nnodes = zonesList[c].nnodes;
*nl++ = nnodes;
const int *indices = &indexList[zonesList[c].startindex];
const vtkIdType *indices = &indexList[zonesList[c].startindex];
for (int j=0; j<nnodes; j++)
*nl++ = indices[j];
......@@ -1678,12 +1678,12 @@ DiscreteMIR::ReconstructCleanMesh(vtkDataSet *mesh, avtMaterial *mat)
// extract cells
int nCells = conn.ncells;
const int *matlist = mat->GetMatlist();
int *conn_ptr = conn.connectivity;
vtkIdType *conn_ptr = conn.connectivity;
zonesList.resize(nCells);
for (int c=0; c<nCells; c++)
{
int nIds = *conn_ptr;
const int *ids = conn_ptr+1;
int nIds = (int)*conn_ptr;
const vtkIdType *ids = conn_ptr+1;
ReconstructedZone &zone = zonesList[c];
zone.origzone = c;
......
......@@ -41,6 +41,7 @@
#include <mir_exports.h>
#include <limits.h>
#include <vtkType.h>
// ****************************************************************************
// Class: Edge
......@@ -58,12 +59,12 @@ class MIR_API Edge
{
public:
Edge();
Edge(int *);
Edge(vtkIdType *);
void operator=(const Edge &rhs);
bool operator==(const Edge &rhs);
static unsigned int HashFunction(Edge &edge);
private:
int a,b;
vtkIdType a,b;
};
......@@ -105,14 +106,14 @@ Edge::Edge()
//
// ****************************************************************************
inline
Edge::Edge(int *edges)
Edge::Edge(vtkIdType *edges)
{
a = INT_MAX;
b = INT_MAX;
for (int i=0; i<2; i++)
{
int node = edges[i];
vtkIdType node = edges[i];
if (node < a) { b=a; a=node; }
else if (node < b) { b=node; }
}
......
This diff is collapsed.
......@@ -227,35 +227,35 @@ class MIR_API TetMIR : public MIR
std::vector<int> mapUsedMatToMat;
// These are the helper functions and supporting data structures
void ReconstructCleanCell(int, int, int, const int *, int);
void ReconstructCleanCell(int, int, int, const vtkIdType *, int);
bool ReconstructCleanMesh(vtkDataSet *, avtMaterial *, MIRConnectivity &);
void ReconstructTet(int, int, const int *, const MaterialTetrahedron &,
void ReconstructTet(int, int, const vtkIdType *, const MaterialTetrahedron &,
const std::vector<float>&, int *, int);
void ReconstructCleanTet(int, int, int, const int *,
void ReconstructCleanTet(int, int, int, const vtkIdType *,
const MaterialTetrahedron &);
void ReconstructTri(int, int, const int *, const MaterialTriangle &,
void ReconstructTri(int, int, const vtkIdType *, const MaterialTriangle &,
const std::vector<float>&, int *, int);
void ReconstructCleanTri(int, int, int, const int *,
void ReconstructCleanTri(int, int, int, const vtkIdType *,
const MaterialTriangle &);
void IndexTetNode(Tet::Node&, int, int, const int *,
void IndexTetNode(Tet::Node&, int, int, const vtkIdType *,
const MaterialTetrahedron&);
void IndexTriNode(Tri::Node&, int, int, const int *,
void IndexTriNode(Tri::Node&, int, int, const vtkIdType *,
const MaterialTriangle&);
void MergeWedges(TetList&, WedgeList&, int, int, const int *,
void MergeWedges(TetList&, WedgeList&, int, int, const vtkIdType *,
const MaterialTetrahedron&,
const Wedge&, const Wedge&, int forcedMat);
void MergeTets(TetList&, WedgeList&, int, int, const int *,
void MergeTets(TetList&, WedgeList&, int, int, const vtkIdType *,
const MaterialTetrahedron&,
const Tet&, const Tet&, int forcedMat);
void MergeTetsHelper(TetList&, WedgeList&, int, int, const int *,
void MergeTetsHelper(TetList&, WedgeList&, int, int, const vtkIdType *,
const MaterialTetrahedron&,
int*, const Tet&, const Tet&, int forcedMat);
void MergeTris(TriList&, int, int, const int *, const MaterialTriangle&,
void MergeTris(TriList&, int, int, const vtkIdType *, const MaterialTriangle&,
const Tri&, const Tri&, int forcedMat);
void MergeTrisHelper(TriList&, int, int, const int *,
void MergeTrisHelper(TriList&, int, int, const vtkIdType *,
const MaterialTriangle&,
int*, const Tri&, const Tri&, int forcedMat);
};
......
......@@ -91,7 +91,7 @@ Tetrahedralizer::Tetrahedralizer(int nmat_)
//
// ****************************************************************************
int
Tetrahedralizer::GetLowTetNodesForTet(int nnodes,const int *nodes, int *tetnodes)
Tetrahedralizer::GetLowTetNodesForTet(int nnodes,const vtkIdType *nodes, vtkIdType *tetnodes)
{
int ntet = 1;
tetnodes[0] = 0;
......@@ -135,7 +135,7 @@ Tetrahedralizer::GetLowTetNodesForTet(int nnodes,const int *nodes, int *tetnodes
//
// ****************************************************************************
int
Tetrahedralizer::GetLowTetNodesForVox(int nnodes,const int *nodes, int *tetnodes)
Tetrahedralizer::GetLowTetNodesForVox(int nnodes,const vtkIdType *nodes, vtkIdType *tetnodes)
{
int n;
......@@ -237,7 +237,7 @@ Tetrahedralizer::GetLowTetNodesForVox(int nnodes,const int *nodes, int *tetnodes
//
// ****************************************************************************
int
Tetrahedralizer::GetLowTetNodesForHex(int nnodes,const int *nodes, int *tetnodes)
Tetrahedralizer::GetLowTetNodesForHex(int nnodes,const vtkIdType *nodes, vtkIdType *tetnodes)
{
int n;
......@@ -335,7 +335,7 @@ Tetrahedralizer::GetLowTetNodesForHex(int nnodes,const int *nodes, int *tetnodes
//
// ****************************************************************************
int
Tetrahedralizer::GetLowTetNodesForWdg(int nnodes,const int *nodes, int *tetnodes)
Tetrahedralizer::GetLowTetNodesForWdg(int nnodes,const vtkIdType *nodes, vtkIdType *tetnodes)
{
int n;
......@@ -426,12 +426,12 @@ Tetrahedralizer::GetLowTetNodesForWdg(int nnodes,const int *nodes, int *tetnodes
//
// ****************************************************************************
int
Tetrahedralizer::GetLowTetNodesForPyr(int nnodes,const int *nodes, int *tetnodes)
Tetrahedralizer::GetLowTetNodesForPyr(int nnodes,const vtkIdType *nodes, vtkIdType *tetnodes)
{
int n;
// find the node with the lowest index
int minv = nodes[0];
vtkIdType minv = nodes[0];
int minn = 0;
for (n=1; n<nnodes; n++)
{
......@@ -665,7 +665,7 @@ Tetrahedralizer::fill_tets_low()
// ****************************************************************************
void
Tetrahedralizer::Tetrahedralize(MIROptions::SubdivisionLevel s, int celltype,
int npts, const int *c_ptr,
int npts, const vtkIdType *c_ptr,
vector<float> vf_zone_,
vector<float> *vf_node_,
vector<float> *vf_face_,
......
......@@ -43,6 +43,7 @@
#include <vector>
#include <MIROptions.h>
#include "MaterialTetrahedron.h"
#include <vtkType.h>
// ****************************************************************************
......@@ -76,7 +77,7 @@ class MIR_API Tetrahedralizer
{
public:
Tetrahedralizer(int nmat_);
void Tetrahedralize(MIROptions::SubdivisionLevel, int, int, const int *,
void Tetrahedralize(MIROptions::SubdivisionLevel, int, int, const vtkIdType *,
std::vector<float>,
std::vector<float>*,
std::vector<float>*,
......@@ -86,11 +87,11 @@ class MIR_API Tetrahedralizer
MaterialTetrahedron &GetTet(int t) {return tet[t];}
public:
static int GetLowTetNodesForTet(int, const int *, int *);
static int GetLowTetNodesForHex(int, const int *, int *);
static int GetLowTetNodesForWdg(int, const int *, int *);
static int GetLowTetNodesForPyr(int, const int *, int *);
static int GetLowTetNodesForVox(int, const int *, int *);
static int GetLowTetNodesForTet(int, const vtkIdType *, vtkIdType *);
static int GetLowTetNodesForHex(int, const vtkIdType *, vtkIdType *);
static int GetLowTetNodesForWdg(int, const vtkIdType *, vtkIdType *);
static int GetLowTetNodesForPyr(int, const vtkIdType *, vtkIdType *);
static int GetLowTetNodesForVox(int, const vtkIdType *, vtkIdType *);
private:
void calc_hex_low();
......@@ -103,7 +104,7 @@ class MIR_API Tetrahedralizer
private:
int subdiv;
int nnodes;
const int *nodes;
const vtkIdType *nodes;
int nmat;
std::vector<float> vf_zone;
......@@ -114,7 +115,7 @@ class MIR_API Tetrahedralizer
int ntet;
MaterialTetrahedron tet[MAX_TETS_PER_CELL];
int tetnodes_low[4*MAX_TETS_PER_CELL];
vtkIdType tetnodes_low[4*MAX_TETS_PER_CELL];
};
#endif
......@@ -291,7 +291,7 @@ Triangulator::calc_poly_high()
// ****************************************************************************
void
Triangulator::Triangulate(MIROptions::SubdivisionLevel s, int ct, int np,
const int *cptr,
const vtkIdType *cptr,
vector<float> vf_zone_,
vector<float> *vf_node_,
vector<float> *vf_edge_)
......
......@@ -43,6 +43,7 @@
#include <vector>
#include <MIROptions.h>