From f5547f19e3b9b3e674a9c88d8ea91d05717f685a Mon Sep 17 00:00:00 2001
From: Jean-Francois Remacle <jean-francois.remacle@uclouvain.be>
Date: Mon, 14 Dec 2015 17:40:24 +0000
Subject: [PATCH] oops
---
Mesh/delaunay3d_private.h | 1 +
Mesh/meshGFace.cpp | 1 -
Mesh/meshGRegionDelaunayInsertion.cpp | 18 +++++++++++-------
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/Mesh/delaunay3d_private.h b/Mesh/delaunay3d_private.h
index ac91bc1042..343b701db2 100644
--- a/Mesh/delaunay3d_private.h
+++ b/Mesh/delaunay3d_private.h
@@ -4,6 +4,7 @@
#include "SPoint3.h"
#include <math.h>
#include "robustPredicates.h"
+#include <stdio.h>
#ifndef MAX_NUM_THREADS_
#define MAX_NUM_THREADS_ 1
diff --git a/Mesh/meshGFace.cpp b/Mesh/meshGFace.cpp
index 40977c6e07..b64dc3cc65 100644
--- a/Mesh/meshGFace.cpp
+++ b/Mesh/meshGFace.cpp
@@ -45,7 +45,6 @@
#include "meshGFaceLloyd.h"
#include "boundaryLayersData.h"
#include "filterElements.h"
-#include "meshGFaceQuadDiscrete.h"
// define this to use the old initial delaunay
#define OLD_CODE_DELAUNAY 1
diff --git a/Mesh/meshGRegionDelaunayInsertion.cpp b/Mesh/meshGRegionDelaunayInsertion.cpp
index e43fb4fd26..4d252f5c96 100644
--- a/Mesh/meshGRegionDelaunayInsertion.cpp
+++ b/Mesh/meshGRegionDelaunayInsertion.cpp
@@ -948,13 +948,17 @@ void optimizeMesh(GRegion *gr, const qmTetrahedron::Measures &qm)
// printf("coucou\n");
// relocate vertices
- for (CONTAINER::iterator it = allTets.begin();it!=allTets.end();++it){
- if (!(*it)->isDeleted()){
- double qq = (*it)->getQuality();
- if (qq < qMin)
- for (int i = 0; i < 4; i++){
- if (smoothVertex(*it, i, qm)) nbReloc++;
- }
+ if (!gr->hexahedra.size() &&
+ !gr->prisms.size() &&
+ !gr->pyramids.size()){
+ for (CONTAINER::iterator it = allTets.begin();it!=allTets.end();++it){
+ if (!(*it)->isDeleted()){
+ double qq = (*it)->getQuality();
+ if (qq < qMin)
+ for (int i = 0; i < 4; i++){
+ if (smoothVertex(*it, i, qm)) nbReloc++;
+ }
+ }
}
}
--
GitLab