Commit ca94d84b authored by George Zagaris's avatar George Zagaris
Browse files

COMP: Updated to reflect API changes

Made changes to reflect API changes in
vtkAMRGridIndexEncoder.
parent a729c3d6
......@@ -180,7 +180,7 @@ void vtkAMRGhostExchange::WriteReceivers( )
{
int level = -1;
int idx = -1;
vtkAMRGridIndexEncoder::decode( it->first,level,idx );
vtkAMRGridIndexEncoder::Decode( it->first,level,idx );
oss.str( "" ); oss.clear();
oss << "Receivers_" << level << "_" << idx << ".vtk";
......@@ -256,7 +256,7 @@ void vtkAMRGhostExchange::GetReceivers( )
vtkUniformGrid *gridPtr = this->ExtrudedData->GetDataSet(level,idx);
if( gridPtr != NULL )
{
unsigned int gridIdx = vtkAMRGridIndexEncoder::encode(level,idx);
unsigned int gridIdx = vtkAMRGridIndexEncoder::Encode(level,idx);
if(this->ReceiverList.find( gridIdx )!=this->ReceiverList.end())
{
this->ReceiverList[ gridIdx ]->Delete();
......@@ -353,7 +353,7 @@ void vtkAMRGhostExchange::FindDonors(
return;
unsigned int encodedDonorGridIdx=
vtkAMRGridIndexEncoder::encode( donorGridLevel, donorBlockIdx );
vtkAMRGridIndexEncoder::Encode( donorGridLevel, donorBlockIdx );
vtkUniformGrid *ug=
this->AMRDataSet->GetDataSet( donorGridLevel,donorBlockIdx );
......@@ -431,7 +431,7 @@ void vtkAMRGhostExchange::LocalDonorSearch()
unsigned int idx= cons->GetValue( con );
int level = -1;
int blockIdx = -1;
vtkAMRGridIndexEncoder::decode(idx,level,blockIdx);
vtkAMRGridIndexEncoder::Decode(idx,level,blockIdx);
int nCons=this->LocalConnectivity->GetNumberOfConnections(blockIdx,level);
for( int i=0; i < nCons; ++i )
......@@ -461,7 +461,7 @@ void vtkAMRGhostExchange::LocalDataTransfer()
int receiverLevel = -1;
int receiverBlockIdx = -1;
vtkAMRGridIndexEncoder::decode( rIdx,receiverLevel,receiverBlockIdx );
vtkAMRGridIndexEncoder::Decode( rIdx,receiverLevel,receiverBlockIdx );
vtkUniformGrid *receiverGrid=
this->ExtrudedData->GetDataSet(receiverLevel,receiverBlockIdx);
......@@ -524,7 +524,7 @@ void vtkAMRGhostExchange::LocalDataTransfer()
int donorGridLevel = -1;
int donorGridBlockIdx = -1;
vtkAMRGridIndexEncoder::decode(
vtkAMRGridIndexEncoder::Decode(
donorGridIdx,donorGridLevel,donorGridBlockIdx);
assert( "post: donor grid level mismatch!" &&
......@@ -625,7 +625,7 @@ void vtkAMRGhostExchange::CheckOwnershipAtSameLevel(
int donorGridBlock = -1;
int donorLevel = -1;
vtkAMRGridIndexEncoder::decode(
vtkAMRGridIndexEncoder::Decode(
donorGridInfo->GetValue(cellIdx),donorLevel,donorGridBlock );
assert("post: level mismatch" && (donorLevel==level) );
......
......@@ -49,7 +49,7 @@ void vtkAMRInterBlockConnectivity::PrintSelf(
unsigned int idx = iter->first;
int level = -1;
int block = -1;
vtkAMRGridIndexEncoder::decode( idx, level, block );
vtkAMRGridIndexEncoder::Decode( idx, level, block );
vtkAssertUtils::assertTrue( (level>=0),__FILE__,__LINE__ );
vtkAssertUtils::assertTrue( (block>=0),__FILE__,__LINE__ );
......@@ -75,7 +75,7 @@ void vtkAMRInterBlockConnectivity::InsertConnection(
const int connectingBlockIdx, const int connectingBlockLevel,
const int connectingBlockProcess )
{
unsigned int idx = vtkAMRGridIndexEncoder::encode( myLevelId, myBlockId );
unsigned int idx = vtkAMRGridIndexEncoder::Encode( myLevelId, myBlockId );
if( this->HasBlockConnections( idx ) )
{
this->connectivity[ idx ].push_back(
......@@ -99,7 +99,7 @@ void vtkAMRInterBlockConnectivity::InsertConnection(
int vtkAMRInterBlockConnectivity::GetNumberOfConnections(
const int myBlockId, const int myLevelId )
{
unsigned int idx = vtkAMRGridIndexEncoder::encode( myLevelId, myBlockId );
unsigned int idx = vtkAMRGridIndexEncoder::Encode( myLevelId, myBlockId );
return( this->GetNumberOfConnections( idx ) );
}
......@@ -115,7 +115,7 @@ int vtkAMRInterBlockConnectivity::GetNumberOfConnections(const unsigned int idx)
bool vtkAMRInterBlockConnectivity::HasBlockConnections(
const int myBlockId, const int myLevelId )
{
unsigned int idx = vtkAMRGridIndexEncoder::encode( myLevelId, myBlockId );
unsigned int idx = vtkAMRGridIndexEncoder::Encode( myLevelId, myBlockId );
if( this->HasBlockConnections( idx ) )
return true;
return false;
......@@ -155,7 +155,7 @@ vtkUnsignedIntArray* vtkAMRInterBlockConnectivity::GetEncodedGridKeys()
vtkAMRLink vtkAMRInterBlockConnectivity::GetConnection(
const int myBlockId, const int myLevelId, const int idx )
{
unsigned int blockidx=vtkAMRGridIndexEncoder::encode( myLevelId, myBlockId );
unsigned int blockidx=vtkAMRGridIndexEncoder::Encode( myLevelId, myBlockId );
return( this->GetConnection(blockidx,idx));
}
......
......@@ -128,7 +128,7 @@ void vtkAMRProbeFilter::ExtractAMRBlocks(
unsigned int gridIdx = *iter;
int blockId = -1;
int levelId = -1;
vtkAMRGridIndexEncoder::decode( gridIdx, levelId, blockId );
vtkAMRGridIndexEncoder::Decode( gridIdx, levelId, blockId );
assert( "level index out-of-bounds" &&
( (levelId >= 0) && ( levelId < amrds->GetNumberOfLevels())));
assert( "block index out-of-bounds" &&
......@@ -198,7 +198,7 @@ void vtkAMRProbeFilter::ProbeAMR(
int level = static_cast< int >( currentLevel );
unsigned int grididx =
vtkAMRGridIndexEncoder::encode(level,blockId);
vtkAMRGridIndexEncoder::Encode(level,blockId);
blocksToExtract.insert( grididx );
isBlockFound = true;
break;
......
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