From: Pascal Obry <pascal.obry@edf.fr>
Date: Thu, 20 Feb 2020 14:38:56 +0000 (+0100)
Subject: SMDS: Fix use of this->CellLocations due to vtk changes.
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4d2c77ba554fb49238ba3b0737236beda02d4a32;p=modules%2Fsmesh.git

SMDS: Fix use of this->CellLocations due to vtk changes.

This fixes many smesh tests. 159 where failing (out of 160)
and now only 59 are failing. So 100 tests fixed.
---

diff --git a/src/SMDS/SMDS_UnstructuredGrid.cxx b/src/SMDS/SMDS_UnstructuredGrid.cxx
index 0a928ad11..ce46543bf 100644
--- a/src/SMDS/SMDS_UnstructuredGrid.cxx
+++ b/src/SMDS/SMDS_UnstructuredGrid.cxx
@@ -320,12 +320,14 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
     newFaceLocations->Squeeze();
     newFaces->Squeeze();
     this->SetCells( newTypes, newLocations, newConnectivity, newFaceLocations, newFaces );
+    this->CellLocations = newLocations;
     newFaceLocations->Delete();
     newFaces->Delete();
   }
   else
   {
     this->SetCells( newTypes, newLocations, newConnectivity, FaceLocations, Faces );
+    this->CellLocations = newLocations;
   }
 
   newTypes->Delete();
@@ -360,7 +362,8 @@ void SMDS_UnstructuredGrid::copyBloc(vtkUnsignedCharArray *  newTypes,
   {
     int iOld = idCellsNewToOld[ iNew ];
     newTypes->SetValue( iNew, this->Types->GetValue( iOld ));
-    vtkIdType oldLoc = this->CellLocations->GetValue( iOld );
+
+    vtkIdType oldLoc = ((vtkIdTypeArray *)(this->Connectivity->GetOffsetsArray()))->GetValue( iOld );
     vtkIdType nbpts;
     vtkIdType const *oldPtsCell(nullptr);
     this->Connectivity->GetCell( oldLoc, nbpts, oldPtsCell );