ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-11-15 10:08:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

manually reverted commit d69e4fb6c7 to get good pyramides

Browse Source
This commit is contained in:
mbs 2024-10-15 09:43:07 +01:00
parent a1e2cdd1ed
commit 1b9b6aac15
2 changed files with 112 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

179
src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cxx
View File

@ -60,22 +60,22 @@ enum EQuadNature { NOT_QUAD, QUAD, DEGEN_QUAD, PYRAM_APEX = 4, TRIA_APEX = 0 };
// std-like iterator used to get coordinates of nodes of mesh element
typedef SMDS_StdIterator< SMESH_TNodeXYZ, SMDS_ElemIteratorPtr > TXyzIterator;
//================================================================================
/*!
* \brief Return ID of pyramid base face, for debug
*/
//================================================================================
int getFaceID(const SMDS_MeshElement* pyram)
{
if ( pyram )
if ( const SMDS_MeshElement* f = SMDS_Mesh::FindFace( pyram->GetNode(0),
pyram->GetNode(1),
pyram->GetNode(2),
pyram->GetNode(3)))
return f->GetID();
return -1;
}
// //================================================================================
// /*!
// * \brief Return ID of pyramid base face, for debug
// */
// //================================================================================
//
// int getFaceID(const SMDS_MeshElement* pyram)
// {
// if ( pyram )
// if ( const SMDS_MeshElement* f = SMDS_Mesh::FindFace( pyram->GetNode(0),
// pyram->GetNode(1),
// pyram->GetNode(2),
// pyram->GetNode(3)))
// return f->GetID();
// return -1;
// }
namespace
{
@ -537,49 +537,49 @@ void StdMeshers_QuadToTriaAdaptor::MergeAdjacent(const SMDS_MeshElement* PrmI
*/
//================================================================================
bool StdMeshers_QuadToTriaAdaptor::DecreaseHeightDifference( const SMDS_MeshElement* thePyram,
const double theH2 )
{
const double allowedFactor2 = 2. * 2.;
bool modif = false;
myNodes[0] = thePyram->GetNode( 3 );
for ( int i = 0; i < 4; ++i )
{
myNodes[1] = thePyram->GetNode( i );
SMDS_Mesh::GetElementsByNodes( myNodes, myAdjPyrams, SMDSAbs_Volume );
myNodes[0] = myNodes[1];
for ( const SMDS_MeshElement* pyramAdj : myAdjPyrams )
{
if ( pyramAdj == thePyram )
continue;
if ( !myPyramHeight2.IsBound( pyramAdj ))
continue;
double h2Adj = Abs( myPyramHeight2( pyramAdj ));
double h2 = Abs( theH2 );
if ( h2Adj > h2 )
{
if ( h2 * allowedFactor2 < h2Adj )
{
// bind negative value to allow finding pyramids whose height must change
myPyramHeight2.Bind( pyramAdj, - h2 * allowedFactor2 );
modif = true;
}
}
else
{
if ( h2Adj * allowedFactor2 < h2 )
{
// bind negative value to allow finding pyramids whose height must change
myPyramHeight2.Bind( thePyram, - h2Adj * allowedFactor2 );
modif = true;
}
}
}
}
return modif;
}
// bool StdMeshers_QuadToTriaAdaptor::DecreaseHeightDifference( const SMDS_MeshElement* thePyram,
// const double theH2 )
// {
// const double allowedFactor2 = 2. * 2.;
//
// bool modif = false;
// myNodes[0] = thePyram->GetNode( 3 );
// for ( int i = 0; i < 4; ++i )
// {
// myNodes[1] = thePyram->GetNode( i );
// SMDS_Mesh::GetElementsByNodes( myNodes, myAdjPyrams, SMDSAbs_Volume );
// myNodes[0] = myNodes[1];
//
// for ( const SMDS_MeshElement* pyramAdj : myAdjPyrams )
// {
// if ( pyramAdj == thePyram )
// continue;
// if ( !myPyramHeight2.IsBound( pyramAdj ))
// continue;
// double h2Adj = Abs( myPyramHeight2( pyramAdj ));
// double h2 = Abs( theH2 );
// if ( h2Adj > h2 )
// {
// if ( h2 * allowedFactor2 < h2Adj )
// {
// // bind negative value to allow finding pyramids whose height must change
// myPyramHeight2.Bind( pyramAdj, - h2 * allowedFactor2 );
// modif = true;
// }
// }
// else
// {
// if ( h2Adj * allowedFactor2 < h2 )
// {
// // bind negative value to allow finding pyramids whose height must change
// myPyramHeight2.Bind( thePyram, - h2Adj * allowedFactor2 );
// modif = true;
// }
// }
// }
// }
// return modif;
// }
//================================================================================
@ -614,11 +614,11 @@ StdMeshers_QuadToTriaAdaptor::~StdMeshers_QuadToTriaAdaptor()
//=======================================================================
static gp_Pnt FindBestPoint(const gp_Pnt& P1, const gp_Pnt& P2,
const gp_Pnt& PC, const gp_Vec& V,
double & shift)
const gp_Pnt& PC, const gp_Vec& V/*,
double & shift*/)
{
gp_Pnt Pbest = PC;
shift = 0;
//shift = 0;
const double a2 = P1.SquareDistance(P2);
const double b2 = P1.SquareDistance(PC);
const double c2 = P2.SquareDistance(PC);
@ -629,7 +629,7 @@ static gp_Pnt FindBestPoint(const gp_Pnt& P1, const gp_Pnt& P2,
const double Vsize = V.Magnitude();
if ( fabs( Vsize ) > std::numeric_limits<double>::min() )
{
shift = sqrt( a2 + (b2-c2)*(b2-c2)/16/a2 - (b2+c2)/2 );
const double shift = sqrt( a2 + (b2-c2)*(b2-c2)/16/a2 - (b2+c2)/2 );
Pbest.ChangeCoord() += shift * V.XYZ() / Vsize;
}
}
@ -1103,6 +1103,7 @@ bool StdMeshers_QuadToTriaAdaptor::Compute(SMESH_Mesh& aMesh,
case QUAD:
{
if(!isRev) VNorm.Reverse();
#if 0
//double xc = 0., yc = 0., zc = 0.;
double h, hMin = Precision::Infinite();
gp_Pnt PCbest = PC;
@ -1120,6 +1121,21 @@ bool StdMeshers_QuadToTriaAdaptor::Compute(SMESH_Mesh& aMesh,
}
}
//gp_Pnt PCbest(xc/4., yc/4., zc/4.);
#else
double xc = 0., yc = 0., zc = 0.;
int i = 1;
for(; i<=4; i++) {
gp_Pnt Pbest;
if(!isRev)
Pbest = FindBestPoint(PN(i), PN(i+1), PC, VN(i).Reversed());
else
Pbest = FindBestPoint(PN(i), PN(i+1), PC, VN(i));
xc += Pbest.X();
yc += Pbest.Y();
zc += Pbest.Z();
}
gp_Pnt PCbest(xc/4., yc/4., zc/4.);
#endif
// check PCbest
double height = PCbest.Distance(PC);
@ -1145,7 +1161,7 @@ bool StdMeshers_QuadToTriaAdaptor::Compute(SMESH_Mesh& aMesh,
myPyramids.push_back(aPyram);
//cout << "F" << face->GetID() << " - V" << aPyram->GetID() << endl;
myPyramHeight2.Bind( aPyram, PCbest.SquareDistance( PC ));
// myPyramHeight2.Bind( aPyram, PCbest.SquareDistance( PC ));
// add triangles to result map
helper->SetElementsOnShape( false );
@ -1354,7 +1370,7 @@ bool StdMeshers_QuadToTriaAdaptor::Compute(SMESH_Mesh& aMesh)
// -----------------------------------
// Find pyramid peak
#if 0
gp_XYZ PCbest = PC.XYZ();//(0., 0., 0.); // pyramid peak
double h, hMin = Precision::Infinite();
int i = 1;
@ -1368,6 +1384,15 @@ bool StdMeshers_QuadToTriaAdaptor::Compute(SMESH_Mesh& aMesh)
//PCbest += Pbest.XYZ();
}
//PCbest /= 4;
#else
gp_XYZ PCbest(0., 0., 0.); // pyramid peak
int i = 1;
for ( ; i <= 4; i++ ) {
gp_Pnt Pbest = FindBestPoint(PN(i), PN(i+1), PC, VN(i));
PCbest += Pbest.XYZ();
}
PCbest /= 4;
#endif
double height = PC.Distance(PCbest); // pyramid height to precise
if ( height < 1.e-6 ) {
@ -1525,12 +1550,13 @@ bool StdMeshers_QuadToTriaAdaptor::Compute2ndPart(SMESH_Mesh&
// check adjacent pyramids
// for ( i = 0; i < myPyramids.size(); ++i )
// {
// const SMDS_MeshElement* PrmI = myPyramids[i];
// MergeAdjacent( PrmI, nodesToMove );
// }
#if 1
for ( i = 0; i < myPyramids.size(); ++i )
{
const SMDS_MeshElement* PrmI = myPyramids[i];
MergeAdjacent( PrmI, nodesToMove );
}
#else
// Fix adjacent pyramids whose heights differ too much
myNodes.resize(2);
@ -1557,6 +1583,7 @@ bool StdMeshers_QuadToTriaAdaptor::Compute2ndPart(SMESH_Mesh&
gp_Pnt newApex = gp_Pnt( PC ).Translated( h * V.Normalized() );
meshDS->MoveNode( Papex.Node(), newApex.X(), newApex.Y(), newApex.Z() );
}
#endif
// iterate on all new pyramids
vector< const SMDS_MeshElement* > suspectPyrams;
@ -1644,7 +1671,7 @@ bool StdMeshers_QuadToTriaAdaptor::Compute2ndPart(SMESH_Mesh&
if ( nbc == 4 )
continue; // pyrams have a common base face
if ( nbc > 1 )
if (nbc > 0) //( nbc > 1 )
{
// Merge the two pyramids and others already merged with them
MergePiramids( PrmI, PrmJ, nodesToMove );
@ -1680,9 +1707,11 @@ bool StdMeshers_QuadToTriaAdaptor::Compute2ndPart(SMESH_Mesh&
nodesToMove.insert( aNode2 );
//cout << "Limit H F" << getFaceID( PrmI ) << " - F" << getFaceID( PrmJ ) << endl;
}
#if 1
// fix intersections that can appear after apex movement
//MergeAdjacent( PrmI, nodesToMove );
//MergeAdjacent( PrmJ, nodesToMove );
MergeAdjacent( PrmI, nodesToMove );
MergeAdjacent( PrmJ, nodesToMove );
#endif
apexI = PrmI->GetNode( PYRAM_APEX ); // apexI can be removed by merge
@ -1692,12 +1721,14 @@ bool StdMeshers_QuadToTriaAdaptor::Compute2ndPart(SMESH_Mesh&
} // loop on all pyramids
#if 0
//smIdType nbNodes = aMesh.NbNodes();
for ( i = 0; i < myPyramids.size(); ++i )
{
const SMDS_MeshElement* PrmI = myPyramids[i];
MergeAdjacent( PrmI, nodesToMove );
}
#endif
if( !nodesToMove.empty() && !meshDS->IsEmbeddedMode() )
{

14
src/StdMeshers/StdMeshers_QuadToTriaAdaptor.hxx
View File

@ -44,7 +44,7 @@ class gp_Vec;
#include <vector>
#include <TopoDS_Shape.hxx>
#include <NCollection_DataMap.hxx>
//#include <NCollection_DataMap.hxx>
/*!
* \brief "Transforms" quadrilateral faces into triangular ones by creation of pyramids
@ -94,19 +94,19 @@ protected:
std::set<const SMDS_MeshNode*>& nodesToMove,
const bool isRecursion = false);
bool DecreaseHeightDifference( const SMDS_MeshElement* pyram,
const double h2 );
// bool DecreaseHeightDifference( const SMDS_MeshElement* pyram,
// const double h2 );
TopoDS_Shape myShape;
std::set<const SMDS_MeshElement*> myRemovedTrias;
std::list< const SMDS_MeshNode* > myDegNodes;
const SMESH_ElementSearcher* myElemSearcher;
NCollection_DataMap< const SMDS_MeshElement*, double > myPyramHeight2;
// NCollection_DataMap< const SMDS_MeshElement*, double > myPyramHeight2;
// work buffers of DecreaseHeightDifference()
std::vector< const SMDS_MeshElement* > myAdjPyrams;
std::vector<const SMDS_MeshNode *> myNodes;
// // work buffers of DecreaseHeightDifference()
// std::vector< const SMDS_MeshElement* > myAdjPyrams;
// std::vector<const SMDS_MeshNode *> myNodes;
};
#endif