zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

paraview reader: export modified FOAM_CASE for parallel sub-cases

Browse Source
This commit is contained in:
Mark Olesen
2008-07-23 09:59:41 +02:00
parent 04f065cf4c
commit dcdce31460
14 changed files with 253 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

129
applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C
View File

@ -27,8 +27,6 @@ License
#include "vtkPV3Foam.H" #include "vtkPV3Foam.H"
// Foam includes // Foam includes
#include "argList.H"
#include "JobInfo.H"
#include "Time.H" #include "Time.H"
#include "fvMesh.H" #include "fvMesh.H"
#include "IOobjectList.H" #include "IOobjectList.H"
@ -177,11 +175,6 @@ void Foam::vtkPV3Foam::resetCounters()
void Foam::vtkPV3Foam::initializeTime() void Foam::vtkPV3Foam::initializeTime()
{ {
#ifdef PV3FOAM_TIMESELECTION #ifdef PV3FOAM_TIMESELECTION
if (debug)
{
Info<< "entered Foam::vtkPV3Foam::initializeTime" << endl;
}
Time& runTime = dbPtr_(); Time& runTime = dbPtr_();
// Get times list // Get times list
@ -215,8 +208,8 @@ bool Foam::vtkPV3Foam::setTime(const double& requestedTime)
{ {
if (debug) if (debug)
{ {
Info<< "entered Foam::vtkPV3Foam::setTime(" Info<< "<beg> Foam::vtkPV3Foam::setTime(" << requestedTime << ")"
<< requestedTime << ")" << endl; << endl;
} }
Time& runTime = dbPtr_(); Time& runTime = dbPtr_();
@ -251,12 +244,14 @@ bool Foam::vtkPV3Foam::setTime(const double& requestedTime)
found = true; found = true;
} }
runTime.setTime(times[nearestIndex], nearestIndex);
if (debug) if (debug)
{ {
Info<< "Selecting time " << times[nearestIndex].name() << endl; Info<< "<end> Foam::vtkPV3Foam::setTime() - selected time "
<< times[nearestIndex].name() << endl;
} }
runTime.setTime(times[nearestIndex], nearestIndex);
return found; return found;
} }
@ -265,7 +260,7 @@ void Foam::vtkPV3Foam::updateSelectedRegions()
{ {
if (debug) if (debug)
{ {
Info<< "entered Foam::vtkPV3Foam::updateSelectedRegions" << endl; Info<< "<beg> Foam::vtkPV3Foam::updateSelectedRegions" << endl;
} }
vtkDataArraySelection* arraySelection = reader_->GetRegionSelection(); vtkDataArraySelection* arraySelection = reader_->GetRegionSelection();
@ -283,10 +278,15 @@ void Foam::vtkPV3Foam::updateSelectedRegions()
if (debug) if (debug)
{ {
Info<< "region " << regionId Info<< " region[" << regionId << "] = "
<< " = " << selectedRegions_[regionId] << endl; << selectedRegions_[regionId]
<< " : " << arraySelection->GetArrayName(regionId) << endl;
} }
} }
if (debug)
{
Info<< "<end> Foam::vtkPV3Foam::updateSelectedRegions" << endl;
}
} }
@ -296,13 +296,14 @@ Foam::stringList Foam::vtkPV3Foam::getSelectedArrayEntries
const bool firstWord const bool firstWord
) )
{ {
if (debug)
{
Info<< "entered Foam::vtkPV3Foam::getSelectedArrayEntries" << endl;
}
stringList selections(arraySelection->GetNumberOfArrays()); stringList selections(arraySelection->GetNumberOfArrays());
label nElem = 0; label nElem = 0;
if (debug)
{
Info << "selections(";
}
forAll (selections, elemI) forAll (selections, elemI)
{ {
if (arraySelection->GetArraySetting(elemI)) if (arraySelection->GetArraySetting(elemI))
@ -318,16 +319,22 @@ Foam::stringList Foam::vtkPV3Foam::getSelectedArrayEntries
{ {
selections[nElem] = arraySelection->GetArrayName(elemI); selections[nElem] = arraySelection->GetArrayName(elemI);
} }
if (debug)
{
Info << " " << selections[nElem];
}
++nElem; ++nElem;
} }
} }
selections.setSize(nElem);
if (debug) if (debug)
{ {
Info<< "Active array: " << selections << endl; Info << " )" << endl;
} }
selections.setSize(nElem);
return selections; return selections;
} }
@ -339,14 +346,14 @@ Foam::stringList Foam::vtkPV3Foam::getSelectedArrayEntries
const bool firstWord const bool firstWord
) )
{ {
if (debug)
{
Info<< "entered Foam::vtkPV3Foam::getSelectedArrayEntries" << endl;
}
stringList selections(selector.size()); stringList selections(selector.size());
label nElem = 0; label nElem = 0;
if (debug)
{
Info << "selections(";
}
for for
( (
int regionId = selector.start(); int regionId = selector.start();
@ -368,16 +375,22 @@ Foam::stringList Foam::vtkPV3Foam::getSelectedArrayEntries
selections[nElem] = arraySelection->GetArrayName(regionId); selections[nElem] = arraySelection->GetArrayName(regionId);
} }
if (debug)
{
Info << " " << selections[nElem];
}
++nElem; ++nElem;
} }
} }
selections.setSize(nElem);
if (debug) if (debug)
{ {
Info<< "Active array: " << selections << endl; Info << " )" << endl;
} }
selections.setSize(nElem);
return selections; return selections;
} }
@ -388,9 +401,9 @@ void Foam::vtkPV3Foam::setSelectedArrayEntries
const stringList& selections const stringList& selections
) )
{ {
if (debug) if (debug > 1)
{ {
Info<< "entered Foam::vtkPV3Foam::setSelectedArrayEntries" << endl; Info<< "<beg> Foam::vtkPV3Foam::setSelectedArrayEntries" << endl;
} }
const label nEntries = arraySelection->GetNumberOfArrays(); const label nEntries = arraySelection->GetNumberOfArrays();
@ -400,7 +413,7 @@ void Foam::vtkPV3Foam::setSelectedArrayEntries
// Loop through entries, setting values from selectedEntries // Loop through entries, setting values from selectedEntries
forAll (selections, elemI) forAll (selections, elemI)
{ {
if (debug) if (debug > 1)
{ {
Info<< "selections[" << elemI << "] = " << selections[elemI] Info<< "selections[" << elemI << "] = " << selections[elemI]
<< endl; << endl;
@ -412,7 +425,7 @@ void Foam::vtkPV3Foam::setSelectedArrayEntries
if (arrayName == selections[elemI]) if (arrayName == selections[elemI])
{ {
if (debug) if (debug > 1)
{ {
Info<< "enabling array: " << arrayName << " Index = " Info<< "enabling array: " << arrayName << " Index = "
<< i << i
@ -427,6 +440,10 @@ void Foam::vtkPV3Foam::setSelectedArrayEntries
} }
} }
} }
if (debug > 1)
{
Info<< "<end> Foam::vtkPV3Foam::setSelectedArrayEntries" << endl;
}
} }
@ -457,8 +474,7 @@ Foam::vtkPV3Foam::vtkPV3Foam
{ {
if (debug) if (debug)
{ {
Info<< "entered Foam::vtkPV3Foam::vtkPV3Foam with " Info<< "Foam::vtkPV3Foam::vtkPV3Foam - " << FileName << endl;
<< FileName << endl;
} }
// avoid argList and get rootPath/caseName directly from the file // avoid argList and get rootPath/caseName directly from the file
@ -474,7 +490,20 @@ Foam::vtkPV3Foam::vtkPV3Foam
} }
// Set the case as an environment variable - some BCs might use this // Set the case as an environment variable - some BCs might use this
setEnv("FOAM_CASE", fullCasePath, true); if (fullCasePath.name().find("processor", 0) == 0)
{
setEnv("FOAM_CASE", fullCasePath.path(), true);
}
else
{
setEnv("FOAM_CASE", fullCasePath, true);
}
if (debug)
{
Info<< "fullCasePath=" << fullCasePath << nl
<< "FOAM_CASE=" << getEnv("FOAM_CASE") << endl;
}
// Create time object // Create time object
dbPtr_.reset dbPtr_.reset
@ -509,7 +538,7 @@ Foam::vtkPV3Foam::~vtkPV3Foam()
{ {
if (debug) if (debug)
{ {
Info<< "entered Foam::vtkPV3Foam::~vtkPV3Foam" << endl; Info<< "<end> Foam::vtkPV3Foam::~vtkPV3Foam" << endl;
} }
if (meshPtr_) if (meshPtr_)
@ -526,7 +555,7 @@ void Foam::vtkPV3Foam::UpdateInformation()
{ {
if (debug) if (debug)
{ {
Info<< "entered Foam::vtkPV3Foam::UpdateInformation" << nl Info<< "<beg> Foam::vtkPV3Foam::UpdateInformation - "
<< "TimeStep = " << reader_->GetTimeStep() << endl; << "TimeStep = " << reader_->GetTimeStep() << endl;
} }
@ -580,6 +609,12 @@ void Foam::vtkPV3Foam::UpdateInformation()
// Update lagrangian field array // Update lagrangian field array
updateInformationLagrangianFields(); updateInformationLagrangianFields();
if (debug)
{
Info<< "<end> Foam::vtkPV3Foam::UpdateInformation" << endl;
}
} }
@ -590,8 +625,8 @@ void Foam::vtkPV3Foam::Update
{ {
if (debug) if (debug)
{ {
cout<< "entered Foam::vtkPV3Foam::Update" << nl cout<< "<beg> Foam::vtkPV3Foam::Update" << nl
<<"Update\n"; <<"Update\n";
output->Print(cout); output->Print(cout);
cout<<"Internally:\n"; cout<<"Internally:\n";
@ -601,7 +636,6 @@ void Foam::vtkPV3Foam::Update
} }
// Set up region selection(s) // Set up region selection(s)
updateSelectedRegions(); updateSelectedRegions();
@ -700,7 +734,7 @@ double* Foam::vtkPV3Foam::timeSteps(int& nTimeSteps)
&& timeI < times.size() && timeI < times.size()
) )
{ {
if (debug) if (debug > 1)
{ {
Info<<"timeSelection[" Info<<"timeSelection["
<< i << i
@ -714,7 +748,7 @@ double* Foam::vtkPV3Foam::timeSteps(int& nTimeSteps)
} }
} }
if (debug) if (debug > 1)
{ {
Info<< "selected " << nTimes << " times "; Info<< "selected " << nTimes << " times ";
Info<< "found " << times.size() << " times: ("; Info<< "found " << times.size() << " times: (";
@ -783,7 +817,7 @@ void Foam::vtkPV3Foam::addPatchNames(vtkRenderer* renderer)
if (debug) if (debug)
{ {
Info<< "addPatchNames()" << endl; Info<< "<beg> Foam::vtkPV3Foam::addPatchNames" << endl;
} }
const fvMesh& mesh = *meshPtr_; const fvMesh& mesh = *meshPtr_;
@ -801,7 +835,7 @@ void Foam::vtkPV3Foam::addPatchNames(vtkRenderer* renderer)
if (debug) if (debug)
{ {
Info<<"patches: " << selectedPatches <<endl; Info<<"... add patches: " << selectedPatches <<endl;
} }
// Find the total number of zones // Find the total number of zones
@ -815,7 +849,7 @@ void Foam::vtkPV3Foam::addPatchNames(vtkRenderer* renderer)
if (debug) if (debug)
{ {
Info<< "determining patch zones" << endl; Info<< "... determining patch zones" << endl;
} }
// Loop through all patches to determine zones, and centre of each zone // Loop through all patches to determine zones, and centre of each zone
@ -954,6 +988,11 @@ void Foam::vtkPV3Foam::addPatchNames(vtkRenderer* renderer)
// Resize the patch names list to the actual number of patch names added // Resize the patch names list to the actual number of patch names added
patchTextActorsPtrs_.setSize(globalZoneI); patchTextActorsPtrs_.setSize(globalZoneI);
if (debug)
{
Info<< "<end> Foam::vtkPV3Foam::addPatchNames)" << endl;
}
} }

7
applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamAddFaceSetMesh.C
View File

@ -48,7 +48,7 @@ void Foam::vtkPV3Foam::addFaceSetMesh
{ {
if (debug) if (debug)
{ {
Info<< "entered add face set internal mesh" << endl; Info<< "<beg> Foam::vtkPV3Foam::addFaceSetMesh" << endl;
} }
// Construct primitivePatch of faces in fSet. // Construct primitivePatch of faces in fSet.
@ -96,6 +96,11 @@ void Foam::vtkPV3Foam::addFaceSetMesh
vtkmesh->SetPolys(vtkcells); vtkmesh->SetPolys(vtkcells);
vtkcells->Delete(); vtkcells->Delete();
if (debug)
{
Info<< "<end> Foam::vtkPV3Foam::addFaceSetMesh" << endl;
}
} }
// ************************************************************************* // // ************************************************************************* //

7
applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamAddFaceZoneMesh.C
View File

@ -47,7 +47,7 @@ void Foam::vtkPV3Foam::addFaceZoneMesh
{ {
if (debug) if (debug)
{ {
Info<< "entered addFaceZoneMesh" << endl; Info<< "<beg> Foam::vtkPV3Foam::addFaceZoneMesh" << endl;
} }
// Construct primitivePatch of faces in fSet. // Construct primitivePatch of faces in fSet.
@ -94,6 +94,11 @@ void Foam::vtkPV3Foam::addFaceZoneMesh
vtkmesh->SetPolys(vtkcells); vtkmesh->SetPolys(vtkcells);
vtkcells->Delete(); vtkcells->Delete();
if (debug)
{
Info<< "<end> Foam::vtkPV3Foam::addFaceZoneMesh" << endl;
}
} }

2
applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamAddFields.H
View File

@ -64,7 +64,7 @@ Foam::label Foam::vtkPV3Foam::addFields
{ {
if (debug) if (debug)
{ {
Info<<"add region " << GeoField::typeName Info<<" addField to GUI " << GeoField::typeName
<< ":" << fields[fieldI] << endl; << ":" << fields[fieldI] << endl;
} }

9
applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamAddLagrangianMesh.C
View File

@ -50,7 +50,7 @@ void Foam::vtkPV3Foam::addLagrangianMesh
{ {
if (debug) if (debug)
{ {
Info<< "entered add Lagrangian mesh with timePath " Info<< "<beg> Foam::vtkPV3Foam::addLagrangianMesh - timePath "
<< mesh.time().timePath()/"lagrangian" << endl; << mesh.time().timePath()/"lagrangian" << endl;
} }
@ -61,7 +61,7 @@ void Foam::vtkPV3Foam::addLagrangianMesh
if (debug && cloudDirs.size()) if (debug && cloudDirs.size())
{ {
Info<< "check cloudDirs: " << cloudDirs << endl; Info<< "... check cloudDirs: " << cloudDirs << endl;
} }
bool foundCloud = false; bool foundCloud = false;
@ -99,6 +99,11 @@ void Foam::vtkPV3Foam::addLagrangianMesh
vtkpoints->Delete(); vtkpoints->Delete();
} }
} }
if (debug)
{
Info<< "<end> Foam::vtkPV3Foam::addLagrangianMesh" << endl;
}
} }

7
applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamAddPatchMesh.C
View File

@ -48,7 +48,7 @@ void Foam::vtkPV3Foam::addPatchMesh
{ {
if (debug) if (debug)
{ {
Info<< "Adding patch: " << p.name() << endl; Info<< "<beg> Foam::vtkPV3Foam::addPatchMesh - " << p.name() << endl;
} }
// Convert Foam mesh vertices to VTK // Convert Foam mesh vertices to VTK
@ -84,6 +84,11 @@ void Foam::vtkPV3Foam::addPatchMesh
vtkmesh->SetPolys(vtkcells); vtkmesh->SetPolys(vtkcells);
vtkcells->Delete(); vtkcells->Delete();
if (debug)
{
Info<< "<end> Foam::vtkPV3Foam::addPatchMesh - " << p.name() << endl;
}
} }

7
applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamAddPointSetMesh.C
View File

@ -47,7 +47,7 @@ void Foam::vtkPV3Foam::addPointSetMesh
{ {
if (debug) if (debug)
{ {
Info<< "entered add point set mesh" << endl; Info<< "<beg> Foam::vtkPV3Foam::addPointSetMesh" << endl;
} }
const pointField& meshPoints = mesh.points(); const pointField& meshPoints = mesh.points();
@ -62,6 +62,11 @@ void Foam::vtkPV3Foam::addPointSetMesh
vtkmesh->SetPoints(vtkpoints); vtkmesh->SetPoints(vtkpoints);
vtkpoints->Delete(); vtkpoints->Delete();
if (debug)
{
Info<< "<end> Foam::vtkPV3Foam::addPointSetMesh" << endl;
}
} }

7
applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamAddPointZoneMesh.C
View File

@ -46,7 +46,7 @@ void Foam::vtkPV3Foam::addPointZoneMesh
{ {
if (debug) if (debug)
{ {
Info<< "entered add point zone mesh" << endl; Info<< "<beg> Foam::vtkPV3Foam::addPointZoneMesh" << endl;
} }
const pointField& meshPoints = mesh.points(); const pointField& meshPoints = mesh.points();
@ -61,6 +61,11 @@ void Foam::vtkPV3Foam::addPointZoneMesh
vtkmesh->SetPoints(vtkpoints); vtkmesh->SetPoints(vtkpoints);
vtkpoints->Delete(); vtkpoints->Delete();
if (debug)
{
Info<< "<beg> Foam::vtkPV3Foam::addPointZoneMesh" << endl;
}
} }

15
applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamAddVolumeMesh.C
View File

@ -54,7 +54,7 @@ void Foam::vtkPV3Foam::addVolumeMesh
{ {
if (debug) if (debug)
{ {
Info<< "entered add volume mesh" << endl; Info<< "<beg> Foam::vtkPV3Foam::addVolumeMesh" << endl;
} }
// Number of additional points needed by the decomposition of polyhedra // Number of additional points needed by the decomposition of polyhedra
@ -74,13 +74,13 @@ void Foam::vtkPV3Foam::addVolumeMesh
// and cells // and cells
if (debug) if (debug)
{ {
Info<< "building cell-shapes" << endl; Info<< "... building cell-shapes" << endl;
} }
const cellShapeList& cellShapes = mesh.cellShapes(); const cellShapeList& cellShapes = mesh.cellShapes();
if (debug) if (debug)
{ {
Info<< "scanning" << endl; Info<< "... scanning" << endl;
} }
forAll(cellShapes, cellI) forAll(cellShapes, cellI)
{ {
@ -133,7 +133,7 @@ void Foam::vtkPV3Foam::addVolumeMesh
if (debug) if (debug)
{ {
Info<< "converting points" << endl; Info<< "... converting points" << endl;
} }
// Convert Foam mesh vertices to VTK // Convert Foam mesh vertices to VTK
@ -150,7 +150,7 @@ void Foam::vtkPV3Foam::addVolumeMesh
if (debug) if (debug)
{ {
Info<< "converting cells" << endl; Info<< "... converting cells" << endl;
} }
vtkmesh->Allocate(mesh.nCells() + nAddCells); vtkmesh->Allocate(mesh.nCells() + nAddCells);
@ -350,6 +350,11 @@ void Foam::vtkPV3Foam::addVolumeMesh
vtkmesh->SetPoints(vtkpoints); vtkmesh->SetPoints(vtkpoints);
vtkpoints->Delete(); vtkpoints->Delete();
if (debug)
{
Info<< "<end> Foam::vtkPV3Foam::addVolumeMesh" << endl;
}
} }

65
applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamConvertMesh.C
View File

@ -50,7 +50,7 @@ void Foam::vtkPV3Foam::convertMeshVolume
{ {
if (debug) if (debug)
{ {
Info<< "entered Foam::vtkPV3Foam::convertMeshVolume" << endl; Info<< "<beg> Foam::vtkPV3Foam::convertMeshVolume" << endl;
} }
const selectionInfo& selector = selectInfoVolume_; const selectionInfo& selector = selectInfoVolume_;
@ -88,6 +88,11 @@ void Foam::vtkPV3Foam::convertMeshVolume
selectedRegionDatasetIds_[regionId] = datasetId; selectedRegionDatasetIds_[regionId] = datasetId;
vtkmesh->Delete(); vtkmesh->Delete();
} }
if (debug)
{
Info<< "<end> Foam::vtkPV3Foam::convertMeshVolume" << endl;
}
} }
@ -98,7 +103,7 @@ void Foam::vtkPV3Foam::convertMeshLagrangian
{ {
if (debug) if (debug)
{ {
Info<< "entered Foam::vtkPV3Foam::convertMeshLagrangian" << endl; Info<< "<beg> Foam::vtkPV3Foam::convertMeshLagrangian" << endl;
} }
const selectionInfo& selector = selectInfoLagrangian_; const selectionInfo& selector = selectInfoLagrangian_;
@ -131,6 +136,10 @@ void Foam::vtkPV3Foam::convertMeshLagrangian
selectedRegionDatasetIds_[regionId] = datasetId; selectedRegionDatasetIds_[regionId] = datasetId;
vtkmesh->Delete(); vtkmesh->Delete();
} }
if (debug)
{
Info<< "<end> Foam::vtkPV3Foam::convertMeshLagrangian" << endl;
}
} }
@ -141,7 +150,7 @@ void Foam::vtkPV3Foam::convertMeshPatches
{ {
if (debug) if (debug)
{ {
Info<< "entered Foam::vtkPV3Foam::convertMeshPatches" << endl; Info<< "<beg> Foam::vtkPV3Foam::convertMeshPatches" << endl;
} }
const selectionInfo& selector = selectInfoPatches_; const selectionInfo& selector = selectInfoPatches_;
@ -196,6 +205,11 @@ void Foam::vtkPV3Foam::convertMeshPatches
vtkmesh->Delete(); vtkmesh->Delete();
} }
} }
if (debug)
{
Info<< "<end> Foam::vtkPV3Foam::convertMeshPatches" << endl;
}
} }
@ -206,7 +220,7 @@ void Foam::vtkPV3Foam::convertMeshCellZones
{ {
if (debug) if (debug)
{ {
Info<< "entered Foam::vtkPV3Foam::convertMeshCellZones" << endl; Info<< "<beg> Foam::vtkPV3Foam::convertMeshCellZones" << endl;
} }
const selectionInfo& selector = selectInfoCellZones_; const selectionInfo& selector = selectInfoCellZones_;
@ -263,6 +277,11 @@ void Foam::vtkPV3Foam::convertMeshCellZones
vtkmesh->Delete(); vtkmesh->Delete();
} }
} }
if (debug)
{
Info<< "<end> Foam::vtkPV3Foam::convertMeshCellZones" << endl;
}
} }
@ -273,7 +292,7 @@ void Foam::vtkPV3Foam::convertMeshCellSet
{ {
if (debug) if (debug)
{ {
Info<< "entered Foam::vtkPV3Foam::convertMeshCellSet" << endl; Info<< "<beg> Foam::vtkPV3Foam::convertMeshCellSet" << endl;
} }
const selectionInfo& selector = selectInfoCellSets_; const selectionInfo& selector = selectInfoCellSets_;
@ -337,6 +356,11 @@ void Foam::vtkPV3Foam::convertMeshCellSet
vtkmesh->Delete(); vtkmesh->Delete();
} }
} }
if (debug)
{
Info<< "<end> Foam::vtkPV3Foam::convertMeshCellSet" << endl;
}
} }
void Foam::vtkPV3Foam::convertMeshFaceZones void Foam::vtkPV3Foam::convertMeshFaceZones
@ -346,7 +370,7 @@ void Foam::vtkPV3Foam::convertMeshFaceZones
{ {
if (debug) if (debug)
{ {
Info<< "entered Foam::vtkPV3Foam::convertMeshFaceZones" << endl; Info<< "<beg> Foam::vtkPV3Foam::convertMeshFaceZones" << endl;
} }
const selectionInfo& selector = selectInfoFaceZones_; const selectionInfo& selector = selectInfoFaceZones_;
@ -393,6 +417,11 @@ void Foam::vtkPV3Foam::convertMeshFaceZones
vtkmesh->Delete(); vtkmesh->Delete();
} }
} }
if (debug)
{
Info<< "<end> Foam::vtkPV3Foam::convertMeshFaceZones" << endl;
}
} }
@ -403,7 +432,7 @@ void Foam::vtkPV3Foam::convertMeshFaceSet
{ {
if (debug) if (debug)
{ {
Info<< "entered Foam::vtkPV3Foam::convertMeshFaceSet" << endl; Info<< "<beg> Foam::vtkPV3Foam::convertMeshFaceSet" << endl;
} }
const selectionInfo& selector = selectInfoFaceSets_; const selectionInfo& selector = selectInfoFaceSets_;
@ -458,6 +487,11 @@ void Foam::vtkPV3Foam::convertMeshFaceSet
vtkmesh->Delete(); vtkmesh->Delete();
} }
} }
if (debug)
{
Info<< "<end> Foam::vtkPV3Foam::convertMeshFaceSet" << endl;
}
} }
@ -468,7 +502,7 @@ void Foam::vtkPV3Foam::convertMeshPointZones
{ {
if (debug) if (debug)
{ {
Info<< "entered Foam::vtkPV3Foam::convertMeshPointZones" << endl; Info<< "<beg> Foam::vtkPV3Foam::convertMeshPointZones" << endl;
} }
const selectionInfo& selector = selectInfoPointZones_; const selectionInfo& selector = selectInfoPointZones_;
@ -498,7 +532,7 @@ void Foam::vtkPV3Foam::convertMeshPointZones
const label datasetId = GetNumberOfDataSets(output, selector); const label datasetId = GetNumberOfDataSets(output, selector);
vtkPolyData* vtkmesh = vtkPolyData::New(); vtkPolyData* vtkmesh = vtkPolyData::New();
addPointZoneMesh addPointZoneMesh
( (
mesh, mesh,
@ -515,6 +549,11 @@ void Foam::vtkPV3Foam::convertMeshPointZones
vtkmesh->Delete(); vtkmesh->Delete();
} }
} }
if (debug)
{
Info<< "<end> Foam::vtkPV3Foam::convertMeshPointZones" << endl;
}
} }
@ -526,7 +565,7 @@ void Foam::vtkPV3Foam::convertMeshPointSet
{ {
if (debug) if (debug)
{ {
Info<< "entered Foam::vtkPV3Foam::convertMeshPointSet" << endl; Info<< "<beg> Foam::vtkPV3Foam::convertMeshPointSet" << endl;
} }
const selectionInfo& selector = selectInfoPointSets_; const selectionInfo& selector = selectInfoPointSets_;
@ -581,7 +620,11 @@ void Foam::vtkPV3Foam::convertMeshPointSet
vtkmesh->Delete(); vtkmesh->Delete();
} }
} }
if (debug)
{
Info<< "<end> Foam::vtkPV3Foam::convertMeshPointSet" << endl;
}
} }
// ************************************************************************* // // ************************************************************************* //

