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
SMESH_ComputeErrorPtr& err = sm->GetComputeError();
if ( !err || err->IsOK() )
{
- err = SMESH_ComputeError::New( COMPERR_BAD_INPUT_MESH, msg, sm->GetAlgo() );
- err->myBadElements.push_back( face1 );
- err->myBadElements.push_back( face2 );
+ SMESH_BadInputElements* badElems =
+ new SMESH_BadInputElements( mesh.GetMeshDS(),COMPERR_BAD_INPUT_MESH, msg, sm->GetAlgo() );
+ badElems->add( face1 );
+ badElems->add( face2 );
+ err.reset( badElems );
}
}
- //throw SALOME_Exception( msg.c_str() );
return false; // == "algo fails"
}
//================================================================================
/*!
- * \brief Prepare data for the given face
+ * \brief Retrieve data of the given face
* \param PN - coordinates of face nodes
* \param VN - cross products of vectors (PC-PN(i)) ^ (PC-PN(i+1))
* \param FNodes - face nodes
int nbp = 4;
int j = 0;
- for(i=1; i<4; i++) {
+ for ( i = 1; i < 4; i++ )
+ {
j = i+1;
for(; j<=4; j++) {
if( PN(i).Distance(PN(j)) < 1.e-6 )
}
if(j<=4) break;
}
- //int deg_num = IsDegenarate(PN);
- //if(deg_num>0) {
+
bool hasdeg = false;
- if(i<4) {
- //cout<<"find degeneration"<<endl;
+ if ( i < 4 )
+ {
hasdeg = true;
gp_Pnt Pdeg = PN(i);
gp_Pnt Ptmp(N->X(),N->Y(),N->Z());
if(Pdeg.Distance(Ptmp)<1.e-6) {
DegNode = N;
- //DegNode = const_cast<SMDS_MeshNode*>(N);
break;
}
}
PN.SetValue(nbp+1,PN(1));
FNodes[nbp] = FNodes[0];
+
// find normal direction
gp_Vec V1(PC,PN(nbp));
gp_Vec V2(PC,PN(1));
}
}
- //cout<<" VNorm("<<VNorm.X()<<","<<VNorm.Y()<<","<<VNorm.Z()<<")"<<endl;
return hasdeg ? DEGEN_QUAD : QUAD;
}
vector<const SMDS_MeshNode*> FNodes(5);
TColgp_SequenceOfPnt aContour;
- SMDS_FaceIteratorPtr fIt = meshDS->facesIterator(/*idInceasingOrder=*/true);
+ SMDS_FaceIteratorPtr fIt = meshDS->facesIterator();
while( fIt->more())
{
const SMDS_MeshElement* face = fIt->next();