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

Merge branch 'AMR-Refactoring' of...

Merge branch 'AMR-Refactoring' of kwsource.kitwarein.com:~gzagaris/vtk/gzagaris-vtk into AMR-Refactoring
parents 4e141ca0 70da6e34
......@@ -1004,7 +1004,7 @@ void vtkEnzoReaderInternal::ReadBlockStructures()
theStr = "";
int tmpInt;
char tmpChr;
while ( ( tmpChr = stream.get() ) != '[' );
while ( ( tmpChr = stream.get() ) != '[' ) ;
while ( ( tmpChr = stream.get() ) != ']' ) theStr += tmpChr;
int blkIdx = atoi( theStr.c_str() );
......@@ -1562,8 +1562,9 @@ void vtkAMREnzoReader::GetBlock(
this->Internal->ReadMetaData();
int blockIdx = this->BlockMap[ index ];
int N = this->Internal->Blocks.size();
assert( "block index out-of-bounds!" &&
(blockIdx+1 >= 0) && (blockIdx+1 < this->Internal->Blocks.size() ) );
(blockIdx+1 >= 0) && (blockIdx+1 < N ) );
// this->Internal->Blocks includes a pseudo block --- the root as block #0
vtkEnzoReaderBlock &theBlock = this->Internal->Blocks[ blockIdx+1 ];
......
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