diff --git a/Geo/GFace.cpp b/Geo/GFace.cpp
index d7fc8dd414d7ecd41c6e7919bad4bf198d80650e..6e8f8b42445bc3e0e8deb51adfe9fa97593505d1 100644
--- a/Geo/GFace.cpp
+++ b/Geo/GFace.cpp
@@ -544,9 +544,9 @@ end:
double d = meanPlane.a * v->x() + meanPlane.b * v->y() +
meanPlane.c * v->z() - meanPlane.d;
if(fabs(d) > lc * 1.e-3) {
- Msg::Warning("Plane surface %d (%gx+%gy+%gz=%g) is not plane!",
+ Msg::Debug("Plane surface %d (%gx+%gy+%gz=%g) is not plane!",
tag(), meanPlane.a, meanPlane.b, meanPlane.c, meanPlane.d);
- Msg::Warning("Control point %d = (%g,%g,%g), val=%g",
+ Msg::Debug("Control point %d = (%g,%g,%g), val=%g",
v->tag(), v->x(), v->y(), v->z(), d);
break;
}
diff --git a/Geo/GFaceCompound.cpp b/Geo/GFaceCompound.cpp
index a47ba07e0bbee6dbe4bf7145c405a6d2b862f10e..91b5ce5a071fd5dfc38772bffd659792f12a89c1 100644
--- a/Geo/GFaceCompound.cpp
+++ b/Geo/GFaceCompound.cpp
@@ -861,21 +861,21 @@ void GFaceCompound::convexBoundary(double nTot) const
}
- char name[256];
- sprintf(name, "myBC-%d.pos", kk);
- FILE * f2 = fopen(name,"w");
- fprintf(f2, "View \"\"{\n");
- for (int i = 0; i< oVert.size()-1; i++){
- SPoint3 uv0 = coordinates[oVert[i]];
- SPoint3 uv1 = coordinates[oVert[i+1]];
- fprintf(f2, "SL(%g,%g,%g,%g,%g,%g){%g,%g};\n",
- uv0.x(),uv0.y(), uv0.z(),
- uv1.x(),uv1.y(), uv1.z(),
- (double)i, (double)i+1);
- }
- fprintf(f2,"};\n");
- fclose(f2);
- kk++;
+ // char name[256];
+ // sprintf(name, "myBC-%d.pos", kk);
+ // FILE * f2 = fopen(name,"w");
+ // fprintf(f2, "View \"\"{\n");
+ // for (int i = 0; i< oVert.size()-1; i++){
+ // SPoint3 uv0 = coordinates[oVert[i]];
+ // SPoint3 uv1 = coordinates[oVert[i+1]];
+ // fprintf(f2, "SL(%g,%g,%g,%g,%g,%g){%g,%g};\n",
+ // uv0.x(),uv0.y(), uv0.z(),
+ // uv1.x(),uv1.y(), uv1.z(),
+ // (double)i, (double)i+1);
+ // }
+ // fprintf(f2,"};\n");
+ // fclose(f2);
+ // kk++;
}
diff --git a/Geo/GModelFactory.cpp b/Geo/GModelFactory.cpp
index 82b52c4b5b5d195effa1ffcd2d6e6cb835650c39..abd70e301fa947b5fc929777175397c4d400930b 100644
--- a/Geo/GModelFactory.cpp
+++ b/Geo/GModelFactory.cpp
@@ -108,7 +108,7 @@ GFace *GeoFactory::addPlanarFace(GModel *gm, std::vector< std::vector<GEdge *> >
c->compound.push_back(gec[i]->tag());
}
else{
- Msg::Info("Unknown type of curve to add to planar face ...");
+ c = Create_Curve(numEdge, MSH_SEGM_DISCRETE, 1, NULL, NULL, -1, -1, 0., 1.);
}
c->Control_Points = List_Create(2, 1, sizeof(Vertex *));
diff --git a/Mesh/CenterlineField.cpp b/Mesh/CenterlineField.cpp
index ab7111e6faadb90a07fac8414ce9da2cb80e2321..f882ec62c6d4adabe9528909a83723d6a735832e 100644
--- a/Mesh/CenterlineField.cpp
+++ b/Mesh/CenterlineField.cpp
@@ -861,8 +861,8 @@ void Centerline::cutMesh(){
double D = (edges[i].minRad+edges[i].maxRad);
double AR = L/D;
printf("*** Centerline branch %d (AR=%d) \n", i, (int)floor(AR + 0.5));
- if( AR > 4.0){
- int nbSplit = (int)floor(AR / 3. + 0.5);
+ if( AR > 2.5){
+ int nbSplit = (int)floor(AR/3. + 0.5);
double li = L/nbSplit;
double lc = 0.0;
for (unsigned int j= 0; j < lines.size(); j++){
@@ -924,7 +924,7 @@ void Centerline::cutByDisk(SVector3 &PT, SVector3 &NORM, double &maxRad){
allEdges.insert(triangles[i]->getEdge(j));
bool closedCut = false;
int step = 0;
- while (!closedCut && step < 10){
+ while (!closedCut && step < 20){
double rad = 1.2*maxRad+0.1*step*maxRad;
std::map<MEdge,MVertex*,Less_Edge> cutEdges;
std::set<MVertex*> cutVertices;
@@ -1074,6 +1074,7 @@ void Centerline::operator() (double x, double y, double z, SMetric3 &metr, GEnt
double lc = 2*M_PI*radMax/nbPoints;
double lc_a = 3.*lc;
double lc_n, lc_t;
+
if (onTubularSurface){
lc_n = lc_t = lc;
}
diff --git a/Mesh/Generator.cpp b/Mesh/Generator.cpp
index 50ff49a5a51543ffcaf3e74ea96c8edabad3db4e..660087edb6e9b7c036ab649081d3361e56061bc1 100644
--- a/Mesh/Generator.cpp
+++ b/Mesh/Generator.cpp
@@ -566,6 +566,7 @@ static void Mesh3D(GModel *m)
double t2 = Cpu();
CTX::instance()->meshTimer[2] = t2 - t1;
Msg::StatusBar(2, true, "Done meshing 3D (%g s)", CTX::instance()->meshTimer[2]);
+
}
void OptimizeMeshNetgen(GModel *m)
diff --git a/Mesh/meshMetric.cpp b/Mesh/meshMetric.cpp
index 11e96bc3e7065f225f6a53405b5bd87741fce33f..242d3a52e7a94c7e63b0b3af4778b4e2dd2c3124 100644
--- a/Mesh/meshMetric.cpp
+++ b/Mesh/meshMetric.cpp
@@ -444,6 +444,7 @@ void meshMetric::computeMetric(){
H = hfrey;
}
else if ((_technique == meshMetric::EIGENDIRECTIONS )||(_technique == meshMetric::EIGENDIRECTIONS_LINEARINTERP_H )){
+
double metric_value_hmax = 1./hmax/hmax;
SVector3 gr = grads[ver];
double norm = gr.normalize();
diff --git a/benchmarks/step/cube_filet.msh b/benchmarks/step/cube_filet.msh
index aefb8615dde6849b796011e360f054fe5fed51a3..3a49e2aa4ac4eee8a240210639280eeea7ac9445 100644
--- a/benchmarks/step/cube_filet.msh
+++ b/benchmarks/step/cube_filet.msh
@@ -129,11 +129,11 @@ $Nodes
124 5.724399909650009 4.057293309178489 3.187989940240517
125 5.297025541818572 5.337296870855169 97.49274520954476
126 4.057460557807088 94.2756124685302 3.18785180747434
-127 4.448598664421575 4.893928547133715 96.56581887730404
-128 95.78244554530886 4.846382960518737 96.32483635566219
-129 97.10141620012044 2.959411391604615 42.0876429076808
-130 3.234583529471755 15.32604522064823 97.36404372476869
-131 96.92748365061138 15.17102742159506 97.21179383166991
+127 4.448596461323688 4.893939737695014 96.56582571718759
+128 95.78244796844946 4.846391383347251 96.32484100341955
+129 97.03607392997444 2.894110636103731 42.08487531491071
+130 3.234590039133448 15.32605331331894 97.36404970525102
+131 96.92749006787444 15.17103119663408 97.21178766738879
$EndNodes
$Elements
458
@@ -331,10 +331,10 @@ $Elements
192 1 2 0 74 27 27
193 2 2 0 1 41 43 44
194 2 2 0 1 41 42 43
-195 2 2 0 1 44 43 4
-196 2 2 0 1 42 3 43
-197 2 2 0 1 1 42 41
-198 2 2 0 1 41 44 2
+195 2 2 0 1 1 42 41
+196 2 2 0 1 41 44 2
+197 2 2 0 1 42 3 43
+198 2 2 0 1 44 43 4
199 2 2 0 2 5 119 45
200 2 2 0 2 2 44 46
201 2 2 0 2 5 46 119
@@ -344,13 +344,13 @@ $Elements
205 2 2 0 3 51 47 48
206 2 2 0 3 53 50 45
207 2 2 0 3 49 52 48
-208 2 2 0 3 6 47 51
-209 2 2 0 3 52 51 48
-210 2 2 0 3 53 52 50
-211 2 2 0 3 52 49 50
-212 2 2 0 3 4 53 45
-213 2 2 0 3 47 7 48
-214 2 2 0 3 45 50 5
+208 2 2 0 3 52 51 48
+209 2 2 0 3 6 47 51
+210 2 2 0 3 4 53 45
+211 2 2 0 3 47 7 48
+212 2 2 0 3 45 50 5
+213 2 2 0 3 49 50 52
+214 2 2 0 3 50 53 52
215 2 2 0 4 8 120 54
216 2 2 0 4 47 55 7
217 2 2 0 4 8 55 120
@@ -359,58 +359,58 @@ $Elements
220 2 2 0 4 6 54 120
221 2 2 0 5 59 56 57
222 2 2 0 5 59 57 58
-223 2 2 0 5 58 57 11
-224 2 2 0 5 59 9 56
-225 2 2 0 5 59 58 12
-226 2 2 0 5 56 10 57
+223 2 2 0 5 59 9 56
+224 2 2 0 5 59 58 12
+225 2 2 0 5 56 10 57
+226 2 2 0 5 58 57 11
227 2 2 0 6 13 121 60
228 2 2 0 6 10 56 61
229 2 2 0 6 13 61 121
230 2 2 0 6 56 121 61
231 2 2 0 6 9 121 56
232 2 2 0 6 9 60 121
-233 2 2 0 7 63 58 62
-234 2 2 0 7 63 62 46
-235 2 2 0 7 63 46 5
-236 2 2 0 7 58 11 62
-237 2 2 0 7 63 12 58
-238 2 2 0 7 46 62 2
+233 2 2 0 7 63 62 46
+234 2 2 0 7 63 58 62
+235 2 2 0 7 58 11 62
+236 2 2 0 7 63 46 5
+237 2 2 0 7 46 62 2
+238 2 2 0 7 63 12 58
239 2 2 0 8 66 65 55
240 2 2 0 8 66 64 65
241 2 2 0 8 66 14 64
-242 2 2 0 8 55 65 7
-243 2 2 0 8 64 15 65
-244 2 2 0 8 66 55 8
+242 2 2 0 8 66 55 8
+243 2 2 0 8 55 65 7
+244 2 2 0 8 64 15 65
245 2 2 0 9 68 69 67
246 2 2 0 9 68 67 54
-247 2 2 0 9 6 68 54
-248 2 2 0 9 69 16 67
-249 2 2 0 9 54 67 8
-250 2 2 0 9 68 17 69
+247 2 2 0 9 68 17 69
+248 2 2 0 9 6 68 54
+249 2 2 0 9 69 16 67
+250 2 2 0 9 54 67 8
251 2 2 0 10 71 72 70
252 2 2 0 10 71 70 69
-253 2 2 0 10 71 69 17
+253 2 2 0 10 72 18 70
254 2 2 0 10 19 72 71
-255 2 2 0 10 72 18 70
-256 2 2 0 10 69 70 16
+255 2 2 0 10 69 70 16
+256 2 2 0 10 71 69 17
257 2 2 0 11 73 74 75
258 2 2 0 11 73 75 42
259 2 2 0 11 42 75 3
-260 2 2 0 11 20 74 73
-261 2 2 0 11 1 73 42
-262 2 2 0 11 74 21 75
+260 2 2 0 11 1 73 42
+261 2 2 0 11 74 21 75
+262 2 2 0 11 20 74 73
263 2 2 0 12 79 76 77
264 2 2 0 12 79 77 78
-265 2 2 0 12 78 77 24
-266 2 2 0 12 76 22 77
-267 2 2 0 12 79 78 25
+265 2 2 0 12 76 22 77
+266 2 2 0 12 79 78 25
+267 2 2 0 12 78 77 24
268 2 2 0 12 79 23 76
-269 2 2 0 13 82 80 81
-270 2 2 0 13 82 78 80
-271 2 2 0 13 82 81 20
-272 2 2 0 13 82 25 78
+269 2 2 0 13 82 78 80
+270 2 2 0 13 82 80 81
+271 2 2 0 13 82 25 78
+272 2 2 0 13 81 80 26
273 2 2 0 13 78 24 80
-274 2 2 0 13 81 80 26
+274 2 2 0 13 82 81 20
275 2 2 0 14 21 122 83
276 2 2 0 14 81 74 20
277 2 2 0 14 21 74 122
@@ -419,14 +419,14 @@ $Elements
280 2 2 0 14 26 83 122
281 2 2 0 15 88 84 85
282 2 2 0 15 90 87 83
-283 2 2 0 15 26 90 83
-284 2 2 0 15 88 86 89
-285 2 2 0 15 90 86 87
-286 2 2 0 15 84 19 85
-287 2 2 0 15 88 85 86
-288 2 2 0 15 83 87 21
-289 2 2 0 15 89 86 90
-290 2 2 0 15 88 27 84
+283 2 2 0 15 88 86 89
+284 2 2 0 15 87 90 89
+285 2 2 0 15 88 85 86
+286 2 2 0 15 26 90 83
+287 2 2 0 15 84 19 85
+288 2 2 0 15 88 27 84
+289 2 2 0 15 86 87 89
+290 2 2 0 15 83 87 21
291 2 2 0 16 92 91 28
292 2 2 0 16 91 76 23
293 2 2 0 16 91 92 123
@@ -436,9 +436,9 @@ $Elements
297 2 2 0 17 96 93 94
298 2 2 0 17 96 94 95
299 2 2 0 17 93 30 94
-300 2 2 0 17 95 94 31
-301 2 2 0 17 96 95 32
-302 2 2 0 17 96 29 93
+300 2 2 0 17 96 95 32
+301 2 2 0 17 96 29 93
+302 2 2 0 17 95 94 31
303 2 2 0 18 33 124 97
304 2 2 0 18 93 98 30
305 2 2 0 18 33 98 124
@@ -453,32 +453,32 @@ $Elements
314 2 2 0 19 95 31 99
315 2 2 0 20 105 97 102
316 2 2 0 20 107 104 92
-317 2 2 0 20 103 104 106
-318 2 2 0 20 97 29 102
-319 2 2 0 20 33 97 105
-320 2 2 0 20 103 106 102
-321 2 2 0 20 106 105 102
-322 2 2 0 20 92 104 22
-323 2 2 0 20 28 107 92
-324 2 2 0 20 104 107 106
+317 2 2 0 20 103 106 102
+318 2 2 0 20 106 105 102
+319 2 2 0 20 97 29 102
+320 2 2 0 20 28 107 92
+321 2 2 0 20 33 97 105
+322 2 2 0 20 103 104 106
+323 2 2 0 20 104 107 106
+324 2 2 0 20 92 104 22
325 2 2 0 21 110 91 108
326 2 2 0 21 110 108 109
-327 2 2 0 21 91 23 108
-328 2 2 0 21 110 109 35
-329 2 2 0 21 110 28 91
+327 2 2 0 21 110 28 91
+328 2 2 0 21 91 23 108
+329 2 2 0 21 110 109 35
330 2 2 0 21 109 108 34
331 2 2 0 22 111 98 112
332 2 2 0 22 111 112 113
-333 2 2 0 22 36 111 113
-334 2 2 0 22 98 33 112
-335 2 2 0 22 113 112 37
-336 2 2 0 22 30 98 111
+333 2 2 0 22 98 33 112
+334 2 2 0 22 30 98 111
+335 2 2 0 22 36 111 113
+336 2 2 0 22 113 112 37
337 2 2 0 23 116 114 115
338 2 2 0 23 116 115 64
-339 2 2 0 23 116 64 14
-340 2 2 0 23 116 39 114
-341 2 2 0 23 64 115 15
-342 2 2 0 23 114 38 115
+339 2 2 0 23 64 115 15
+340 2 2 0 23 114 38 115
+341 2 2 0 23 116 64 14
+342 2 2 0 23 116 39 114
343 2 2 0 24 40 118 117
344 2 2 0 24 117 114 39
345 2 2 0 24 117 118 125
@@ -491,13 +491,13 @@ $Elements
352 2 2 0 25 72 84 126
353 2 2 0 25 27 126 84
354 2 2 0 25 27 100 126
-355 2 2 0 1001 111 113 112
+355 2 2 0 1001 112 111 113
356 2 2 0 1001 57 131 59
357 2 2 0 1001 115 130 116
-358 2 2 0 1001 85 27 88
-359 2 2 0 1001 49 52 53
-360 2 2 0 1001 90 26 87
-361 2 2 0 1001 49 51 52
+358 2 2 0 1001 90 26 87
+359 2 2 0 1001 53 49 52
+360 2 2 0 1001 49 51 52
+361 2 2 0 1001 85 27 88
362 2 2 0 1001 19 18 27
363 2 2 0 1001 20 21 26
364 2 2 0 1001 23 22 28
@@ -517,82 +517,82 @@ $Elements
378 2 2 0 1001 9 131 128
379 2 2 0 1001 38 127 130
380 2 2 0 1001 40 117 127
-381 2 2 0 1001 35 109 129
-382 2 2 0 1001 34 129 109
-383 2 2 0 1001 38 130 115
-384 2 2 0 1001 82 20 80
-385 2 2 0 1001 101 18 99
-386 2 2 0 1001 5 2 63
-387 2 2 0 1001 107 28 104
-388 2 2 0 1001 29 33 102
-389 2 2 0 1001 17 70 71
-390 2 2 0 1001 63 2 62
-391 2 2 0 1001 65 8 7
-392 2 2 0 1001 71 18 19
-393 2 2 0 1001 50 49 53
-394 2 2 0 1001 110 23 28
-395 2 2 0 1001 96 30 29
-396 2 2 0 1001 75 20 73
-397 2 2 0 1001 17 16 70
-398 2 2 0 1001 26 21 87
-399 2 2 0 1001 49 48 51
-400 2 2 0 1001 15 66 65
-401 2 2 0 1001 21 20 75
-402 2 2 0 1001 67 16 68
-403 2 2 0 1001 80 20 26
-404 2 2 0 1001 27 18 101
-405 2 2 0 1001 112 30 111
-406 2 2 0 1001 39 116 130
-407 2 2 0 1001 22 23 77
-408 2 2 0 1001 66 8 65
-409 2 2 0 1001 70 18 71
-410 2 2 0 1001 94 30 96
-411 2 2 0 1001 108 23 110
-412 2 2 0 1001 9 59 131
-413 2 2 0 1001 73 1 3
-414 2 2 0 1001 77 23 79
-415 2 2 0 1001 75 73 3
-416 2 2 0 1001 102 33 105
-417 2 2 0 1001 15 14 66
+381 2 2 0 1001 34 129 109
+382 2 2 0 1001 35 109 129
+383 2 2 0 1001 75 20 73
+384 2 2 0 1001 96 30 29
+385 2 2 0 1001 94 30 96
+386 2 2 0 1001 38 130 115
+387 2 2 0 1001 103 102 105
+388 2 2 0 1001 71 18 19
+389 2 2 0 1001 33 30 112
+390 2 2 0 1001 10 131 57
+391 2 2 0 1001 9 59 131
+392 2 2 0 1001 63 2 62
+393 2 2 0 1001 77 23 79
+394 2 2 0 1001 17 70 71
+395 2 2 0 1001 85 19 27
+396 2 2 0 1001 110 23 28
+397 2 2 0 1001 26 21 87
+398 2 2 0 1001 65 8 7
+399 2 2 0 1001 80 20 26
+400 2 2 0 1001 22 23 77
+401 2 2 0 1001 104 28 22
+402 2 2 0 1001 107 28 104
+403 2 2 0 1001 27 18 101
+404 2 2 0 1001 50 49 53
+405 2 2 0 1001 5 2 63
+406 2 2 0 1001 101 18 99
+407 2 2 0 1001 49 48 51
+408 2 2 0 1001 21 20 75
+409 2 2 0 1001 66 8 65
+410 2 2 0 1001 108 23 110
+411 2 2 0 1001 112 30 111
+412 2 2 0 1001 39 116 130
+413 2 2 0 1001 70 18 71
+414 2 2 0 1001 82 20 80
+415 2 2 0 1001 87 86 90
+416 2 2 0 1001 90 86 89
+417 2 2 0 1001 112 113 37
418 2 2 0 1001 111 36 113
-419 2 2 0 1001 112 113 37
-420 2 2 0 1001 62 11 12
-421 2 2 0 1001 63 62 12
-422 2 2 0 1001 104 28 22
-423 2 2 0 1001 68 16 17
-424 2 2 0 1001 85 19 27
-425 2 2 0 1001 41 2 43
-426 2 2 0 1001 43 2 4
-427 2 2 0 1001 53 5 50
-428 2 2 0 1001 48 7 51
-429 2 2 0 1001 51 7 6
-430 2 2 0 1001 86 85 89
-431 2 2 0 1001 89 85 88
-432 2 2 0 1001 99 31 101
-433 2 2 0 1001 101 31 32
-434 2 2 0 1001 24 25 80
-435 2 2 0 1001 80 25 82
-436 2 2 0 1001 116 14 115
-437 2 2 0 1001 115 14 15
-438 2 2 0 1001 12 11 59
-439 2 2 0 1001 59 11 57
-440 2 2 0 1001 6 8 68
-441 2 2 0 1001 68 8 67
-442 2 2 0 1001 32 31 96
-443 2 2 0 1001 96 31 94
-444 2 2 0 1001 10 131 57
-445 2 2 0 1001 79 25 77
-446 2 2 0 1001 77 25 24
-447 2 2 0 1001 106 107 103
-448 2 2 0 1001 103 107 104
-449 2 2 0 1001 87 86 90
-450 2 2 0 1001 90 86 89
-451 2 2 0 1001 102 105 103
-452 2 2 0 1001 103 105 106
-453 2 2 0 1001 4 5 53
-454 2 2 0 1001 3 1 43
-455 2 2 0 1001 43 1 41
-456 2 2 0 1001 34 108 129
-457 2 2 0 1001 35 129 110
-458 2 2 0 1001 33 30 112
+419 2 2 0 1001 62 11 12
+420 2 2 0 1001 63 62 12
+421 2 2 0 1001 73 1 3
+422 2 2 0 1001 75 73 3
+423 2 2 0 1001 15 14 66
+424 2 2 0 1001 15 66 65
+425 2 2 0 1001 102 33 105
+426 2 2 0 1001 6 8 68
+427 2 2 0 1001 68 8 67
+428 2 2 0 1001 29 33 102
+429 2 2 0 1001 41 2 43
+430 2 2 0 1001 43 2 4
+431 2 2 0 1001 17 16 70
+432 2 2 0 1001 103 105 106
+433 2 2 0 1001 67 16 68
+434 2 2 0 1001 68 16 17
+435 2 2 0 1001 4 5 53
+436 2 2 0 1001 53 5 50
+437 2 2 0 1001 48 7 51
+438 2 2 0 1001 51 7 6
+439 2 2 0 1001 86 85 89
+440 2 2 0 1001 89 85 88
+441 2 2 0 1001 99 31 101
+442 2 2 0 1001 101 31 32
+443 2 2 0 1001 116 14 115
+444 2 2 0 1001 115 14 15
+445 2 2 0 1001 24 25 80
+446 2 2 0 1001 80 25 82
+447 2 2 0 1001 12 11 59
+448 2 2 0 1001 59 11 57
+449 2 2 0 1001 79 25 77
+450 2 2 0 1001 77 25 24
+451 2 2 0 1001 32 31 96
+452 2 2 0 1001 96 31 94
+453 2 2 0 1001 106 107 103
+454 2 2 0 1001 103 107 104
+455 2 2 0 1001 34 108 129
+456 2 2 0 1001 35 129 110
+457 2 2 0 1001 3 1 43
+458 2 2 0 1001 43 1 41
$EndElements