Commit 1f18a0f9 authored by Mark OLESEN's avatar Mark OLESEN
Browse files

ENH: replace internal meshmaps with foamVtkMeshMaps

parent 2f288cfb
......@@ -12,6 +12,7 @@ link_directories(
include_directories(
$ENV{WM_PROJECT_DIR}/src/OpenFOAM/lnInclude
$ENV{WM_PROJECT_DIR}/src/OSspecific/$ENV{WM_OSTYPE}/lnInclude
$ENV{WM_PROJECT_DIR}/src/conversion/lnInclude
$ENV{WM_PROJECT_DIR}/src/finiteVolume/lnInclude
${PROJECT_SOURCE_DIR}/../vtkPVFoam
${PROJECT_SOURCE_DIR}/../../foamPv/lnInclude
......@@ -64,6 +65,7 @@ target_link_libraries(
LINK_PUBLIC
vtkPVFoam-pv${PARAVIEW_VERSION_MAJOR}.${PARAVIEW_VERSION_MINOR}
foamPv-pv${PARAVIEW_VERSION_MAJOR}.${PARAVIEW_VERSION_MINOR}
conversion
finiteVolume
OpenFOAM
)
......
......@@ -54,6 +54,7 @@ SourceFiles
#include "PrimitivePatchInterpolation.H"
#include "volPointInterpolation.H"
#include "foamPvCore.H"
#include "foamVtkMeshMaps.H"
#include "vtkSmartPointer.h"
#include "vtkPolyData.h"
......@@ -103,66 +104,6 @@ class vtkPVFoam
// Private classes
//- Bookkeeping for polyhedral cell decomposition
// hide in extra pointMap (cellSet/cellZone) for now
class polyDecomp
{
labelList cellMap_;
labelList pointMap_;
labelList additionalIds_;
public:
polyDecomp()
{}
//- Label of original cell for decomposed cells
labelList& cellMap()
{
return cellMap_;
}
//- Label of original cell for decomposed cells
const labelList& cellMap() const
{
return cellMap_;
}
//- Point labels for subsetted meshes
labelList& pointMap()
{
return pointMap_;
}
//- Point labels for subsetted meshes
const labelList& pointMap() const
{
return pointMap_;
}
//- Cell-centre labels for additional points of decomposed cells
labelList& additionalIds()
{
return additionalIds_;
}
//- Cell-centre labels for additional points of decomposed cells
const labelList& additionalIds() const
{
return additionalIds_;
}
//- Clear
void clear()
{
cellMap_.clear();
pointMap_.clear();
additionalIds_.clear();
}
};
//- Bookkeeping for vtkPolyData
class foamVtpData
{
......@@ -170,8 +111,9 @@ class vtkPVFoam
vtkSmartPointer<vtkPolyData> vtkmesh;
};
//- Bookkeeping for vtkUnstructuredGrid
class foamVtuData : public polyDecomp
class foamVtuData : public foamVtkMeshMaps
{
public:
vtkSmartPointer<vtkUnstructuredGrid> vtkmesh;
......
Supports Markdown
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