Restore error reporting in the case where existing 1D mesh
  mismatches the projected 2D mesh
This commit is contained in:
eap 2012-07-09 08:35:37 +00:00
parent 187dac541f
commit 31c3351c50

View File

@ -1007,24 +1007,18 @@ bool StdMeshers_Projection_2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape&
( u2nodesMaps[ NEW_NODES ].size() == u2nodesOnSeam.size() ); ( u2nodesMaps[ NEW_NODES ].size() == u2nodesOnSeam.size() );
if ( !mergeNewToOld ) if ( !mergeNewToOld )
{ if ( u2nodesMaps[ NEW_NODES ].size() > 0 &&
// if ( u2nodesMaps[ NEW_NODES ].size() == 0 && u2nodesMaps[ OLD_NODES ].size() > 0 )
// sm->GetSubShape().ShapeType() == TopAbs_EDGE && {
// helper.IsDegenShape( sm->GetId() ) ) u_oldNode = u2nodesMaps[ OLD_NODES ].begin();
// // NPAL15894 (tt88bis.py) - project mesh built by NETGEN_1d_2D that newEnd = u2nodesMaps[ OLD_NODES ].end();
// // does not make segments/nodes on degenerated edges for ( ; u_oldNode != newEnd; ++u_oldNode )
// continue; _badInputElements.push_back( u_oldNode->second );
return error( COMPERR_BAD_INPUT_MESH,
// if ( u2nodesMaps[ OLD_NODES ].size() == 0 && SMESH_Comment( "Existing mesh mismatches the projected 2D mesh on " )
// sm->GetSubShape().ShapeType() == TopAbs_VERTEX ) << ( sm->GetSubShape().ShapeType() == TopAbs_EDGE ? "edge" : "vertex" )
// // old nodes are optional on vertices in the case of 1D-2D projection << " #" << sm->GetId() );
// continue; }
//RETURN_BAD_RESULT
MESSAGE("Different nb of old and new nodes on shape #"<< sm->GetId() <<" "<<
u2nodesMaps[ OLD_NODES ].size() << " != " <<
u2nodesMaps[ NEW_NODES ].size());
}
if ( isSeam && !mergeSeamToNew ) { if ( isSeam && !mergeSeamToNew ) {
//RETURN_BAD_RESULT //RETURN_BAD_RESULT
MESSAGE("Different nb of old and seam nodes " << MESSAGE("Different nb of old and seam nodes " <<