Skip to content
Snippets Groups Projects
Commit bcc30e36 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

fix crash with recombination

parent 184353b0
No related branches found
No related tags found
No related merge requests found
......@@ -1115,7 +1115,7 @@ void bowyerWatson(GFace *gf, int MAXPNT,
// printf("%12.5E %12.5E %12.5E %12.5E %12.5E\n",DT1,DT2,DT3,__DT1,__DT2);
// printf("%12.5E \n",__DT2);
#if defined(HAVE_ANN)
if (!CTX::instance()->mesh.recombineAll){
if (!CTX::instance()->mesh.recombineAll && !gf->meshAttributes.recombine){
FieldManager *fields = gf->model()->getFields();
BoundaryLayerField *blf = 0;
if(fields->getBoundaryLayerField() > 0){
......@@ -1435,7 +1435,7 @@ void bowyerWatsonFrontal(GFace *gf,
// in case of boundary layer meshing
#if defined(HAVE_ANN)
if (!CTX::instance()->mesh.recombineAll){
if (!CTX::instance()->mesh.recombineAll && !gf->meshAttributes.recombine){
FieldManager *fields = gf->model()->getFields();
BoundaryLayerField *blf = 0;
if(fields->getBoundaryLayerField() > 0){
......@@ -1724,7 +1724,7 @@ void bowyerWatsonFrontalLayers(GFace *gf, bool quad,
backgroundMesh::unset();
#if defined(HAVE_ANN)
if (!CTX::instance()->mesh.recombineAll){
if (!CTX::instance()->mesh.recombineAll && !gf->meshAttributes.recombine){
FieldManager *fields = gf->model()->getFields();
BoundaryLayerField *blf = 0;
if(fields->getBoundaryLayerField() > 0){
......@@ -1818,7 +1818,7 @@ void bowyerWatsonParallelograms(GFace *gf,
transferDataStructure(gf, AllTris, DATA);
backgroundMesh::unset();
#if defined(HAVE_ANN)
if (!CTX::instance()->mesh.recombineAll){
if (!CTX::instance()->mesh.recombineAll && !gf->meshAttributes.recombine){
FieldManager *fields = gf->model()->getFields();
BoundaryLayerField *blf = 0;
if(fields->getBoundaryLayerField() > 0){
......@@ -1924,7 +1924,7 @@ void bowyerWatsonParallelogramsConstrained(GFace *gf,
}
backgroundMesh::unset();
#if defined(HAVE_ANN)
if (!CTX::instance()->mesh.recombineAll){
if (!CTX::instance()->mesh.recombineAll && !gf->meshAttributes.recombine){
FieldManager *fields = gf->model()->getFields();
BoundaryLayerField *blf = 0;
if(fields->getBoundaryLayerField() > 0){
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment