Commit ff027726 authored by Kenneth Moreland's avatar Kenneth Moreland
Browse files

BUG: Fast path for reading temporal cell arrays had an off by one index error.

parent 0c6850b3
......@@ -724,7 +724,7 @@ private:
};
vtkStandardNewMacro(vtkExodusIIXMLParser);
vtkCxxRevisionMacro(vtkExodusIIXMLParser,"1.52");
vtkCxxRevisionMacro(vtkExodusIIXMLParser,"1.53");
......@@ -1678,7 +1678,7 @@ void vtkExodusIIReaderPrivate::ArrayInfoType::Reset()
}
// ------------------------------------------------------- PRIVATE CLASS MEMBERS
vtkCxxRevisionMacro(vtkExodusIIReaderPrivate,"1.52");
vtkCxxRevisionMacro(vtkExodusIIReaderPrivate,"1.53");
vtkStandardNewMacro(vtkExodusIIReaderPrivate);
vtkCxxSetObjectMacro(vtkExodusIIReaderPrivate,
CachedConnectivity,
......@@ -3521,7 +3521,7 @@ vtkDataArray* vtkExodusIIReaderPrivate::GetCacheOrRead( vtkExodusIICacheKey key
arr->SetNumberOfTuples( this->GetNumberOfTimeSteps() );
if ( ainfop->Components == 1 )
{
if ( ex_get_var_time( exoid, vtkExodusIIReader::ELEM_BLOCK, ainfop->OriginalIndices[0], key.ObjectId+1,
if ( ex_get_var_time( exoid, vtkExodusIIReader::ELEM_BLOCK, ainfop->OriginalIndices[0], key.ObjectId,
1, this->GetNumberOfTimeSteps(), arr->GetVoidPointer( 0 ) ) < 0 )
{
vtkErrorMacro( "Could not read element result variable " << ainfop->Name.c_str() << "." );
......@@ -3539,7 +3539,7 @@ vtkDataArray* vtkExodusIIReaderPrivate::GetCacheOrRead( vtkExodusIICacheKey key
{
vtkIdType N = this->GetNumberOfTimeSteps();
tmpVal[c].resize( N );
if ( ex_get_var_time( exoid, vtkExodusIIReader::ELEM_BLOCK, ainfop->OriginalIndices[c], key.ObjectId+1,
if ( ex_get_var_time( exoid, vtkExodusIIReader::ELEM_BLOCK, ainfop->OriginalIndices[c], key.ObjectId,
1, this->GetNumberOfTimeSteps(), &tmpVal[c][0] ) < 0 )
{
vtkErrorMacro( "Could not read temporal element result variable " << ainfop->OriginalNames[c].c_str() << "." );
......@@ -6135,7 +6135,7 @@ vtkDataArray* vtkExodusIIReaderPrivate::FindDisplacementVectors( int timeStep )
// -------------------------------------------------------- PUBLIC CLASS MEMBERS
vtkCxxRevisionMacro(vtkExodusIIReader,"1.52");
vtkCxxRevisionMacro(vtkExodusIIReader,"1.53");
vtkStandardNewMacro(vtkExodusIIReader);
vtkCxxSetObjectMacro(vtkExodusIIReader,Metadata,vtkExodusIIReaderPrivate);
vtkCxxSetObjectMacro(vtkExodusIIReader,ExodusModel,vtkExodusModel);
......
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