ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-26 09:20:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix regression of #17828: Polyhedron Mesh volume calculation

Browse Source
This commit is contained in:
eap 2020-02-18 14:39:31 +03:00
parent 48d9b5a07c
commit 3e0873e7ff
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/SMDS/SMDS_VolumeTool.cxx
View File

@ -708,19 +708,9 @@ double SMDS_VolumeTool::GetSize() const
SaveFacet savedFacet( myCurFace ); SaveFacet savedFacet( myCurFace );
// get an origin not lying in plane of any facet
int faceIndex = std::max( myCurFace.myIndex, 0 );
setFace( faceIndex );
double minProj, maxProj;
XYZ normal, origin;
projectNodesToNormal( faceIndex, minProj, maxProj, normal.data());
GetFaceBaryCenter( faceIndex, origin.x, origin.y, origin.z );
origin.x += normal.x * ( maxProj - minProj ) * 1e-1;
origin.y += normal.y * ( maxProj - minProj ) * 1e-2;
origin.z += normal.z * ( maxProj - minProj ) * 1e-3;
// split a polyhedron into tetrahedrons // split a polyhedron into tetrahedrons
bool oriOk = true;
SMDS_VolumeTool* me = const_cast< SMDS_VolumeTool* > ( this ); SMDS_VolumeTool* me = const_cast< SMDS_VolumeTool* > ( this );
for ( int f = 0; f < NbFaces(); ++f ) for ( int f = 0; f < NbFaces(); ++f )
{ {
@ -732,9 +722,12 @@ double SMDS_VolumeTool::GetSize() const
area = area + p1.Crossed( p2 ); area = area + p1.Crossed( p2 );
p1 = p2; p1 = p2;
} }
V += ( p1 - origin ).Dot( area ); V += p1.Dot( area );
oriOk = oriOk && IsFaceExternal( f );
} }
V /= 6; V /= 6;
if ( !oriOk && V > 0 )
V *= -1;
} }
else else
{ {