From 869a14b9efbb13149b914280496735da76682d18 Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Tue, 21 Feb 2017 09:23:42 +0100 Subject: [PATCH] Fix compilation error on parallel mode due to introduction of new property key --- src/Plugins/MEDReader/IO/vtkMEDReader.cxx | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) mode change 100644 => 100755 src/Plugins/MEDReader/IO/vtkMEDReader.cxx diff --git a/src/Plugins/MEDReader/IO/vtkMEDReader.cxx b/src/Plugins/MEDReader/IO/vtkMEDReader.cxx old mode 100644 new mode 100755 index 7f5f07a9..65de650b --- a/src/Plugins/MEDReader/IO/vtkMEDReader.cxx +++ b/src/Plugins/MEDReader/IO/vtkMEDReader.cxx @@ -435,21 +435,15 @@ int vtkMEDReader::RequestData(vtkInformation *request, vtkInformationVector **in double reqTS(0.); if(outInfo->Has(vtkStreamingDemandDrivenPipeline::UPDATE_TIME_STEP())) reqTS=outInfo->Get(vtkStreamingDemandDrivenPipeline::UPDATE_TIME_STEP()); -#ifndef MEDREADER_USE_MPI ExportedTinyInfo ti; +#ifndef MEDREADER_USE_MPI this->FillMultiBlockDataSetInstance(output,reqTS,&ti); - if(!ti.empty()) - { - const std::vector& data(ti.getData()); - outInfo->Set(vtkMEDReader::GAUSS_DATA(),&data[0],data.size()); - request->Append(vtkExecutive::KEYS_TO_COPY(),vtkMEDReader::GAUSS_DATA());// Thank you to SciberQuest and DIPOLE_CENTER ! Don't understand why ! In RequestInformation it does not work ! - } #else if(this->Internal->GCGCP) { vtkSmartPointer gcg(vtkSmartPointer::New()); { - vtkDataSet *ret(RetrieveDataSetAtTime(reqTS)); + vtkDataSet *ret(RetrieveDataSetAtTime(reqTS,&ti)); gcg->SetInputData(ret); ret->Delete(); } @@ -459,8 +453,14 @@ int vtkMEDReader::RequestData(vtkInformation *request, vtkInformationVector **in output->SetBlock(0,gcg->GetOutput()); } else - this->FillMultiBlockDataSetInstance(output,reqTS); + this->FillMultiBlockDataSetInstance(output,reqTS,&ti); #endif + if(!ti.empty()) + { + const std::vector& data(ti.getData()); + outInfo->Set(vtkMEDReader::GAUSS_DATA(),&data[0],data.size()); + request->Append(vtkExecutive::KEYS_TO_COPY(),vtkMEDReader::GAUSS_DATA());// Thank you to SciberQuest and DIPOLE_CENTER ! Don't understand why ! In RequestInformation it does not work ! + } output->GetInformation()->Set(vtkDataObject::DATA_TIME_STEP(),reqTS); // Is it really needed ? TODO this->UpdateSIL(request, outInfo); -- 2.39.2