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

pp

parent a3198234
No related branches found
No related tags found
No related merge requests found
...@@ -373,6 +373,7 @@ static void getFaceVertices(GFace *gf, MElement *incomplete, MElement *ele, ...@@ -373,6 +373,7 @@ static void getFaceVertices(GFace *gf, MElement *incomplete, MElement *ele,
if(gf->geomType() == GEntity::DiscreteSurface || if(gf->geomType() == GEntity::DiscreteSurface ||
gf->geomType() == GEntity::BoundaryLayerSurface) gf->geomType() == GEntity::BoundaryLayerSurface)
linear = true; linear = true;
for(int i = 0; i < ele->getNumFaces(); i++){ for(int i = 0; i < ele->getNumFaces(); i++){
MFace face = ele->getFace(i); MFace face = ele->getFace(i);
faceContainer::iterator fIter = faceVertices.find(face); faceContainer::iterator fIter = faceVertices.find(face);
...@@ -530,7 +531,7 @@ static void reorientQuadPoints(std::vector<MVertex*> &vtcs, int orientation, ...@@ -530,7 +531,7 @@ static void reorientQuadPoints(std::vector<MVertex*> &vtcs, int orientation,
else if (p1 == 0 && p2 == 3){ else if (p1 == 0 && p2 == 3){
for (int i = 4+4*nbP-1; i >= 4+3*nbP; i--) tmp[index++] = vtcs[i]; for (int i = 4+4*nbP-1; i >= 4+3*nbP; i--) tmp[index++] = vtcs[i];
} }
else Msg::Error("ouuls"); else Msg::Error("Something wrong in reorientQuadPoints");
} }
for (int i = 0; i < index; i++)vtcs[start+4+i] = tmp[i]; for (int i = 0; i < index; i++)vtcs[start+4+i] = tmp[i];
start += (4 + index); start += (4 + index);
...@@ -651,7 +652,6 @@ static void getFaceVertices(GRegion *gr, MElement *ele, std::vector<MVertex*> &v ...@@ -651,7 +652,6 @@ static void getFaceVertices(GRegion *gr, MElement *ele, std::vector<MVertex*> &v
} }
else if(face.getNumVertices() == 4){ // quad face else if(face.getNumVertices() == 4){ // quad face
for (int k = start; k < points.size1(); k++) { for (int k = start; k < points.size1(); k++) {
// parameters are between -1 and 1
double t1 = points(k, 0); double t1 = points(k, 0);
double t2 = points(k, 1); double t2 = points(k, 1);
SPoint3 pc = face.interpolate(t1, t2); SPoint3 pc = face.interpolate(t1, t2);
...@@ -1055,6 +1055,7 @@ void checkHighOrderTriangles(const char* cc, GModel *m, ...@@ -1055,6 +1055,7 @@ void checkHighOrderTriangles(const char* cc, GModel *m,
else if (disto < 0.2) nbfair++; else if (disto < 0.2) nbfair++;
} }
} }
if(!count) return;
if (minJGlob > 0) if (minJGlob > 0)
Msg::Info("%s : Worst Face Distorsion Mapping %g Gamma %g Nb elem. (0<d<0.2) = %d", Msg::Info("%s : Worst Face Distorsion Mapping %g Gamma %g Nb elem. (0<d<0.2) = %d",
cc, minJGlob, minGGlob,nbfair ); cc, minJGlob, minGGlob,nbfair );
...@@ -1085,6 +1086,7 @@ static void checkHighOrderTetrahedron(const char* cc, GModel *m, ...@@ -1085,6 +1086,7 @@ static void checkHighOrderTetrahedron(const char* cc, GModel *m,
else if (disto < 0.2) nbfair++; else if (disto < 0.2) nbfair++;
} }
} }
if(!count) return;
if (minJGlob < 0) if (minJGlob < 0)
Msg::Warning("%s : Worst Tetrahedron Smoothness %g Gamma %g NbFair = %d NbBad = %d", Msg::Warning("%s : Worst Tetrahedron Smoothness %g Gamma %g NbFair = %d NbBad = %d",
cc, minJGlob, minGGlob, nbfair, bad.size()); cc, minJGlob, minGGlob, nbfair, bad.size());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment