bos #29266 EDF 24971 - SALOME crashes

fix crash, meshing failure still there
This commit is contained in:
eap 2022-03-11 14:46:25 +03:00
parent 8385b9256f
commit a9219e5f12

View File

@ -1512,9 +1512,9 @@ bool StdMeshers_QuadToTriaAdaptor::Compute2ndPart(SMESH_Mesh&
double ang2 = fabs(VN2.Angle(VI2)); double ang2 = fabs(VN2.Angle(VI2));
double coef1 = 0.5 - (( ang1 < M_PI/3. ) ? cos(ang1)*0.25 : 0 ); 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 - (( ang2 < M_PI/3. ) ? cos(ang2)*0.25 : 0 ); // cos(ang2) ?
// double coef2 = 0.5; // double coef2 = 0.5;
// if(ang2<PI/3) // if(ang2<PI/3)
// coef2 -= cos(ang1)*0.25; // coef2 -= cos(ang1)*0.25;
VN1.Scale(coef1); VN1.Scale(coef1);
VN2.Scale(coef2); VN2.Scale(coef2);
@ -1529,9 +1529,11 @@ bool StdMeshers_QuadToTriaAdaptor::Compute2ndPart(SMESH_Mesh&
MergeAdjacent( PrmI, nodesToMove ); MergeAdjacent( PrmI, nodesToMove );
MergeAdjacent( PrmJ, nodesToMove ); MergeAdjacent( PrmJ, nodesToMove );
apexI = PrmI->GetNode( PYRAM_APEX ); // apexI can be removed by merge
} // end if(hasInt) } // 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 } // loop on all pyramids