Merge branch V7_3_1_BR

[modules/paravis.git] / src / Plugins / MEDReader / IO / vtkELNOSurfaceFilter.cxx

diff --git a/src/Plugins/MEDReader/IO/vtkELNOSurfaceFilter.cxx b/src/Plugins/MEDReader/IO/vtkELNOSurfaceFilter.cxx
index 31fdbce91de7b31f4cdbc17703e71b6710737f87..c9c0cd27f1568e5910050d710a8388c40b19dae2 100644 (file)
--- a/src/Plugins/MEDReader/IO/vtkELNOSurfaceFilter.cxx
+++ b/src/Plugins/MEDReader/IO/vtkELNOSurfaceFilter.cxx
@@ -3,7 +3,7 @@
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -47,8 +47,7 @@ vtkELNOSurfaceFilter::~vtkELNOSurfaceFilter()
 {
 }
 
-int vtkELNOSurfaceFilter::RequestData(vtkInformation *request,
-    vtkInformationVector **input, vtkInformationVector *output)
+int vtkELNOSurfaceFilter::RequestData(vtkInformation *request, vtkInformationVector **input, vtkInformationVector *output)
 {
   vtkUnstructuredGrid *usgIn=vtkUnstructuredGrid::SafeDownCast(
       input[0]->GetInformationObject(0)->Get(vtkDataObject::DATA_OBJECT()));
@@ -92,7 +91,7 @@ int vtkELNOSurfaceFilter::RequestData(vtkInformation *request,
 
   if(originalPointIds==NULL)
   {
-    vtkErrorMacro("vtkPVGeometryFilter return NULL 'vtkOriginalPointIds' array");
+    vtkErrorMacro("It appears that your dataset is not reduced using vtkPVGeometryFilter (NULL 'vtkOriginalPointIds).\n==================================================================================================\nProbably your dataset is not 3D.\nIf it is not a 3D dataset you are expected to use ELNO Mesh filter instead of ELNO Surface filter.\n==================================================================================================\n");
     return 0;
   }