-// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2023 CEA, EDF, OPEN CASCADE
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
#include "SMDS_IteratorOnIterators.hxx"
#include "SMDS_SetIterator.hxx"
+#include "SMDS_VolumeTool.hxx"
#include "SMESHDS_GroupBase.hxx"
#include "SMESHDS_Mesh.hxx"
#include "SMESH_Algo.hxx"
// 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;
+}
+
namespace
{
//================================================================================
PrmJ->GetNodeIndex( otherFaceNode ) >= 0 ))
continue; // f is a base quadrangle
- // check projections of face direction (baOFN) to triange normals (nI and nJ)
+ // check projections of face direction (baOFN) to triangle normals (nI and nJ)
gp_Vec baOFN( base2, SMESH_TNodeXYZ( otherFaceNode ));
if ( nI * baOFN > 0 && nJ * baOFN > 0 &&
baI* baOFN > 0 && baJ* baOFN > 0 ) // issue 0023212
meshDS->RemoveFreeNode( nodesToRemove[i], sm, /*fromGroups=*/false);
}
}
+ return;
}
//================================================================================
return false; // == "algo fails"
}
+
+ //================================================================================
+ /*!
+ * \brief Check if a face is in a SOLID
+ */
+ //================================================================================
+
+ bool isInSolid( vector<const SMDS_MeshNode*> & faceNodes,
+ const int nbNodes,
+ const int solidID )
+ {
+ if ( !faceNodes[0] )
+ return true; // NOT_QUAD
+ for ( int i = 0; i < nbNodes; ++i )
+ {
+ int shapeID = faceNodes[i]->GetShapeID();
+ if ( shapeID == solidID )
+ return true;
+ }
+ faceNodes.resize( nbNodes );
+ std::vector<const SMDS_MeshElement*> vols;
+ SMDS_Mesh::GetElementsByNodes( faceNodes, vols, SMDSAbs_Volume );
+ bool inSolid = false;
+ for ( size_t i = 0; i < vols.size() && !inSolid; ++i )
+ {
+ int shapeID = vols[i]->GetShapeID();
+ inSolid = ( shapeID == solidID );
+ }
+ faceNodes.push_back( faceNodes[0] );
+ return inSolid;
+ }
}
//================================================================================
const SMDS_MeshElement* PrmJ,
set<const SMDS_MeshNode*> & nodesToMove)
{
- // cout << endl << "Merge " << PrmI->GetID() << " " << PrmJ->GetID() << " "
- // << PrmI->GetNode(4) << PrmJ->GetNode(4) << endl;
const SMDS_MeshNode* Nrem = PrmJ->GetNode(4); // node to remove
//int nbJ = Nrem->NbInverseElements( SMDSAbs_Volume );
SMESH_TNodeXYZ Pj( Nrem );
if ( CommonNode == Nrem ) return; // already merged
//int nbI = CommonNode->NbInverseElements( SMDSAbs_Volume );
SMESH_TNodeXYZ Pi( CommonNode );
- gp_XYZ Pnew = /*( nbI*Pi + nbJ*Pj ) / (nbI+nbJ);*/ 0.5 * ( Pi + Pj );
+ // gp_XYZ Pnew = /*( nbI*Pi + nbJ*Pj ) / (nbI+nbJ);*/ 0.5 * ( Pi + Pj );
+
+ SMDS_VolumeTool volumeTool;
+ double pyrad1Vol = 0.0;
+ double pyrad2Vol = 0.0;
+ // To get the pyramids vols
+ if ( volumeTool.Set( PrmI ) )
+ pyrad1Vol = volumeTool.GetSize();
+ if ( volumeTool.Set( PrmJ ) )
+ pyrad2Vol = volumeTool.GetSize();
+
+ typedef SMDS_StdIterator< const SMDS_MeshElement*, SMDS_ElemIteratorPtr > elemIterator;
+ elemIterator iteratorsEnd;
+
+ vector< const SMDS_MeshElement* > associatedElementsI ( elemIterator( CommonNode->GetInverseElementIterator(SMDSAbs_Volume)), iteratorsEnd);
+ if ( associatedElementsI.size() > 1 )
+ for ( size_t i = 0; i < associatedElementsI.size(); ++i )
+ {
+ const SMDS_MeshElement* element = associatedElementsI[i];
+ if ( element != PrmI && volumeTool.Set( element ) )
+ pyrad1Vol += volumeTool.GetSize();
+ }
+ vector< const SMDS_MeshElement* > associatedElementsJ ( elemIterator( Nrem->GetInverseElementIterator(SMDSAbs_Volume)), iteratorsEnd);
+ if ( associatedElementsJ.size() > 1 )
+ for ( size_t i = 0; i < associatedElementsJ.size(); ++i )
+ {
+ const SMDS_MeshElement* element = associatedElementsJ[i];
+ if ( element != PrmJ && volumeTool.Set( element ) )
+ pyrad2Vol += volumeTool.GetSize(); //associatedVolPyramid->GetSize();
+ }
+
+ double totalVol = pyrad1Vol + pyrad2Vol;
+ // The new Apex can't be computed based in an arithmetic median,
+ // Geometric mediam is considered to be better
+ // gp_XYZ Pnew = /*( nbI*Pi + nbJ*Pj ) / (nbI+nbJ);*/ 0.5 * ( Pi + Pj );
+ ASSERT( totalVol > 0. );
+ gp_XYZ Pnew = Pi * pyrad1Vol/totalVol + Pj * pyrad2Vol/totalVol;
+
CommonNode->setXYZ( Pnew.X(), Pnew.Y(), Pnew.Z() );
nodesToMove.insert( CommonNode );
nodesToMove.erase ( Nrem );
+ //cout << "MergePiramids F" << getFaceID( PrmI ) << " - F" << getFaceID( PrmJ ) << endl;
+
typedef SMDS_StdIterator< const SMDS_MeshElement*, SMDS_ElemIteratorPtr > TStdElemIterator;
TStdElemIterator itEnd;
+ typedef std::map< const SMDS_MeshNode*, const SMDS_MeshNode* > TNNMap;
+ TNNMap mediumReplaceMap;
+
// find and remove coincided faces of merged pyramids
vector< const SMDS_MeshElement* > inverseElems
// copy inverse elements to avoid iteration on changing container
}
if ( FJEqual )
{
+ if ( FJEqual->NbNodes() == 6 ) // find medium nodes to replace
+ {
+ mediumReplaceMap.insert( std::make_pair( FJEqual->GetNode(3), FI->GetNode(5) ));
+ mediumReplaceMap.insert( std::make_pair( FJEqual->GetNode(5), FI->GetNode(3) ));
+ }
removeTmpElement( FI );
removeTmpElement( FJEqual );
myRemovedTrias.insert( FI );
const SMDS_MeshElement* elem = inverseElems[i];
nodes.assign( elem->begin_nodes(), elem->end_nodes() );
nodes[ elem->GetType() == SMDSAbs_Volume ? PYRAM_APEX : TRIA_APEX ] = CommonNode;
+ if ( !mediumReplaceMap.empty() )
+ for ( size_t iN = elem->NbCornerNodes(); iN < nodes.size(); ++iN )
+ {
+ TNNMap::iterator n2n = mediumReplaceMap.find( nodes[iN] );
+ if ( n2n != mediumReplaceMap.end() )
+ nodes[iN] = n2n->second;
+ }
GetMeshDS()->ChangeElementNodes( elem, &nodes[0], nodes.size());
}
ASSERT( Nrem->NbInverseElements() == 0 );
GetMeshDS()->RemoveFreeNode( Nrem,
GetMeshDS()->MeshElements( Nrem->getshapeId()),
/*fromGroups=*/false);
+ if ( !mediumReplaceMap.empty() )
+ for ( TNNMap::iterator n2n = mediumReplaceMap.begin(); n2n != mediumReplaceMap.end(); ++n2n )
+ {
+ const SMDS_MeshNode* remNode = n2n->first;
+ if ( !remNode->IsNull() && remNode->NbInverseElements() == 0 )
+ GetMeshDS()->RemoveFreeNode( remNode, 0, /*fromGroups=*/false);
+ }
+ return;
}
//================================================================================
{
TIDSortedElemSet adjacentPyrams;
bool mergedPyrams = false;
- for ( int k=0; k<4; k++ ) // loop on 4 base nodes of PrmI
+ for ( int k = 0; k < 4; k++ ) // loop on 4 base nodes of PrmI
{
const SMDS_MeshNode* n = PrmI->GetNode(k);
SMDS_ElemIteratorPtr vIt = n->GetInverseElementIterator( SMDSAbs_Volume );
for (prm = adjacentPyrams.begin(); prm != adjacentPyrams.end(); ++prm)
MergeAdjacent( *prm, nodesToMove, true );
}
+ return;
}
+//================================================================================
+/*!
+ * \brief Decrease height of a given or adjacent pyramids if height difference
+ * is too large
+ * \param [in] pyram - a pyramid to treat
+ * \param [inout] h2 - pyramid's square height
+ * \return bool - true if the height changes
+ */
+//================================================================================
+
+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;
+}
+
+
//================================================================================
/*!
* \brief Constructor
//=======================================================================
static gp_Pnt FindBestPoint(const gp_Pnt& P1, const gp_Pnt& P2,
- const gp_Pnt& PC, const gp_Vec& V)
+ const gp_Pnt& PC, const gp_Vec& V,
+ double & shift)
{
gp_Pnt Pbest = PC;
+ shift = 0;
const double a2 = P1.SquareDistance(P2);
const double b2 = P1.SquareDistance(PC);
const double c2 = P2.SquareDistance(PC);
const double Vsize = V.Magnitude();
if ( fabs( Vsize ) > std::numeric_limits<double>::min() )
{
- const double shift = sqrt( a2 + (b2-c2)*(b2-c2)/16/a2 - (b2+c2)/2 );
+ shift = sqrt( a2 + (b2-c2)*(b2-c2)/16/a2 - (b2+c2)/2 );
Pbest.ChangeCoord() += shift * V.XYZ() / Vsize;
}
}
// and a segment [PC,P]
//=======================================================================
-static bool HasIntersection3(const gp_Pnt& P, const gp_Pnt& PC, gp_Pnt& Pint,
+static bool HasIntersection3(const gp_Pnt& P, const gp_Pnt& PC, gp_Pnt& Pint,
const gp_Pnt& P1, const gp_Pnt& P2, const gp_Pnt& P3)
{
const double EPSILON = 1e-6;
Pint = orig + dir * t;
- return ( t > 0. && t < segLen );
+ bool hasInt = ( t > 0. && t < segLen );
+
+ if ( hasInt && det < EPSILON ) // t is inaccurate, additionally check
+ {
+ gp_XYZ triNorm = edge1 ^ edge2;
+ gp_XYZ int0vec = Pint.XYZ() - vert0;
+ gp_XYZ in = triNorm ^ edge1; // dir inside triangle from edge1
+ double dot = int0vec * in;
+ if ( dot < 0 && dot / triNorm.Modulus() < -EPSILON )
+ return false;
+ in = edge2 ^ triNorm;
+ dot = int0vec * in;
+ if ( dot < 0 && dot / triNorm.Modulus() < -EPSILON )
+ return false;
+ gp_XYZ int1vec = Pint.XYZ() - vert1;
+ in = triNorm ^ ( vert2 - vert1 );
+ dot = int1vec * in;
+ if ( dot < 0 && dot / triNorm.Modulus() < -EPSILON )
+ return false;
+ }
+ return hasInt;
}
//=======================================================================
//function : HasIntersection
-//purpose : Auxilare for CheckIntersection()
+//purpose : Auxiliary for CheckIntersection()
//=======================================================================
static bool HasIntersection(const gp_Pnt& P, const gp_Pnt& PC, gp_Pnt& Pint,
{
SMESH_ProxyMesh::setMesh( aMesh );
- if ( aShape.ShapeType() != TopAbs_SOLID &&
- aShape.ShapeType() != TopAbs_SHELL )
+ if ( aShape.ShapeType() != TopAbs_SOLID )
return false;
myShape = aShape;
const SMESHDS_SubMesh * aSubMeshDSFace;
SMESHDS_Mesh * meshDS = aMesh.GetMeshDS();
- SMESH_MesherHelper helper(aMesh);
- helper.IsQuadraticSubMesh(aShape);
- helper.SetElementsOnShape( true );
+ SMESH_MesherHelper helper1(aMesh);
+ helper1.IsQuadraticSubMesh(aShape);
if ( myElemSearcher ) delete myElemSearcher;
vector< SMDS_ElemIteratorPtr > itVec;
vector<const SMDS_MeshNode*> FNodes(5);
gp_Pnt PC;
gp_Vec VNorm;
+ const int solidID = meshDS->ShapeToIndex( aShape );
for ( TopExp_Explorer exp(aShape,TopAbs_FACE); exp.More(); exp.Next() )
{
aSubMeshDSFace = aProxyMesh->GetSubMesh( aShapeFace );
else
aSubMeshDSFace = meshDS->MeshElements( aShapeFace );
+ if ( !aSubMeshDSFace )
+ continue;
vector<const SMDS_MeshElement*> trias, quads;
bool hasNewTrias = false;
- if ( aSubMeshDSFace )
+ const bool toCheckFaceInSolid =
+ aProxyMesh ? aProxyMesh->HasPrismsOnTwoSides( meshDS->MeshElements( aShapeFace )) : false;
+ if ( toCheckFaceInSolid && !dynamic_cast< const SMESH_ProxyMesh::SubMesh* >( aSubMeshDSFace ))
+ continue; // no room for pyramids as prisms are on both sides
+
{
- bool isRev = false;
- if ( helper.NbAncestors( aShapeFace, aMesh, aShape.ShapeType() ) > 1 )
- isRev = helper.IsReversedSubMesh( TopoDS::Face(aShapeFace) );
+ bool isRevGlob = false;
+ SMESH_MesherHelper helper2( aMesh );
+ PShapeIteratorPtr sIt = helper2.GetAncestors( aShapeFace, aMesh, aShape.ShapeType() );
+ while ( const TopoDS_Shape * solid = sIt->next() )
+ if ( !solid->IsSame( aShape ))
+ {
+ isRevGlob = helper2.IsReversedSubMesh( TopoDS::Face( aShapeFace ));
+ if ( toCheckFaceInSolid )
+ helper2.IsQuadraticSubMesh( *solid );
+ break;
+ }
SMDS_ElemIteratorPtr iteratorElem = aSubMeshDSFace->GetElements();
while ( iteratorElem->more() ) // loop on elements on a geometrical face
{
const SMDS_MeshElement* face = iteratorElem->next();
+
// preparation step to get face info
- int stat = Preparation(face, PN, VN, FNodes, PC, VNorm);
+ int stat = Preparation( face, PN, VN, FNodes, PC, VNorm );
+
+ bool isRev = isRevGlob;
+ SMESH_MesherHelper* helper = &helper1;
+ if ( toCheckFaceInSolid && !isInSolid( FNodes, face->NbCornerNodes(), solidID ))
+ {
+ isRev = !isRevGlob;
+ helper = &helper2;
+ }
+
switch ( stat )
{
case NOT_QUAD:
// degenerate face
// add triangles to result map
SMDS_MeshFace* NewFace;
+ helper->SetElementsOnShape( false );
if(!isRev)
- NewFace = meshDS->AddFace( FNodes[0], FNodes[1], FNodes[2] );
+ NewFace = helper->AddFace( FNodes[0], FNodes[1], FNodes[2] );
else
- NewFace = meshDS->AddFace( FNodes[0], FNodes[2], FNodes[1] );
+ NewFace = helper->AddFace( FNodes[0], FNodes[2], FNodes[1] );
storeTmpElement( NewFace );
trias.push_back ( NewFace );
quads.push_back( face );
case QUAD:
{
if(!isRev) VNorm.Reverse();
- double xc = 0., yc = 0., zc = 0.;
+ //double xc = 0., yc = 0., zc = 0.;
+ double h, hMin = Precision::Infinite();
+ gp_Pnt PCbest = PC;
int i = 1;
for(; i<=4; i++) {
gp_Pnt Pbest;
if(!isRev)
- Pbest = FindBestPoint(PN(i), PN(i+1), PC, VN(i).Reversed());
+ Pbest = FindBestPoint(PN(i), PN(i+1), PC, VN(i).Reversed(), h);
else
- Pbest = FindBestPoint(PN(i), PN(i+1), PC, VN(i));
- xc += Pbest.X();
- yc += Pbest.Y();
- zc += Pbest.Z();
+ Pbest = FindBestPoint(PN(i), PN(i+1), PC, VN(i), h);
+ if ( 0 < h && h < hMin )
+ {
+ PCbest = Pbest;
+ hMin = h;
+ }
}
- gp_Pnt PCbest(xc/4., yc/4., zc/4.);
+ //gp_Pnt PCbest(xc/4., yc/4., zc/4.);
// check PCbest
double height = PCbest.Distance(PC);
if ( !LimitHeight( PCbest, PC, PN, FNodes, aMesh, face, /*UseApexRay=*/true, aShape ))
return false;
}
- // create node for PCbest
- SMDS_MeshNode* NewNode = helper.AddNode( PCbest.X(), PCbest.Y(), PCbest.Z() );
+ // create node at PCbest
+ helper->SetElementsOnShape( true );
+ SMDS_MeshNode* NewNode = helper->AddNode( PCbest.X(), PCbest.Y(), PCbest.Z() );
+
+ // create a pyramid
+ SMDS_MeshVolume* aPyram;
+ if ( isRev )
+ aPyram = helper->AddVolume( FNodes[0], FNodes[3], FNodes[2], FNodes[1], NewNode );
+ else
+ aPyram = helper->AddVolume( FNodes[0], FNodes[1], FNodes[2], FNodes[3], NewNode );
+ myPyramids.push_back(aPyram);
+ //cout << "F" << face->GetID() << " - V" << aPyram->GetID() << endl;
+
+ myPyramHeight2.Bind( aPyram, PCbest.SquareDistance( PC ));
// add triangles to result map
- for(i=0; i<4; i++)
+ helper->SetElementsOnShape( false );
+ for ( i = 0; i < 4; i++ )
{
- trias.push_back ( meshDS->AddFace( NewNode, FNodes[i], FNodes[i+1] ));
+ trias.push_back ( helper->AddFace( NewNode, FNodes[i], FNodes[i+1] ));
storeTmpElement( trias.back() );
}
- // create a pyramid
- if ( isRev ) swap( FNodes[1], FNodes[3]);
- SMDS_MeshVolume* aPyram =
- helper.AddVolume( FNodes[0], FNodes[1], FNodes[2], FNodes[3], NewNode );
- myPyramids.push_back(aPyram);
quads.push_back( face );
hasNewTrias = true;
vector<const SMDS_MeshElement*> myPyramids;
SMESH_MesherHelper helper(aMesh);
helper.IsQuadraticSubMesh(aMesh.GetShapeToMesh());
- helper.SetElementsOnShape( true );
SMESHDS_Mesh * meshDS = aMesh.GetMeshDS();
SMESH_ProxyMesh::SubMesh* prxSubMesh = getProxySubMesh();
if ( !myElemSearcher )
myElemSearcher = SMESH_MeshAlgos::GetElementSearcher( *meshDS );
- SMESH_ElementSearcher* searcher = const_cast<SMESH_ElementSearcher*>(myElemSearcher);
+ SMESH_ElementSearcher* searcher = const_cast<SMESH_ElementSearcher*>( myElemSearcher );
SMESHUtils::Deleter<SMESH_ElementSearcher>
volSearcher( SMESH_MeshAlgos::GetElementSearcher( *meshDS ));
vector< const SMDS_MeshElement* > suspectFaces, foundVolumes;
gp_Pnt PC;
gp_Vec VNorm;
const SMDS_MeshElement* volumes[2];
- int what = Preparation(face, PN, VN, FNodes, PC, VNorm, volumes);
+ int what = Preparation( face, PN, VN, FNodes, PC, VNorm, volumes );
if ( what == NOT_QUAD )
continue;
if ( volumes[0] && volumes[1] )
IsRev = true;
}
}
+ helper.SetElementsOnShape( false );
if(!IsRev)
- NewFace = meshDS->AddFace( FNodes[0], FNodes[1], FNodes[2] );
+ NewFace = helper.AddFace( FNodes[0], FNodes[1], FNodes[2] );
else
- NewFace = meshDS->AddFace( FNodes[0], FNodes[2], FNodes[1] );
+ NewFace = helper.AddFace( FNodes[0], FNodes[2], FNodes[1] );
storeTmpElement( NewFace );
prxSubMesh->AddElement( NewFace );
continue;
// Find pyramid peak
- gp_XYZ PCbest(0., 0., 0.); // pyramid peak
+ gp_XYZ PCbest = PC.XYZ();//(0., 0., 0.); // pyramid peak
+ double h, hMin = Precision::Infinite();
int i = 1;
for ( ; i <= 4; i++ ) {
- gp_Pnt Pbest = FindBestPoint(PN(i), PN(i+1), PC, VN(i));
- PCbest += Pbest.XYZ();
+ gp_Pnt Pbest = FindBestPoint(PN(i), PN(i+1), PC, VN(i), h);
+ if ( 0 < h && h < hMin )
+ {
+ PCbest = Pbest.XYZ();
+ h = hMin;
+ }
+ //PCbest += Pbest.XYZ();
}
- PCbest /= 4;
+ //PCbest /= 4;
double height = PC.Distance(PCbest); // pyramid height to precise
if ( height < 1.e-6 ) {
if ( toFindVolumes && 0 ) // non-conformal mesh is not suitable for any mesher so far
{
- // there are volumes in the mesh, in a non-conformal mesh an neighbor
+ // there are volumes in the mesh, in a non-conformal mesh a neighbor
// volume can be not found yet
for ( int isRev = 0; isRev < 2; ++isRev )
{
gp_Pnt intP;
for ( int isRev = 0; isRev < 2; ++isRev )
{
- if( !volumes[isRev] && HasIntersection(farPnt[isRev], PC, intP, aContour) )
+ if( !volumes[isRev] && HasIntersection( farPnt[isRev], PC, intP, aContour ))
{
double d = PC.Distance( intP );
if ( d < dist2int[isRev] )
return false;
// create node for Papex
+ helper.SetElementsOnShape( true );
SMDS_MeshNode* NewNode = helper.AddNode( Papex.X(), Papex.Y(), Papex.Z() );
+ // create a pyramid
+ SMDS_MeshVolume* aPyram;
+ if(isRev)
+ aPyram = helper.AddVolume( FNodes[0], FNodes[1], FNodes[2], FNodes[3], NewNode );
+ else
+ aPyram = helper.AddVolume( FNodes[0], FNodes[3], FNodes[2], FNodes[1], NewNode );
+ myPyramids.push_back(aPyram);
+
+ //myPyramHeight2.Bind( aPyram, Papex.SquareDistance( PC ));
+
// add triangles to result map
+ helper.SetElementsOnShape( false );
for ( i = 0; i < 4; i++) {
SMDS_MeshFace* NewFace;
if(isRev)
- NewFace = meshDS->AddFace( NewNode, FNodes[i], FNodes[i+1] );
+ NewFace = helper.AddFace( NewNode, FNodes[i], FNodes[i+1] );
else
- NewFace = meshDS->AddFace( NewNode, FNodes[i+1], FNodes[i] );
+ NewFace = helper.AddFace( NewNode, FNodes[i+1], FNodes[i] );
storeTmpElement( NewFace );
prxSubMesh->AddElement( NewFace );
}
- // create a pyramid
- SMDS_MeshVolume* aPyram;
- if(isRev)
- aPyram = helper.AddVolume( FNodes[0], FNodes[1], FNodes[2], FNodes[3], NewNode );
- else
- aPyram = helper.AddVolume( FNodes[0], FNodes[3], FNodes[2], FNodes[1], NewNode );
- myPyramids.push_back(aPyram);
}
} // end loop on all faces
// check adjacent pyramids
- for ( i = 0; i < myPyramids.size(); ++i )
+ // for ( i = 0; i < myPyramids.size(); ++i )
+ // {
+ // const SMDS_MeshElement* PrmI = myPyramids[i];
+ // MergeAdjacent( PrmI, nodesToMove );
+ // }
+
+ // Fix adjacent pyramids whose heights differ too much
+
+ myNodes.resize(2);
+ bool modifHeight = true;
+ typedef NCollection_DataMap< const SMDS_MeshElement*, double >::Iterator TPyramToH2Iter;
+ while ( modifHeight )
{
- const SMDS_MeshElement* PrmI = myPyramids[i];
- MergeAdjacent( PrmI, nodesToMove );
+ modifHeight = false;
+ for ( TPyramToH2Iter pyramToH2( myPyramHeight2 ); pyramToH2.More(); pyramToH2.Next() )
+ modifHeight |= DecreaseHeightDifference( pyramToH2.Key(), pyramToH2.Value() );
+ }
+ for ( TPyramToH2Iter pyramToH2( myPyramHeight2 ); pyramToH2.More(); pyramToH2.Next() )
+ {
+ if ( pyramToH2.Value() > 0 )
+ continue; // not changed
+ const double h = Sqrt( - pyramToH2.Value() );
+ const SMDS_MeshElement* pyram = pyramToH2.Key();
+ SMESH_NodeXYZ Papex = pyram->GetNode( PYRAM_APEX );
+ gp_XYZ PC( 0,0,0 );
+ for ( int i = 0; i < 4; ++i )
+ PC += SMESH_NodeXYZ( pyram->GetNode( i ));
+ PC /= 4;
+ gp_Vec V( PC, Papex );
+ gp_Pnt newApex = gp_Pnt( PC ).Translated( h * V.Normalized() );
+ meshDS->MoveNode( Papex.Node(), newApex.X(), newApex.Y(), newApex.Z() );
}
// iterate on all new pyramids
while ( vIt->more() )
{
const SMDS_MeshElement* PrmJ = vIt->next();
- if ( SMESH_MeshAlgos::GetCommonNodes( PrmI, PrmJ ).size() > 1 )
+ if ( SMESH_MeshAlgos::NbCommonNodes( PrmI, PrmJ ) > 1 )
checkedPyrams.insert( PrmJ );
}
}
gp_Vec Vtmp( PsI[k], PsI[ PYRAM_APEX ]);
gp_Pnt Pshift = PsI[k].XYZ() + Vtmp.XYZ() * 0.01; // base node moved a bit to apex
hasInt =
- ( HasIntersection3( Pshift, PsI[4], Pint, PsJ[0], PsJ[1], PsJ[PYRAM_APEX]) ||
- HasIntersection3( Pshift, PsI[4], Pint, PsJ[1], PsJ[2], PsJ[PYRAM_APEX]) ||
- HasIntersection3( Pshift, PsI[4], Pint, PsJ[2], PsJ[3], PsJ[PYRAM_APEX]) ||
- HasIntersection3( Pshift, PsI[4], Pint, PsJ[3], PsJ[0], PsJ[PYRAM_APEX]) );
+ ( HasIntersection3( Pshift, PsI[4], Pint, PsJ[0], PsJ[1], PsJ[PYRAM_APEX]) ||
+ HasIntersection3( Pshift, PsI[4], Pint, PsJ[1], PsJ[2], PsJ[PYRAM_APEX]) ||
+ HasIntersection3( Pshift, PsI[4], Pint, PsJ[2], PsJ[3], PsJ[PYRAM_APEX]) ||
+ HasIntersection3( Pshift, PsI[4], Pint, PsJ[3], PsJ[0], PsJ[PYRAM_APEX]) );
}
for ( k = 0; k < 4 && !hasInt; k++ )
{
if ( nbc == 4 )
continue; // pyrams have a common base face
- if ( nbc > 0 )
+ if ( nbc > 1 )
{
// Merge the two pyramids and others already merged with them
MergePiramids( PrmI, PrmJ, nodesToMove );
double ang2 = fabs(VN2.Angle(VI2));
double coef1 = 0.5 - (( ang1 < M_PI/3. ) ? cos(ang1)*0.25 : 0 );
double coef2 = 0.5 - (( ang2 < M_PI/3. ) ? cos(ang2)*0.25 : 0 ); // cos(ang2) ?
-// double coef2 = 0.5;
-// if(ang2<PI/3)
-// coef2 -= cos(ang1)*0.25;
+ // double coef2 = 0.5;
+ // if(ang2<PI/3)
+ // coef2 -= cos(ang1)*0.25;
VN1.Scale(coef1);
VN2.Scale(coef2);
aNode2->setXYZ( PCj.X()+VN2.X(), PCj.Y()+VN2.Y(), PCj.Z()+VN2.Z() );
nodesToMove.insert( aNode1 );
nodesToMove.insert( aNode2 );
+ //cout << "Limit H F" << getFaceID( PrmI ) << " - F" << getFaceID( PrmJ ) << endl;
}
// fix intersections that can appear after apex movement
- MergeAdjacent( PrmI, nodesToMove );
- MergeAdjacent( PrmJ, nodesToMove );
+ //MergeAdjacent( PrmI, nodesToMove );
+ //MergeAdjacent( PrmJ, nodesToMove );
+
+ apexI = PrmI->GetNode( PYRAM_APEX ); // apexI can be removed by merge
} // end if(hasInt)
- } // loop on suspectPyrams
- } // loop on 4 base nodes of PrmI
+ } // loop on 4 base nodes of PrmI
+ } // loop on suspectPyrams
} // loop on all pyramids
+ //smIdType nbNodes = aMesh.NbNodes();
+ for ( i = 0; i < myPyramids.size(); ++i )
+ {
+ const SMDS_MeshElement* PrmI = myPyramids[i];
+ MergeAdjacent( PrmI, nodesToMove );
+ }
+
if( !nodesToMove.empty() && !meshDS->IsEmbeddedMode() )
{
set<const SMDS_MeshNode*>::iterator n = nodesToMove.begin();