Commit 05e8cf90 authored by George Zagaris's avatar George Zagaris
Browse files

COMP: Resolve linking issues

Resolve some linking issues related
to undefined reference to vtable.
parent c41e8519
......@@ -10,7 +10,7 @@ SET(KIT_INTERFACE_LIBRARIES vtkCommon)
FILE( GLOB Kit_SRCS *.cxx )
## Set the libraries required by this kit
SET(KIT_LIBS vtkParallel vtkCommon vtkFiltering)
SET(KIT_LIBS vtkParallel vtkCommon vtkFiltering ${VTK_HDF5_LIBRARIES})
SET_SOURCE_FILES_PROPERTIES(
vtkAMRBaseReader
......
......@@ -27,8 +27,7 @@
vtkAMRBaseReader::vtkAMRBaseReader()
{
this->MaxLevel = 0; // By default load just the low-res data at level 0
this->Controller = NULL;
}
//------------------------------------------------------------------------------
......@@ -66,8 +65,8 @@ void vtkAMRBaseReader::Initialize()
this->CellDataArraySelection = vtkDataArraySelection::New();
this->PointDataArraySelection = vtkDataArraySelection::New();
this->SelectionObserver = vtkCallbackCommand::New();
this->SelectionObserver->SetCallback(
&vtkAMRBaseReader::SelectionModifiedCallback);
// this->SelectionObserver->SetCallback(
// &vtkAMRBaseReader::SelectionModifiedCallback);
this->SelectionObserver->SetClientData( this );
this->CellDataArraySelection->AddObserver(
vtkCommand::ModifiedEvent,this->SelectionObserver );
......@@ -77,11 +76,11 @@ void vtkAMRBaseReader::Initialize()
}
//----------------------------------------------------------------------------
void vtkAMRBaseReader::SelectionModifiedCallback(
vtkObject*, unsigned long, void* clientdata, void*)
{
static_cast<vtkAMRBaseReader*>(clientdata)->Modified();
}
//void vtkAMRBaseReader::SelectionModifiedCallback(
// vtkObject*, unsigned long, void* clientdata, void*)
//{
// static_cast<vtkAMRBaseReader*>(clientdata)->Modified();
//}
//------------------------------------------------------------------------------
int vtkAMRBaseReader::GetNumberOfPointArrays()
......
......@@ -21,7 +21,7 @@
#define VTKAMRBASEREADER_H_
#include "vtkHierarchicalBoxDataSetAlgorithm.h"
#include <vtkstd/vector> // STL Header
#include <vtkstd/vector> // STL vector Header
// Forward Declarations
class vtkHierarchicalBoxDataSet;
......@@ -34,7 +34,7 @@ class VTK_AMR_EXPORT vtkAMRBaseReader :
{
public:
vtkTypeMacro( vtkAMRBaseReader, vtkHierarchicalBoxDataSetAlgorithm );
void PrintSelf(std::ostream &os, vtkIndent indent);
virtual void PrintSelf(std::ostream &os, vtkIndent indent);
// Description:
// Initializes the AMR reader.
......@@ -86,7 +86,7 @@ class VTK_AMR_EXPORT vtkAMRBaseReader :
// Set/Get the filename. Concrete instances of this class must implement
// the SetFileName method accordingly.
vtkGetStringMacro( FileName );
virtual void SetFileName()=0;
virtual void SetFileName( const char *fileName ) = 0;
protected:
vtkAMRBaseReader();
......@@ -108,7 +108,7 @@ class VTK_AMR_EXPORT vtkAMRBaseReader :
// Description:
// Reads all the metadata from the file. Implemented by concrete classes.
virtual void ReadMetaData()=0;
virtual void ReadMetaData() = 0;
// Description:
// Generates a linear index for each block. Implemented by concrete
......@@ -126,20 +126,24 @@ class VTK_AMR_EXPORT vtkAMRBaseReader :
// }
// }
//</code>
virtual void GenerateBlockMap()=0;
virtual void GenerateBlockMap() = 0;
// Description:
// Returns the block level for the given block
virtual int GetBlockLevel( const int blockIdx ) = 0;
// Description:
// Returns the total number of blocks. Implemented by concrete instances.
virtual int GetNumberOfBlocks()=0;
virtual int GetNumberOfBlocks() = 0;
// Description:
// Returns the total number of levels. Implemented by concrete instances.
virtual int GetNumberOfLevels()=0;
virtual int GetNumberOfLevels() = 0;
// Description:
// Loads the block according to the index w.r.t. the generated BlockMap.
virtual void GetBlock( int index, vtkHierarchicalBoxDataSet *hbds,
vtkstd::vector< int > &idxcounter )=0;
vtkstd::vector< int > &idxcounter ) = 0;
// Description:
// Standard Pipeline methods, subclasses may override this method if needed.
......@@ -156,12 +160,12 @@ class VTK_AMR_EXPORT vtkAMRBaseReader :
// Description:
// Initializes the PointDataArraySelection & CellDataArraySelection
virtual void SetUpDataArraySelections()=0;
virtual void SetUpDataArraySelections() = 0;
// Descriptions
// Call-back registered with the SelectionObserver.
static void SelectionModifiedCallback(
vtkObject *caller,unsigned long eid,void *clientdata,void *calldata );
// static void SelectionModifiedCallback(
// vtkObject *caller,unsigned long eid,void *clientdata,void *calldata );
int LoadParticles;
int MaxLevel;
......
This diff is collapsed.
......@@ -24,7 +24,9 @@
#include "vtkAMRBaseReader.h"
#include <vtkstd/vector> // STL vector Header
class vtkEnzoReaderInternal;
//class vtkEnzoReaderInternal;
class vtkHierarchicalBoxDataSet;
class vtkCallbackCommand;
class VTK_AMR_EXPORT vtkAMREnzoReader : public vtkAMRBaseReader
{
......@@ -51,13 +53,17 @@ class VTK_AMR_EXPORT vtkAMREnzoReader : public vtkAMRBaseReader
vtkstd::vector< int > &idxcounter );
// Description:
// See vtkAMRBaseReader::GetBlock
// See vtkAMRBaseReader::ReadMetaData
void ReadMetaData();
// Description:
// See vtkAMRBaseReader::GenerateBlockMap
void GenerateBlockMap();
// Description:
// See vtkAMRBaseReader::GetBlockLevel
int GetBlockLevel( const int blockIdx );
// Description:
// See vtkAMRBaseReader::GetNumberOfBlocks
int GetNumberOfBlocks();
......@@ -66,8 +72,14 @@ class VTK_AMR_EXPORT vtkAMREnzoReader : public vtkAMRBaseReader
// See vtkAMRBaseReader::GetNumberOfBlocks
int GetNumberOfLevels();
private:
vtkEnzoReaderInternal *Internal;
// Description:
// TODO:
static void SelectionModifiedCallback(
vtkObject *caller,unsigned long eid,void *clientdata,void *calldata );
// vtkEnzoReaderInternal *Internal;
private:
vtkAMREnzoReader( const vtkAMREnzoReader& ); // Not Implemented
void operator=(const vtkAMREnzoReader& ); // Not Implemented
};
......
......@@ -21,6 +21,7 @@
#include <cassert>
#include <mpi.h>
#include "vtkAMRBaseReader.h"
#include "vtkUniformGrid.h"
#include "vtkDataArray.h"
#include "vtkDoubleArray.h"
......
......@@ -40,6 +40,7 @@ TARGET_LINK_LIBRARIES( AMRDataTransferPipeline
vtkAMR
vtkParallel
${MPI_LIBRARIES}
${VTK_HDF5_LIBRARIES}
)
## Add AMRDualExtractor executable
......@@ -52,6 +53,7 @@ TARGET_LINK_LIBRARIES( AMRDualExtractor
vtkAMR
vtkParallel
${MPI_LIBRARIES}
${VTK_HDF5_LIBRARIES}
)
## Add AMRHomogenization
......@@ -64,6 +66,7 @@ TARGET_LINK_LIBRARIES( AMRHomogenization
vtkAMR
vtkParallel
${MPI_LIBRARIES}
${VTK_HDF5_LIBRARIES}
)
## Add Generate3DAMRDataSetWithPulse executable
......@@ -76,6 +79,7 @@ TARGET_LINK_LIBRARIES( Generate3DAMRDataSetWithPulse
vtkAMR
vtkParallel
${MPI_LIBRARIES}
${VTK_HDF5_LIBRARIES}
)
## Add Generate3DAMRDataSetWithPulse executable
......@@ -88,6 +92,7 @@ TARGET_LINK_LIBRARIES( Generate2DAMRDataSetWithPulse
vtkAMR
vtkParallel
${MPI_LIBRARIES}
${VTK_HDF5_LIBRARIES}
)
## Add TestAMRProbe executable
......@@ -100,6 +105,7 @@ TARGET_LINK_LIBRARIES( TestAMRProbe
vtkAMR
vtkParallel
${MPI_LIBRARIES}
${VTK_HDF5_LIBRARIES}
)
## Add TestImageDataToStructuredGridFilter
......
Markdown is supported
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