Commit 82c94d64 authored by Mark Olesen's avatar Mark Olesen

paraview reader: export modified FOAM_CASE for parallel sub-cases

parent b425ebee
......@@ -27,8 +27,6 @@ License
#include "vtkPV3Foam.H"
// Foam includes
#include "argList.H"
#include "JobInfo.H"
#include "Time.H"
#include "fvMesh.H"
#include "IOobjectList.H"
......@@ -177,11 +175,6 @@ void Foam::vtkPV3Foam::resetCounters()
void Foam::vtkPV3Foam::initializeTime()
{
#ifdef PV3FOAM_TIMESELECTION
if (debug)
{
Info<< "entered Foam::vtkPV3Foam::initializeTime" << endl;
}
Time& runTime = dbPtr_();
// Get times list
......@@ -215,8 +208,8 @@ bool Foam::vtkPV3Foam::setTime(const double& requestedTime)
{
if (debug)
{
Info<< "entered Foam::vtkPV3Foam::setTime("
<< requestedTime << ")" << endl;
Info<< "<beg> Foam::vtkPV3Foam::setTime(" << requestedTime << ")"
<< endl;
}
Time& runTime = dbPtr_();
......@@ -251,12 +244,14 @@ bool Foam::vtkPV3Foam::setTime(const double& requestedTime)
found = true;
}
runTime.setTime(times[nearestIndex], nearestIndex);
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;
}
......@@ -265,7 +260,7 @@ void Foam::vtkPV3Foam::updateSelectedRegions()
{
if (debug)
{
Info<< "entered Foam::vtkPV3Foam::updateSelectedRegions" << endl;
Info<< "<beg> Foam::vtkPV3Foam::updateSelectedRegions" << endl;
}
vtkDataArraySelection* arraySelection = reader_->GetRegionSelection();
......@@ -283,10 +278,15 @@ void Foam::vtkPV3Foam::updateSelectedRegions()
if (debug)
{
Info<< "region " << regionId
<< " = " << selectedRegions_[regionId] << endl;
Info<< " region[" << regionId << "] = "
<< 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
)
{
stringList selections(arraySelection->GetNumberOfArrays());
label nElem = 0;
if (debug)
{
Info<< "entered Foam::vtkPV3Foam::getSelectedArrayEntries" << endl;
Info << "selections(";
}
stringList selections(arraySelection->GetNumberOfArrays());
label nElem = 0;
forAll (selections, elemI)
{
if (arraySelection->GetArraySetting(elemI))
......@@ -318,16 +319,22 @@ Foam::stringList Foam::vtkPV3Foam::getSelectedArrayEntries
{
selections[nElem] = arraySelection->GetArrayName(elemI);
}
if (debug)
{
Info << " " << selections[nElem];
}
++nElem;
}
}
selections.setSize(nElem);
if (debug)
{
Info<< "Active array: " << selections << endl;
Info << " )" << endl;
}
selections.setSize(nElem);
return selections;
}
......@@ -339,14 +346,14 @@ Foam::stringList Foam::vtkPV3Foam::getSelectedArrayEntries
const bool firstWord
)
{
stringList selections(selector.size());
label nElem = 0;
if (debug)
{
Info<< "entered Foam::vtkPV3Foam::getSelectedArrayEntries" << endl;
Info << "selections(";
}
stringList selections(selector.size());
label nElem = 0;
for
(
int regionId = selector.start();
......@@ -368,16 +375,22 @@ Foam::stringList Foam::vtkPV3Foam::getSelectedArrayEntries
selections[nElem] = arraySelection->GetArrayName(regionId);
}
if (debug)
{
Info << " " << selections[nElem];
}
++nElem;
}
}
selections.setSize(nElem);
if (debug)
{
Info<< "Active array: " << selections << endl;
Info << " )" << endl;
}
selections.setSize(nElem);
return selections;
}
......@@ -388,9 +401,9 @@ void Foam::vtkPV3Foam::setSelectedArrayEntries
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();
......@@ -400,7 +413,7 @@ void Foam::vtkPV3Foam::setSelectedArrayEntries
// Loop through entries, setting values from selectedEntries
forAll (selections, elemI)
{
if (debug)
if (debug > 1)
{
Info<< "selections[" << elemI << "] = " << selections[elemI]
<< endl;
......@@ -412,7 +425,7 @@ void Foam::vtkPV3Foam::setSelectedArrayEntries
if (arrayName == selections[elemI])
{
if (debug)
if (debug > 1)
{
Info<< "enabling array: " << arrayName << " Index = "
<< 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)
{
Info<< "entered Foam::vtkPV3Foam::vtkPV3Foam with "
<< FileName << endl;
Info<< "Foam::vtkPV3Foam::vtkPV3Foam - " << FileName << endl;
}
// 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
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
dbPtr_.reset
......@@ -509,7 +538,7 @@ Foam::vtkPV3Foam::~vtkPV3Foam()
{
if (debug)
{
Info<< "entered Foam::vtkPV3Foam::~vtkPV3Foam" << endl;
Info<< "<end> Foam::vtkPV3Foam::~vtkPV3Foam" << endl;
}
if (meshPtr_)
......@@ -526,7 +555,7 @@ void Foam::vtkPV3Foam::UpdateInformation()
{
if (debug)
{
Info<< "entered Foam::vtkPV3Foam::UpdateInformation" << nl
Info<< "<beg> Foam::vtkPV3Foam::UpdateInformation - "
<< "TimeStep = " << reader_->GetTimeStep() << endl;
}
......@@ -580,6 +609,12 @@ void Foam::vtkPV3Foam::UpdateInformation()
// Update lagrangian field array
updateInformationLagrangianFields();
if (debug)
{
Info<< "<end> Foam::vtkPV3Foam::UpdateInformation" << endl;
}
}
......@@ -590,8 +625,8 @@ void Foam::vtkPV3Foam::Update
{
if (debug)
{
cout<< "entered Foam::vtkPV3Foam::Update" << nl
<<"Update\n";
cout<< "<beg> Foam::vtkPV3Foam::Update" << nl
<<"Update\n";
output->Print(cout);
cout<<"Internally:\n";
......@@ -601,7 +636,6 @@ void Foam::vtkPV3Foam::Update
}
// Set up region selection(s)
updateSelectedRegions();
......@@ -700,7 +734,7 @@ double* Foam::vtkPV3Foam::timeSteps(int& nTimeSteps)
&& timeI < times.size()
)
{
if (debug)
if (debug > 1)
{
Info<<"timeSelection["
<< i
......@@ -714,7 +748,7 @@ double* Foam::vtkPV3Foam::timeSteps(int& nTimeSteps)
}
}
if (debug)
if (debug > 1)
{
Info<< "selected " << nTimes << " times ";
Info<< "found " << times.size() << " times: (";
......@@ -783,7 +817,7 @@ void Foam::vtkPV3Foam::addPatchNames(vtkRenderer* renderer)
if (debug)
{
Info<< "addPatchNames()" << endl;
Info<< "<beg> Foam::vtkPV3Foam::addPatchNames" << endl;
}
const fvMesh& mesh = *meshPtr_;
......@@ -801,7 +835,7 @@ void Foam::vtkPV3Foam::addPatchNames(vtkRenderer* renderer)
if (debug)
{
Info<<"patches: " << selectedPatches <<endl;
Info<<"... add patches: " << selectedPatches <<endl;
}
// Find the total number of zones
......@@ -815,7 +849,7 @@ void Foam::vtkPV3Foam::addPatchNames(vtkRenderer* renderer)
if (debug)
{
Info<< "determining patch zones" << endl;
Info<< "... determining patch zones" << endl;
}
// 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
patchTextActorsPtrs_.setSize(globalZoneI);
if (debug)
{
Info<< "<end> Foam::vtkPV3Foam::addPatchNames)" << endl;
}
}
......
......@@ -48,7 +48,7 @@ void Foam::vtkPV3Foam::addFaceSetMesh
{
if (debug)
{
Info<< "entered add face set internal mesh" << endl;
Info<< "<beg> Foam::vtkPV3Foam::addFaceSetMesh" << endl;
}
// Construct primitivePatch of faces in fSet.
......@@ -96,6 +96,11 @@ void Foam::vtkPV3Foam::addFaceSetMesh
vtkmesh->SetPolys(vtkcells);
vtkcells->Delete();
if (debug)
{
Info<< "<end> Foam::vtkPV3Foam::addFaceSetMesh" << endl;
}
}
// ************************************************************************* //
......@@ -47,7 +47,7 @@ void Foam::vtkPV3Foam::addFaceZoneMesh
{
if (debug)
{
Info<< "entered addFaceZoneMesh" << endl;
Info<< "<beg> Foam::vtkPV3Foam::addFaceZoneMesh" << endl;
}
// Construct primitivePatch of faces in fSet.
......@@ -94,6 +94,11 @@ void Foam::vtkPV3Foam::addFaceZoneMesh
vtkmesh->SetPolys(vtkcells);
vtkcells->Delete();
if (debug)
{
Info<< "<end> Foam::vtkPV3Foam::addFaceZoneMesh" << endl;
}
}
......
......@@ -64,7 +64,7 @@ Foam::label Foam::vtkPV3Foam::addFields
{
if (debug)
{
Info<<"add region " << GeoField::typeName
Info<<" addField to GUI " << GeoField::typeName
<< ":" << fields[fieldI] << endl;
}
......
......@@ -50,7 +50,7 @@ void Foam::vtkPV3Foam::addLagrangianMesh
{
if (debug)
{
Info<< "entered add Lagrangian mesh with timePath "
Info<< "<beg> Foam::vtkPV3Foam::addLagrangianMesh - timePath "
<< mesh.time().timePath()/"lagrangian" << endl;
}
......@@ -61,7 +61,7 @@ void Foam::vtkPV3Foam::addLagrangianMesh
if (debug && cloudDirs.size())
{
Info<< "check cloudDirs: " << cloudDirs << endl;
Info<< "... check cloudDirs: " << cloudDirs << endl;
}
bool foundCloud = false;
......@@ -99,6 +99,11 @@ void Foam::vtkPV3Foam::addLagrangianMesh
vtkpoints->Delete();
}
}
if (debug)
{
Info<< "<end> Foam::vtkPV3Foam::addLagrangianMesh" << endl;
}
}
......
......@@ -48,7 +48,7 @@ void Foam::vtkPV3Foam::addPatchMesh
{
if (debug)
{
Info<< "Adding patch: " << p.name() << endl;
Info<< "<beg> Foam::vtkPV3Foam::addPatchMesh - " << p.name() << endl;
}
// Convert Foam mesh vertices to VTK
......@@ -84,6 +84,11 @@ void Foam::vtkPV3Foam::addPatchMesh
vtkmesh->SetPolys(vtkcells);
vtkcells->Delete();
if (debug)
{
Info<< "<end> Foam::vtkPV3Foam::addPatchMesh - " << p.name() << endl;
}
}
......
......@@ -47,7 +47,7 @@ void Foam::vtkPV3Foam::addPointSetMesh
{
if (debug)
{
Info<< "entered add point set mesh" << endl;
Info<< "<beg> Foam::vtkPV3Foam::addPointSetMesh" << endl;
}
const pointField& meshPoints = mesh.points();
......@@ -62,6 +62,11 @@ void Foam::vtkPV3Foam::addPointSetMesh
vtkmesh->SetPoints(vtkpoints);
vtkpoints->Delete();
if (debug)
{
Info<< "<end> Foam::vtkPV3Foam::addPointSetMesh" << endl;
}
}
......
......@@ -46,7 +46,7 @@ void Foam::vtkPV3Foam::addPointZoneMesh
{
if (debug)
{
Info<< "entered add point zone mesh" << endl;
Info<< "<beg> Foam::vtkPV3Foam::addPointZoneMesh" << endl;
}
const pointField& meshPoints = mesh.points();
......@@ -61,6 +61,11 @@ void Foam::vtkPV3Foam::addPointZoneMesh
vtkmesh->SetPoints(vtkpoints);
vtkpoints->Delete();
if (debug)
{
Info<< "<beg> Foam::vtkPV3Foam::addPointZoneMesh" << endl;
}
}
......
......@@ -54,7 +54,7 @@ void Foam::vtkPV3Foam::addVolumeMesh
{
if (debug)
{
Info<< "entered add volume mesh" << endl;
Info<< "<beg> Foam::vtkPV3Foam::addVolumeMesh" << endl;
}
// Number of additional points needed by the decomposition of polyhedra
......@@ -74,13 +74,13 @@ void Foam::vtkPV3Foam::addVolumeMesh
// and cells
if (debug)
{
Info<< "building cell-shapes" << endl;
Info<< "... building cell-shapes" << endl;
}
const cellShapeList& cellShapes = mesh.cellShapes();
if (debug)
{
Info<< "scanning" << endl;
Info<< "... scanning" << endl;
}
forAll(cellShapes, cellI)
{
......@@ -133,7 +133,7 @@ void Foam::vtkPV3Foam::addVolumeMesh
if (debug)
{
Info<< "converting points" << endl;
Info<< "... converting points" << endl;
}
// Convert Foam mesh vertices to VTK
......@@ -150,7 +150,7 @@ void Foam::vtkPV3Foam::addVolumeMesh
if (debug)
{
Info<< "converting cells" << endl;
Info<< "... converting cells" << endl;
}
vtkmesh->Allocate(mesh.nCells() + nAddCells);
......@@ -350,6 +350,11 @@ void Foam::vtkPV3Foam::addVolumeMesh
vtkmesh->SetPoints(vtkpoints);
vtkpoints->Delete();
if (debug)
{
Info<< "<end> Foam::vtkPV3Foam::addVolumeMesh" << endl;
}
}
......
......@@ -50,7 +50,7 @@ void Foam::vtkPV3Foam::convertMeshVolume
{
if (debug)
{
Info<< "entered Foam::vtkPV3Foam::convertMeshVolume" << endl;
Info<< "<beg> Foam::vtkPV3Foam::convertMeshVolume" << endl;
}
const selectionInfo& selector = selectInfoVolume_;
......@@ -88,6 +88,11 @@ void Foam::vtkPV3Foam::convertMeshVolume
selectedRegionDatasetIds_[regionId] = datasetId;
vtkmesh->Delete();
}
if (debug)
{
Info<< "<end> Foam::vtkPV3Foam::convertMeshVolume" << endl;
}
}
......@@ -98,7 +103,7 @@ void Foam::vtkPV3Foam::convertMeshLagrangian
{
if (debug)
{
Info<< "entered Foam::vtkPV3Foam::convertMeshLagrangian" << endl;
Info<< "<beg> Foam::vtkPV3Foam::convertMeshLagrangian" << endl;
}
const selectionInfo& selector = selectInfoLagrangian_;
......@@ -131,6 +136,10 @@ void Foam::vtkPV3Foam::convertMeshLagrangian
selectedRegionDatasetIds_[regionId] = datasetId;
vtkmesh->Delete();
}
if (debug)
{
Info<< "<end> Foam::vtkPV3Foam::convertMeshLagrangian" << endl;
}
}
......@@ -141,7 +150,7 @@ void Foam::vtkPV3Foam::convertMeshPatches
{
if (debug)
{
Info<< "entered Foam::vtkPV3Foam::convertMeshPatches" << endl;
Info<< "<beg> Foam::vtkPV3Foam::convertMeshPatches" << endl;
}
const selectionInfo& selector = selectInfoPatches_;
......@@ -196,6 +205,11 @@ void Foam::vtkPV3Foam::convertMeshPatches
vtkmesh->Delete();
}
}
if (debug)
{
Info<< "<end> Foam::vtkPV3Foam::convertMeshPatches" << endl;
}
}
......@@ -206,7 +220,7 @@ void Foam::vtkPV3Foam::convertMeshCellZones
{
if (debug)
{
Info<< "entered Foam::vtkPV3Foam::convertMeshCellZones" << endl;
Info<< "<beg> Foam::vtkPV3Foam::convertMeshCellZones" << endl;
}
const selectionInfo& selector = selectInfoCellZones_;
......@@ -263,6 +277,11 @@ void Foam::vtkPV3Foam::convertMeshCellZones
vtkmesh->Delete();
}
}
if (debug)
{
Info<< "<end> Foam::vtkPV3Foam::convertMeshCellZones" << endl;
}
}
......@@ -273,7 +292,7 @@ void Foam::vtkPV3Foam::convertMeshCellSet
{
if (debug)
{
Info<< "entered Foam::vtkPV3Foam::convertMeshCellSet" << endl;
Info<< "<beg> Foam::vtkPV3Foam::convertMeshCellSet" << endl;
}
const selectionInfo& selector = selectInfoCellSets_;
......@@ -337,6 +356,11 @@ void Foam::vtkPV3Foam::convertMeshCellSet
vtkmesh->Delete();
}
}
if (debug)
{
Info<< "<end> Foam::vtkPV3Foam::convertMeshCellSet" << endl;
}
}
void Foam::vtkPV3Foam::convertMeshFaceZones
......@@ -346,7 +370,7 @@ void Foam::vtkPV3Foam::convertMeshFaceZones
{
if (debug)
{
Info<< "entered Foam::vtkPV3Foam::convertMeshFaceZones" << endl;
Info<< "<beg> Foam::vtkPV3Foam::convertMeshFaceZones" << endl;
}
const selectionInfo& selector = selectInfoFaceZones_;
......@@ -393,6 +417,11 @@ void Foam::vtkPV3Foam::convertMeshFaceZones
vtkmesh->Delete();