Commit 22a13ea2 authored by Mark Olesen's avatar Mark Olesen
Browse files

PV3FoamReader - tooltips and reclaim memory if mesh caching is turned off

parent 062bb366
...@@ -12,20 +12,22 @@ ...@@ -12,20 +12,22 @@
animateable="0"> animateable="0">
<FileListDomain name="files"/> <FileListDomain name="files"/>
<Documentation> <Documentation>
Specifies the filename for the OpenFOAM Reader Specifies the filename for the OpenFOAM Reader.
</Documentation> </Documentation>
</StringVectorProperty> </StringVectorProperty>
<!-- Time info sent to animation controls (top of window) --> <!-- Send discrete time info to the animation panel -->
<DoubleVectorProperty <DoubleVectorProperty
name="TimestepValues" name="TimestepValues"
repeatable="1"
information_only="1"> information_only="1">
<TimeStepsInformationHelper/> <TimeStepsInformationHelper/>
<Documentation> <Documentation>
Available timestep values Available timestep values.
</Documentation> </Documentation>
</DoubleVectorProperty> </DoubleVectorProperty>
<!-- Send continuous time info to the animation panel -->
<DoubleVectorProperty <DoubleVectorProperty
name="TimeRange" name="TimeRange"
information_only="1"> information_only="1">
...@@ -190,6 +192,7 @@ ...@@ -190,6 +192,7 @@
</Documentation> </Documentation>
</IntVectorProperty> </IntVectorProperty>
<!-- Update GUI check box --> <!-- Update GUI check box -->
<IntVectorProperty <IntVectorProperty
name="UpdateGUI" name="UpdateGUI"
......
...@@ -79,6 +79,12 @@ void Foam::vtkPV3Foam::reduceMemory() ...@@ -79,6 +79,12 @@ void Foam::vtkPV3Foam::reduceMemory()
{ {
csetPolyDecomp_[i].clear(); csetPolyDecomp_[i].clear();
} }
if (!reader_->GetCacheMesh())
{
delete meshPtr_;
meshPtr_ = NULL;
}
} }
...@@ -413,22 +419,25 @@ void Foam::vtkPV3Foam::Update ...@@ -413,22 +419,25 @@ void Foam::vtkPV3Foam::Update
// Set up mesh parts selection(s) // Set up mesh parts selection(s)
updateMeshPartsStatus(); updateMeshPartsStatus();
reader_->UpdateProgress(0.15);
// Update the Foam mesh // Update the Foam mesh
updateFoamMesh(); updateFoamMesh();
reader_->UpdateProgress(0.2); reader_->UpdateProgress(0.4);
// Convert meshes - start port0 at block=0 // Convert meshes - start port0 at block=0
int blockNo = 0; int blockNo = 0;
convertMeshVolume(output, blockNo); convertMeshVolume(output, blockNo);
convertMeshPatches(output, blockNo); convertMeshPatches(output, blockNo);
reader_->UpdateProgress(0.4); reader_->UpdateProgress(0.6);
if (reader_->GetIncludeZones()) if (reader_->GetIncludeZones())
{ {
convertMeshCellZones(output, blockNo); convertMeshCellZones(output, blockNo);
convertMeshFaceZones(output, blockNo); convertMeshFaceZones(output, blockNo);
convertMeshPointZones(output, blockNo); convertMeshPointZones(output, blockNo);
reader_->UpdateProgress(0.65);
} }
if (reader_->GetIncludeSets()) if (reader_->GetIncludeSets())
...@@ -436,6 +445,7 @@ void Foam::vtkPV3Foam::Update ...@@ -436,6 +445,7 @@ void Foam::vtkPV3Foam::Update
convertMeshCellSets(output, blockNo); convertMeshCellSets(output, blockNo);
convertMeshFaceSets(output, blockNo); convertMeshFaceSets(output, blockNo);
convertMeshPointSets(output, blockNo); convertMeshPointSets(output, blockNo);
reader_->UpdateProgress(0.7);
} }
// restart port1 at block=0 // restart port1 at block=0
......
Supports Markdown
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