2
applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamConvertPointFields.H
View File

@ -66,7 +66,7 @@ void Foam::vtkPV3Foam::convertPointFields
if (debug) if (debug)
{ {
Info<< "converting Foam point field: " << fieldName Info<< "Foam::vtkPV3Foam::convertPointFields : " << fieldName
<< endl; << endl;
} }

33
applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdate.C
View File

@ -47,7 +47,7 @@ void Foam::vtkPV3Foam::updateFoamMesh()
{ {
if (debug) if (debug)
{ {
Info<< "entered Foam::vtkPV3Foam::updateFoamMesh" << endl; Info<< "<beg> Foam::vtkPV3Foam::updateFoamMesh" << endl;
} }
if if
@ -87,6 +87,11 @@ void Foam::vtkPV3Foam::updateFoamMesh()
Info<< "Using existing Foam mesh" << endl; Info<< "Using existing Foam mesh" << endl;
} }
} }
if (debug)
{
Info<< "<end> Foam::vtkPV3Foam::updateFoamMesh" << endl;
}
} }
@ -97,7 +102,7 @@ void Foam::vtkPV3Foam::updateVolFields
{ {
if (debug) if (debug)
{ {
Info<< "entered Foam::vtkPV3Foam::updateVolFields" << endl; Info<< "<beg> Foam::vtkPV3Foam::updateVolFields" << endl;
} }
const fvMesh& mesh = *meshPtr_; const fvMesh& mesh = *meshPtr_;
@ -143,6 +148,11 @@ void Foam::vtkPV3Foam::updateVolFields
( (
mesh, pInterp, objects, arraySelection, output mesh, pInterp, objects, arraySelection, output
); );
if (debug)
{
Info<< "<end> Foam::vtkPV3Foam::updateVolFields" << endl;
}
} }
@ -153,7 +163,7 @@ void Foam::vtkPV3Foam::updatePointFields
{ {
if (debug) if (debug)
{ {
Info<< "entered Foam::vtkPV3Foam::updatePointFields" << endl; Info<< "<beg> Foam::vtkPV3Foam::updatePointFields" << endl;
} }
const fvMesh& mesh = *meshPtr_; const fvMesh& mesh = *meshPtr_;
@ -163,11 +173,6 @@ void Foam::vtkPV3Foam::updatePointFields
vtkDataArraySelection* arraySelection = reader_->GetPointFieldSelection(); vtkDataArraySelection* arraySelection = reader_->GetPointFieldSelection();
// Convert point fields
if (debug)
{
Info<< "converting Foam point fields" << endl;
}
/* /*
convertPointFields<Foam::label> convertPointFields<Foam::label>
( (
@ -194,6 +199,11 @@ void Foam::vtkPV3Foam::updatePointFields
( (
mesh, objects, arraySelection, output mesh, objects, arraySelection, output
); );
if (debug)
{
Info<< "<end> Foam::vtkPV3Foam::updatePointFields" << endl;
}
} }
@ -204,7 +214,7 @@ void Foam::vtkPV3Foam::updateLagrangianFields
{ {
if (debug) if (debug)
{ {
Info<< "entered Foam::vtkPV3Foam::updateLagrangianFields" << endl; Info<< "<beg> Foam::vtkPV3Foam::updateLagrangianFields" << endl;
} }
const fvMesh& mesh = *meshPtr_; const fvMesh& mesh = *meshPtr_;
@ -252,6 +262,11 @@ void Foam::vtkPV3Foam::updateLagrangianFields
( (
mesh, objects, arraySelection, output mesh, objects, arraySelection, output
); );
if (debug)
{
Info<< "<end> Foam::vtkPV3Foam::updateLagrangianFields" << endl;
}
} }

48
applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInformation.C
View File

@ -86,8 +86,7 @@ void Foam::vtkPV3Foam::updateInformationInternalMesh()
{ {
if (debug) if (debug)
{ {
Info<< "entered Foam::vtkPV3Foam::updateInformationInternalMesh" Info<< "<beg> Foam::vtkPV3Foam::updateInformationInternalMesh" << endl;
<< endl;
} }
vtkDataArraySelection* arraySelection = reader_->GetRegionSelection(); vtkDataArraySelection* arraySelection = reader_->GetRegionSelection();
@ -101,6 +100,12 @@ void Foam::vtkPV3Foam::updateInformationInternalMesh()
selectInfoVolume_ = arraySelection->GetNumberOfArrays(); selectInfoVolume_ = arraySelection->GetNumberOfArrays();
arraySelection->AddArray("internalMesh"); arraySelection->AddArray("internalMesh");
selectInfoVolume_ += 1; selectInfoVolume_ += 1;
if (debug)
{
Info<< "<end> Foam::vtkPV3Foam::updateInformationInternalMesh" << endl;
}
} }
@ -108,8 +113,8 @@ void Foam::vtkPV3Foam::updateInformationLagrangian()
{ {
if (debug) if (debug)
{ {
Info<< "entered Foam::vtkPV3Foam::updateInformationLagrangian " Info<< "<beg> Foam::vtkPV3Foam::updateInformationLagrangian" << nl
<< "at timePath " << dbPtr_->timePath()/"lagrangian" << endl; << " " << dbPtr_->timePath()/"lagrangian" << endl;
} }
vtkDataArraySelection* arraySelection = reader_->GetRegionSelection(); vtkDataArraySelection* arraySelection = reader_->GetRegionSelection();
@ -144,11 +149,15 @@ void Foam::vtkPV3Foam::updateInformationLagrangian()
{ {
if (debug) if (debug)
{ {
Info<<"no clouds identified in " Info<<"no clouds identified in " <<nl
<< dbPtr_->timePath()/"lagrangian" << endl; << " " <<dbPtr_->timePath()/"lagrangian" << endl;
} }
} }
if (debug)
{
Info<< "<end> Foam::vtkPV3Foam::updateInformationLagrangian" << endl;
}
} }
@ -156,7 +165,7 @@ void Foam::vtkPV3Foam::updateInformationPatches()
{ {
if (debug) if (debug)
{ {
Info<< "entered Foam::vtkPV3Foam::updateInformationPatches" << endl; Info<< "<beg> Foam::vtkPV3Foam::updateInformationPatches" << endl;
} }
vtkDataArraySelection *arraySelection = reader_->GetRegionSelection(); vtkDataArraySelection *arraySelection = reader_->GetRegionSelection();
@ -198,6 +207,10 @@ void Foam::vtkPV3Foam::updateInformationPatches()
} }
selectInfoPatches_ += nPatches; selectInfoPatches_ += nPatches;
if (debug)
{
Info<< "<end> Foam::vtkPV3Foam::updateInformationPatches" << endl;
}
} }
@ -205,7 +218,7 @@ void Foam::vtkPV3Foam::updateInformationZones()
{ {
if (debug) if (debug)
{ {
Info<< "entered Foam::vtkPV3Foam::updateInformationZones" << endl; Info<< "<beg> Foam::vtkPV3Foam::updateInformationZones" << endl;
} }
vtkDataArraySelection *arraySelection = reader_->GetRegionSelection(); vtkDataArraySelection *arraySelection = reader_->GetRegionSelection();
@ -301,6 +314,12 @@ void Foam::vtkPV3Foam::updateInformationZones()
selectInfoPointZones_ += zones.size(); selectInfoPointZones_ += zones.size();
} }
} }
if (debug)
{
Info<< "<end> Foam::vtkPV3Foam::updateInformationZones" << endl;
}
} }
@ -308,7 +327,7 @@ void Foam::vtkPV3Foam::updateInformationSets()
{ {
if (debug) if (debug)
{ {
Info<< "entered Foam::vtkPV3Foam::updateInformationSets" << endl; Info<< "<beg> Foam::vtkPV3Foam::updateInformationSets" << endl;
} }
vtkDataArraySelection *arraySelection = reader_->GetRegionSelection(); vtkDataArraySelection *arraySelection = reader_->GetRegionSelection();
@ -346,6 +365,11 @@ void Foam::vtkPV3Foam::updateInformationSets()
objects, objects,
" - pointSet" " - pointSet"
); );
if (debug)
{
Info<< "<end> Foam::vtkPV3Foam::updateInformationSets" << endl;
}
} }
@ -353,7 +377,7 @@ void Foam::vtkPV3Foam::updateInformationLagrangianFields()
{ {
if (debug) if (debug)
{ {
Info<< "entered Foam::vtkPV3Foam::updateInformationLagrangianFields" Info<< "<beg> Foam::vtkPV3Foam::updateInformationLagrangianFields"
<< endl; << endl;
} }
@ -415,8 +439,8 @@ void Foam::vtkPV3Foam::updateInformationLagrangianFields()
if (debug) if (debug)
{ {
Info<< "lagrangian objects.size() = " << objects.size() Info<< "<end> Foam::vtkPV3Foam::updateInformationLagrangianFields - "
<< endl; << "lagrangian objects.size() = " << objects.size() << endl;
} }
} }

7
applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInformationFields.H
View File

@ -40,7 +40,7 @@ void Foam::vtkPV3Foam::updateInformationFields
{ {
if (debug) if (debug)
{ {
Info<< "entered Foam::vtkPV3Foam::updateInformationFields" << endl; Info<< "<beg> Foam::vtkPV3Foam::updateInformationFields" << endl;
} }
// preserve the currently selected values // preserve the currently selected values
@ -94,6 +94,11 @@ void Foam::vtkPV3Foam::updateInformationFields
arraySelection, arraySelection,
selectedEntries selectedEntries
); );
if (debug)
{
Info<< "<end> Foam::vtkPV3Foam::updateInformationFields" << endl;
}
} }