Merge commit 'OpenCFD/master' into olesenm

This commit is contained in:
Mark Olesen
2009-03-05 11:00:34 +01:00
8 changed files with 383 additions and 120 deletions

View File

@ -319,6 +319,7 @@ int vtkPV3FoamReader::RequestData
<< output->GetNumberOfBlocks() << " blocks\n";
}
#ifdef EXPERIMENTAL_TIME_CACHING
bool needsUpdate = false;
@ -373,6 +374,9 @@ int vtkPV3FoamReader::RequestData
#endif
// Do any cleanup on the Foam side
foamData_->CleanUp();
return 1;
}

View File

@ -492,11 +492,15 @@ void Foam::vtkPV3Foam::Update
convertLagrangianFields(lagrangianOutput);
reader_->UpdateProgress(0.95);
meshChanged_ = fieldsChanged_ = false;
}
void Foam::vtkPV3Foam::CleanUp()
{
// reclaim some memory
reduceMemory();
reader_->UpdateProgress(1.0);
meshChanged_ = fieldsChanged_ = false;
}

View File

@ -700,6 +700,9 @@ public:
vtkMultiBlockDataSet* lagrangianOutput
);
//- Clean any storage
void CleanUp();
//- Allocate and return a list of selected times
// returns the count via the parameter
double* findTimes(int& nTimeSteps);