zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vtkPVFoam: Updated handling of zones

Browse Source
This commit is contained in:
Henry Weller
2024-04-05 11:47:49 +01:00
parent ef3021c55a
commit ed59ea40bf
2 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoam.H
View File

@ -360,14 +360,12 @@ class vtkPVFoam
void updateInfoZones(vtkDataArraySelection*);
//- Get non-empty zone names for zoneType from file
wordList getZoneNames(const word& zoneType) const;
template<class ZonesType>
wordList getZoneNames(const word& zonesName) const;
//- Get non-empty zone names from mesh info
template<class ZoneType, class ZonesType>
wordList getZoneNames
(
const ZoneList<ZoneType, ZonesType, polyMesh>&
) const;
template<class ZonesType>
wordList getZoneNames(const ZonesType&) const;
//- Add objects of Type to paraview array selection
template<class Type>

35
applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamUpdateInfo.C
View File

@ -50,6 +50,7 @@ namespace Foam
{
//- A class for reading zone information without requiring a mesh
template<class ZonesType>
class zonesEntries
:
public regIOobject,
@ -63,7 +64,7 @@ public:
explicit zonesEntries(const IOobject& io)
:
regIOobject(io),
PtrList<entry>(readStream(word("regIOobject")))
PtrList<entry>(readStream(ZonesType::typeName))
{
close();
}
@ -81,20 +82,17 @@ public:
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
template<class ZoneType, class ZonesType>
Foam::wordList Foam::vtkPVFoam::getZoneNames
(
const ZoneList<ZoneType, ZonesType, polyMesh>& zmesh
) const
template<class ZonesType>
Foam::wordList Foam::vtkPVFoam::getZoneNames(const ZonesType& zones) const
{
wordList names(zmesh.size());
wordList names(zones.size());
label nZone = 0;
forAll(zmesh, zoneI)
forAll(zones, zoneI)
{
if (zmesh[zoneI].size())
if (zones[zoneI].size())
{
names[nZone++] = zmesh[zoneI].name();
names[nZone++] = zones[zoneI].name();
}
}
names.setSize(nZone);
@ -103,18 +101,19 @@ Foam::wordList Foam::vtkPVFoam::getZoneNames
}
Foam::wordList Foam::vtkPVFoam::getZoneNames(const word& zoneType) const
template<class ZonesType>
Foam::wordList Foam::vtkPVFoam::getZoneNames(const word& zonesName) const
{
wordList names;
// Mesh not loaded - read from file
IOobject ioObj
typeIOobject<ZonesType> ioObj
(
zoneType,
zonesName,
dbPtr_().findInstance
(
meshDir_,
zoneType,
zonesName,
IOobject::READ_IF_PRESENT
),
meshDir_,
@ -126,7 +125,7 @@ Foam::wordList Foam::vtkPVFoam::getZoneNames(const word& zoneType) const
if (ioObj.headerOk())
{
zonesEntries zones(ioObj);
const zonesEntries<ZonesType> zones(ioObj);
names.setSize(zones.size());
forAll(zones, zoneI)
@ -523,7 +522,7 @@ void Foam::vtkPVFoam::updateInfoZones
}
else
{
namesLst = getZoneNames("cellZones");
namesLst = getZoneNames<cellZoneList>("cellZones");
}
arrayRangeCellZones_.reset(arraySelection->GetNumberOfArrays());
@ -544,7 +543,7 @@ void Foam::vtkPVFoam::updateInfoZones
}
else
{
namesLst = getZoneNames("faceZones");
namesLst = getZoneNames<faceZoneList>("faceZones");
}
arrayRangeFaceZones_.reset(arraySelection->GetNumberOfArrays());
@ -565,7 +564,7 @@ void Foam::vtkPVFoam::updateInfoZones
}
else
{
namesLst = getZoneNames("pointZones");
namesLst = getZoneNames<pointZoneList>("pointZones");
}
arrayRangePointZones_.reset(arraySelection->GetNumberOfArrays());