ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-03-25 22:37:55 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rnv/pv58_1' into rnv/pv58_med410_1

Browse Source
This commit is contained in:
vsr 2020-03-03 08:07:17 +03:00
commit bd0e135749
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/SMDS/SMDS_MeshCell.cxx
View File

@ -490,10 +490,10 @@ void SMDS_MeshCell::init( SMDSAbs_EntityType theEntity,
bool SMDS_MeshCell::ChangeNodes(const SMDS_MeshNode* nodes[], const int theNbNodes) bool SMDS_MeshCell::ChangeNodes(const SMDS_MeshNode* nodes[], const int theNbNodes)
{ {
vtkIdType npts = 0; vtkIdType npts = 0;
vtkIdType *pts; vtkIdType *pts(nullptr);
vtkIdType const *tmp(nullptr); vtkIdType const *tmp(nullptr);
getGrid()->GetCellPoints( GetVtkID(), npts, tmp ); getGrid()->GetCellPoints( GetVtkID(), npts, tmp );
std::copy(tmp,tmp+npts,pts); pts = const_cast<vtkIdType *>(tmp);
if ( theNbNodes != npts ) if ( theNbNodes != npts )
{ {
MESSAGE("ChangeNodes problem: not the same number of nodes " << npts << " -> " << theNbNodes); MESSAGE("ChangeNodes problem: not the same number of nodes " << npts << " -> " << theNbNodes);

14
src/SMDS/SMDS_UnstructuredGrid.cxx
View File

@ -46,7 +46,7 @@ void SMDS_CellLinks::ResizeForPoint(vtkIdType vtkID)
if ( vtkID > this->MaxId ) if ( vtkID > this->MaxId )
{ {
this->MaxId = vtkID; this->MaxId = vtkID;
if ( vtkID >= this->Size ) if ( vtkID >= this->Size )
vtkCellLinks::Resize( vtkID+SMDS_Mesh::chunkSize ); vtkCellLinks::Resize( vtkID+SMDS_Mesh::chunkSize );
} }
} }
@ -249,7 +249,7 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
if ( newCellSize != oldCellSize ) if ( newCellSize != oldCellSize )
for ( int i = 0; i < oldCellSize - 1; ++i ) for ( int i = 0; i < oldCellSize - 1; ++i )
if ( this->Types->GetValue( i ) == VTK_EMPTY_CELL ) if ( this->Types->GetValue( i ) == VTK_EMPTY_CELL )
newConnectivitySize -= this->CellLocations->GetValue( i+1 ) - this->CellLocations->GetValue( i ); newConnectivitySize -= this->Connectivity->GetCellSize( i );
vtkCellArray *newConnectivity = vtkCellArray::New(); vtkCellArray *newConnectivity = vtkCellArray::New();
newConnectivity->Initialize(); newConnectivity->Initialize();
@ -320,12 +320,14 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
newFaceLocations->Squeeze(); newFaceLocations->Squeeze();
newFaces->Squeeze(); newFaces->Squeeze();
this->SetCells( newTypes, newLocations, newConnectivity, newFaceLocations, newFaces ); this->SetCells( newTypes, newLocations, newConnectivity, newFaceLocations, newFaces );
this->CellLocations = newLocations;
newFaceLocations->Delete(); newFaceLocations->Delete();
newFaces->Delete(); newFaces->Delete();
} }
else else
{ {
this->SetCells( newTypes, newLocations, newConnectivity, FaceLocations, Faces ); this->SetCells( newTypes, newLocations, newConnectivity, FaceLocations, Faces );
this->CellLocations = newLocations;
} }
newTypes->Delete(); newTypes->Delete();
@ -360,10 +362,11 @@ void SMDS_UnstructuredGrid::copyBloc(vtkUnsignedCharArray * newTypes,
{ {
int iOld = idCellsNewToOld[ iNew ]; int iOld = idCellsNewToOld[ iNew ];
newTypes->SetValue( iNew, this->Types->GetValue( iOld )); newTypes->SetValue( iNew, this->Types->GetValue( iOld ));
vtkIdType oldLoc = this->CellLocations->GetValue( iOld );
vtkIdType oldLoc = ((vtkIdTypeArray *)(this->Connectivity->GetOffsetsArray()))->GetValue( iOld );
vtkIdType nbpts; vtkIdType nbpts;
vtkIdType const *oldPtsCell(nullptr); vtkIdType const *oldPtsCell(nullptr);
this->Connectivity->GetCell( oldLoc, nbpts, oldPtsCell ); this->Connectivity->GetCell( oldLoc+iOld, nbpts, oldPtsCell );
if ((vtkIdType) pointsCell.size() < nbpts ) if ((vtkIdType) pointsCell.size() < nbpts )
pointsCell.resize( nbpts ); pointsCell.resize( nbpts );
for ( int l = 0; l < nbpts; l++ ) for ( int l = 0; l < nbpts; l++ )
@ -979,7 +982,7 @@ void SMDS_UnstructuredGrid::ModifyCellNodes(int vtkVolId, std::map<int, int> loc
vtkIdType const *tmp(nullptr); // will refer to the point id's of the face vtkIdType const *tmp(nullptr); // will refer to the point id's of the face
vtkIdType *pts; // will refer to the point id's of the face vtkIdType *pts; // will refer to the point id's of the face
this->GetCellPoints(vtkVolId, npts, tmp); this->GetCellPoints(vtkVolId, npts, tmp);
std::copy(tmp, tmp+npts, pts); pts = const_cast< vtkIdType*>( tmp );
for (int i = 0; i < npts; i++) for (int i = 0; i < npts; i++)
{ {
if (localClonedNodeIds.count(pts[i])) if (localClonedNodeIds.count(pts[i]))
@ -1204,4 +1207,3 @@ double SMDS_UnstructuredGrid::GetBallDiameter( vtkIdType vtkID ) const
return vtkDoubleArray::SafeDownCast( vtkDataSet::CellData->GetScalars() )->GetValue( vtkID ); return vtkDoubleArray::SafeDownCast( vtkDataSet::CellData->GetScalars() )->GetValue( vtkID );
return 0; return 0;
} }