diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.cxx b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.cxx index 0d99f3e95b34be1b5cbb1684248104e4aaf8d127..47e919c9c310efda544786f239c8904977f4ee55 100644 --- a/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.cxx +++ b/applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.cxx @@ -50,6 +50,7 @@ vtkPV3FoamReader::vtkPV3FoamReader() output0_ = NULL; +#ifdef VTKPV3FOAM_DUALPORT // Add second output for the Lagrangian this->SetNumberOfOutputPorts(2); vtkMultiBlockDataSet *lagrangian = vtkMultiBlockDataSet::New(); @@ -57,6 +58,7 @@ vtkPV3FoamReader::vtkPV3FoamReader() this->GetExecutive()->SetOutputData(1, lagrangian); lagrangian->Delete(); +#endif TimeStepRange[0] = 0; TimeStepRange[1] = 0; @@ -319,15 +321,6 @@ int vtkPV3FoamReader::RequestData ) ); - vtkMultiBlockDataSet* lagrangianOutput = vtkMultiBlockDataSet::SafeDownCast - ( - outputVector->GetInformationObject(1)->Get - ( - vtkMultiBlockDataSet::DATA_OBJECT() - ) - ); - - if (Foam::vtkPV3Foam::debug) { cout<< "update output with " @@ -376,7 +369,21 @@ int vtkPV3FoamReader::RequestData #else - foamData_->Update(output, lagrangianOutput); +#ifdef VTKPV3FOAM_DUALPORT + foamData_->Update + ( + output, + vtkMultiBlockDataSet::SafeDownCast + ( + outputVector->GetInformationObject(1)->Get + ( + vtkMultiBlockDataSet::DATA_OBJECT() + ) + ); + ); +#else + foamData_->Update(output, output); +#endif if (ShowPatchNames) { diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C index 624358b4a0dcb39fd26e885c8597a6672b787bf2..118e99fc9101c2fd64a0cddae1c6a9e28c198008 100644 --- a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C +++ b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C @@ -465,7 +465,6 @@ void Foam::vtkPV3Foam::Update cout<< "<beg> Foam::vtkPV3Foam::Update - output with " << output->GetNumberOfBlocks() << " and " << lagrangianOutput->GetNumberOfBlocks() << " blocks\n"; - output->Print(cout); lagrangianOutput->Print(cout); printMemory(); @@ -504,8 +503,10 @@ void Foam::vtkPV3Foam::Update reader_->UpdateProgress(0.7); } +#ifdef VTKPV3FOAM_DUALPORT // restart port1 at block=0 blockNo = 0; +#endif convertMeshLagrangian(lagrangianOutput, blockNo); reader_->UpdateProgress(0.8); diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H index c6dd65af9ecfe79c8f16e14af1a8a48ecd93b440..4e203eacec8e83c9f720257c21870c039a9ef5a4 100644 --- a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H +++ b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H @@ -71,6 +71,8 @@ SourceFiles #include "PrimitivePatchInterpolation.H" #include "volPointInterpolation.H" +#undef VTKPV3FOAM_DUALPORT + // * * * * * * * * * * * * * Forward Declarations * * * * * * * * * * * * * // class vtkDataArraySelection;