Commit 01e9e210 authored by George Zagaris's avatar George Zagaris
Browse files

ENH: Use vtkOverlappingAMR

Updated class to use vtkOverlappingAMR instead of vtkHierarchicalBoxDataSet.

Change-Id: Ib1fa7e4f6dcb43631723660bd8bad8763db4dc69
parent a56b46ae
......@@ -18,7 +18,7 @@
#include "vtkInformationVector.h"
#include "vtkIndent.h"
#include "vtkMultiProcessController.h"
#include "vtkHierarchicalBoxDataSet.h"
#include "vtkOverlappingAMR.h"
#include "vtkUniformGrid.h"
#include "vtkMultiBlockDataSet.h"
......@@ -50,7 +50,7 @@ int vtkAMRToMultiBlockFilter::FillInputPortInformation(
{
assert( "pre: information object is NULL!" && (info != NULL) );
info->Set(
vtkAlgorithm::INPUT_REQUIRED_DATA_TYPE(),"vtkHierarchicalBoxDataSet");
vtkAlgorithm::INPUT_REQUIRED_DATA_TYPE(),"vtkOverlappingAMR");
return 1;
}
......@@ -65,7 +65,7 @@ int vtkAMRToMultiBlockFilter::FillOutputPortInformation(
//------------------------------------------------------------------------------
void vtkAMRToMultiBlockFilter::CopyAMRToMultiBlock(
vtkHierarchicalBoxDataSet *amr, vtkMultiBlockDataSet *mbds )
vtkOverlappingAMR *amr, vtkMultiBlockDataSet *mbds )
{
assert( "pre: input AMR dataset is NULL" && (amr != NULL) );
assert( "pre: output multi-block dataset is NULL" && (mbds != NULL) );
......@@ -103,8 +103,8 @@ int vtkAMRToMultiBlockFilter::RequestData(
// STEP 0: Get input object
vtkInformation *input = inputVector[0]->GetInformationObject( 0 );
assert( "pre: input information object is NULL" && (input != NULL) );
vtkHierarchicalBoxDataSet *amrds=
vtkHierarchicalBoxDataSet::SafeDownCast(
vtkOverlappingAMR *amrds=
vtkOverlappingAMR::SafeDownCast(
input->Get( vtkDataObject::DATA_OBJECT( ) ) );
assert( "pre: input data-structure is NULL" && (amrds != NULL) );
......
......@@ -19,7 +19,7 @@
// vtkMultiBlockDataset as output.
//
// .SECTION See Also
// vtkHierarchicalBoxDataset vtkMultiBlockDataSet
// vtkOverlappingAMR vtkMultiBlockDataSet
#ifndef VTKAMRTOMULTIBLOCKFILTER_H_
#define VTKAMRTOMULTIBLOCKFILTER_H_
......@@ -30,7 +30,7 @@ class vtkInformation;
class vtkInformationVector;
class vtkIndent;
class vtkMultiProcessController;
class vtkHierarchicalBoxDataSet;
class vtkOverlappingAMR;
class vtkMultiBlockDataSet;
class VTK_AMR_EXPORT vtkAMRToMultiBlockFilter :
......@@ -61,7 +61,7 @@ class VTK_AMR_EXPORT vtkAMRToMultiBlockFilter :
// Description:
// Copies the AMR data to the output multi-block datastructure.
void CopyAMRToMultiBlock(
vtkHierarchicalBoxDataSet *amr, vtkMultiBlockDataSet *mbds);
vtkOverlappingAMR *amr, vtkMultiBlockDataSet *mbds);
vtkMultiProcessController *Controller;
private:
......
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