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

dont print jacs by default

parent eb1a083f
No related branches found
No related tags found
No related merge requests found
...@@ -1010,8 +1010,6 @@ extern double mesh_functional_distorsion(MTriangle *t, double u, double v); ...@@ -1010,8 +1010,6 @@ extern double mesh_functional_distorsion(MTriangle *t, double u, double v);
static void printJacobians(GModel *m, const char *nm) static void printJacobians(GModel *m, const char *nm)
{ {
// return;
const int n = 15; const int n = 15;
double D[n][n], X[n][n], Y[n][n], Z[n][n]; double D[n][n], X[n][n], Y[n][n], Z[n][n];
...@@ -1108,8 +1106,8 @@ void SetOrderN(GModel *m, int order, bool linear, bool incomplete) ...@@ -1108,8 +1106,8 @@ void SetOrderN(GModel *m, int order, bool linear, bool incomplete)
// we do that model face by model face // we do that model face by model face
std::vector<MElement*> bad; std::vector<MElement*> bad;
double worst; double worst;
checkHighOrderTriangles("Before optimization ", m, bad, worst);
if (displ2D){ if (displ2D){
checkHighOrderTriangles("Before optimization", m, bad, worst);
for(GModel::fiter it = m->firstFace(); it != m->lastFace(); ++it) for(GModel::fiter it = m->firstFace(); it != m->lastFace(); ++it)
displ2D->optimize(*it,edgeVertices,faceVertices); displ2D->optimize(*it,edgeVertices,faceVertices);
checkHighOrderTriangles("After optimization", m, bad, worst); checkHighOrderTriangles("After optimization", m, bad, worst);
...@@ -1120,19 +1118,17 @@ void SetOrderN(GModel *m, int order, bool linear, bool incomplete) ...@@ -1120,19 +1118,17 @@ void SetOrderN(GModel *m, int order, bool linear, bool incomplete)
displ2D, displ3D); displ2D, displ3D);
// smooth the 3D regions // smooth the 3D regions
checkHighOrderTetrahedron("Before optimization", m, bad, worst);
if (displ3D){ if (displ3D){
checkHighOrderTetrahedron("Before optimization", m, bad, worst);
for(GModel::riter it = m->firstRegion(); it != m->lastRegion(); ++it) for(GModel::riter it = m->firstRegion(); it != m->lastRegion(); ++it)
displ3D->smooth(*it); displ3D->smooth(*it);
checkHighOrderTetrahedron("After optimization", m, bad, worst); checkHighOrderTetrahedron("After optimization", m, bad, worst);
} }
if(displ2D){ if(displ2D) delete displ2D;
delete displ2D; if(displ3D) delete displ3D;
delete displ3D;
}
printJacobians(m, "smoothness.pos"); //printJacobians(m, "smoothness.pos");
double t2 = Cpu(); double t2 = Cpu();
Msg::Info("Meshing order %d complete (%g s)", order, t2 - t1); Msg::Info("Meshing order %d complete (%g s)", order, t2 - t1);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment