diff --git a/benchmarks/3d/edf/Four.geo b/benchmarks/3d/edf/Four.geo
index 068af2389007972acc7e2ac050402e7b1c70fba0..72aea71be7cebbd4683e379c015e1f2751bc371d 100644
--- a/benchmarks/3d/edf/Four.geo
+++ b/benchmarks/3d/edf/Four.geo
@@ -1,4 +1,4 @@
-// Ce fichier est la description geometrique utilisee par GMSH pour
+// Ce fichier est la description geometrique utilisee par GMSH pour
// generer le fichier "four.msh".
//
// Copyright (C) 2003 Ali ABAKAR <abakar@edf.fr>
@@ -17,10 +17,15 @@ ProfondeurMarche = 1. ; LongueurMarche = 2. ;
Include "Param_test.geo";
+// Densit� de maillage (taille des mailles autour d'un point g�om�trique)
+
+lfour = LongueurFour/NbElLongF ;
+
+
// Description g�om�trique du four
// Cr�ation des points
-
+
pf1 = newp; Point(pf1) = { LongueurFour, LargeurFour/2., -ProfondeurMarche, lfour};
pf2 = newp; Point(pf2) = { LongueurFour-LongueurMarche, LargeurFour/2., -ProfondeurMarche, lfour};
pf3 = newp; Point(pf3) = { LongueurFour-LongueurMarche, LargeurFour/2., 0., lfour};
@@ -70,13 +75,13 @@ lf18 = newreg; Line(lf18) = {pf5, pf12};
// D�finition des contour(s) du dessus du four
-DessusFour[0] = newreg; Line Loop(DessusFour[0]) = {lf9,lf10,lf11,lf12};
+DessusFour[0] = newreg; Line Loop(DessusFour[0]) = {lf9,lf10,lf11,lf12};
// D�finitions des contours des bords du four
// Bord en y = LargeurFour/2.
-BordFour[0] = newreg; Line Loop(BordFour[0]) = {lf1,lf14,lf5,lf15,-lf9, -lf13};
+BordFour[0] = newreg; Line Loop(BordFour[0]) = {lf1,lf14,lf5,lf15,-lf9, -lf13};
// Bord en x = 0.
@@ -88,7 +93,7 @@ BordFour[2] = newreg; Line Loop(BordFour[2]) = {lf7,-lf17,lf3,lf18,-lf11,-lf16};
// Bord en x = LongueurFour
-BordFour[3] = newreg; Line Loop(BordFour[3]) = {lf4, lf13,-lf12,-lf18};
+BordFour[3] = newreg; Line Loop(BordFour[3]) = {lf4, lf13,-lf12,-lf18};
// D�finitions des contour(s) du fond du Four
@@ -118,7 +123,7 @@ Include "Electrode_8.geo" ;
// Rayon et Hauteur Electrode
-r = 0.076/2.; l = 0.35;
+r = 0.076/2.; l = 0.35;
// Vecteur axe electrode
@@ -139,7 +144,7 @@ Call Electrode;
t = t + 1 ;
R = 0.5 ;
L = 0.8 ;
-yc = 3.5 ; zc = 0 ;
+yc = 3.5 ; zc = 0 ;
Call Electrode;
@@ -167,7 +172,7 @@ Call Electrode;
t = t + 1 ;
R = 0.5 ;
L = 0.8 ;
-yc = 3.5 ; zc = 0 ;
+yc = 3.5 ; zc = 0 ;
Call Electrode;
@@ -195,7 +200,7 @@ Call Electrode;
t = t + 1 ;
R = 0.5 ;
L = 0.8 ;
-yc = 3.5 ; zc = 0 ;
+yc = 3.5 ; zc = 0 ;
Call Electrode;
@@ -214,7 +219,7 @@ xc = xc + 2.5 ;
// ELECTRODE I
t = t+1;
-R = 1. ;
+R = 1. ;
yc = 0 ; zc = 0 ;
Call Electrode;
@@ -224,7 +229,7 @@ Call Electrode;
t = t + 1 ;
R = 0.5 ;
L = 0.8 ;
-yc = 3.5 ; zc = 0 ;
+yc = 3.5 ; zc = 0 ;
Call Electrode;
@@ -253,7 +258,7 @@ Call Electrode;
// ELECTRODE II
t = t + 1 ;
-yc = 0.9 ; zc = 0 ;
+yc = 0.9 ; zc = 0 ;
Call Electrode;
@@ -314,7 +319,7 @@ Call Electrode;
Plane Surface(FondFour[0]) = { FondFour[0]};
Plane Surface(FondFour[1]) = { FondFour[1],ContBaseBoiteElect[]};
-Plane Surface(FondFour[2]) = { FondFour[2]};
+Plane Surface(FondFour[2]) = { FondFour[2]};
// Surface dessus du Four - trace(s) Electrode(s)
@@ -331,7 +336,7 @@ Plane Surface(BordFour[3]) = { BordFour[3]};
// -------------------------------------------------
FrontExtFour = newreg;
-Surface Loop(FrontExtFour) = {FondFour[],DessusFour[],BordFour[]};
+Surface Loop(FrontExtFour) = {FondFour[],DessusFour[],BordFour[]};
Verre = newreg ;
Volume(Verre) = {FrontExtFour,FrontElect[]};
diff --git a/benchmarks/3d/edf/Param_test.geo b/benchmarks/3d/edf/Param_test.geo
index 335c968f55e5869c0586f4f594618ccd1c6454b2..b67a4b1775ec329de8f0a629f28b236615396128 100644
--- a/benchmarks/3d/edf/Param_test.geo
+++ b/benchmarks/3d/edf/Param_test.geo
@@ -14,8 +14,3 @@ NbBoxSup = 3.;
NbBoxInf = 3.;
NbBoxGen = 2.;
-
-// Densit� de maillage (taille des mailles autour d'un point g�om�trique)
-
-lfour = LongueurFour/NbElLongF ;
-
diff --git a/benchmarks/extrude/partitionByExtrusion_spirale.geo b/benchmarks/extrude/partitionByExtrusion_spirale.geo
deleted file mode 100644
index 401625dbd92c90af69489b991aed89a75a140829..0000000000000000000000000000000000000000
--- a/benchmarks/extrude/partitionByExtrusion_spirale.geo
+++ /dev/null
@@ -1,115 +0,0 @@
-// Extrusion and rotation. Christophe Geuzaine, Feb 2002.
-
-lc = 0.005;
-lc2 = 4*lc;
-
-Point(1)={0.09,0,0,lc};
-Point(2)={0.11,0,0,lc};
-Point(3)={0,0.09,0,lc};
-Point(4)={0,0.11,0,lc};
-Point(5)={0.2,0.09,0,lc};
-Point(6)={0.2,0.11,0,lc};
-Point(7)={0.09,0.2,0,lc};
-Point(8)={0.11,0.2,0,lc};
-Point(9)={0.09,0.09,0,lc2};
-Point(10)={0.09,0.11,0,lc2};
-Point(11)={0.11,0.11,0,lc2};
-Point(12)={0.11,0.09,0,lc2};
-
-Line(1) = {1,2};
-Line(2) = {2,12};
-Line(3) = {12,5};
-Line(4) = {5,6};
-Line(5) = {6,11};
-Line(6) = {11,8};
-Line(7) = {8,7};
-Line(8) = {7,10};
-Line(9) = {10,4};
-Line(10) = {4,3};
-Line(11) = {3,9};
-Line(12) = {9,1};
-
-Line Loop(13) = {2,3,4,5,6,7,8,9,10,11,12,1};
-Plane Surface(14) = {13};
-
-turns = 1/3;
-zz = 0.01;
-cc = 0.1;
-
-Extrude Surface {news-1, {0,0,2*zz}, {0,0,1} , {cc,cc,0} , 0}
- { Layers {2}; Recombine; };
-
-For j In {1:3}
- Extrude Surface {news-1, {0,0,zz}, {0,0,1} , {cc,cc,0} , Pi/(40*(4-j))}
- { Layers {1}; Recombine; };
-EndFor
-
-For j In {1:turns*8}
- Extrude Surface {news-1, {0,0,10*zz}, {0,0,1} , {cc,cc,0} , Pi/4}
- { Layers {10}; Recombine; };
-EndFor
-
-For j In {1:3}
- Extrude Surface {news-1, {0,0,zz}, {0,0,1} , {cc,cc,0} , Pi/(40*j)}
- { Layers {1}; Recombine; };
-EndFor
-
-Extrude Surface {news-1, {0,0,2*zz}, {0,0,1} , {cc,cc,0} , 0}
- { Layers {2}; Recombine; };
-
-p = newp;
-
-Point(p+1000)={0.1, -0.02, 0,lc};
-Point(p+1001)={0.1, -0.01, 0,lc};
-Point(p+1002)={0.1, -0.02, 0.01,lc};
-Point(p+1003)={0.1, -0.03, 0,lc};
-Point(p+1004)={0.1, -0.02, -0.01,lc};
-
-Circle(1635) = {p+1001,p+1000,p+1002};
-Circle(1636) = {p+1002,p+1000,p+1003};
-Circle(1637) = {p+1003,p+1000,p+1004};
-Circle(1638) = {p+1004,p+1000,p+1001};
-
-Line Loop(1639) = {1635,1636,1637,1638};
-Plane Surface(1640) = {1639};
-
-turns = 2;
-zz = 0.01/4;
-
-For j In {1:8*turns}
- Extrude Surface {news-1, {0,0,10*zz}, {0,0,1} , {cc,cc,0} , Pi/4}
- { Layers {10}; Recombine; };
-EndFor
-
-Point(p+4000)={0.1, -0.02 + 0.24, 0, lc};
-Point(p+4001)={0.1, -0.01 + 0.24, 0, lc};
-Point(p+4002)={0.1, -0.02 + 0.24, 0.01, lc};
-Point(p+4003)={0.1, -0.03 + 0.24, 0, lc};
-Point(p+4004)={0.1, -0.02 + 0.24, -0.01, lc};
-Circle(4635) = {p+4001,p+4000,p+4002};
-Circle(4636) = {p+4002,p+4000,p+4003};
-Circle(4637) = {p+4003,p+4000,p+4004};
-Circle(4638) = {p+4004,p+4000,p+4001};
-
-Line Loop(4639) = {4635,4636,4637,4638};
-Plane Surface(4640) = {4639};
-
-For j In {1:8*turns}
- Extrude Surface {news-1, {0,0,10*zz}, {0,0,1} , {cc,cc,0} , Pi/4}
- { Layers {10}; Recombine; };
-EndFor
-
-// options
-Mesh.PartitionByExtrusion=1; // forces partitioning by columns
-Mesh.NbPartitions=20;
-Mesh.ColorCarousel = 3;
-Mesh.SurfaceFaces= 1;
-Mesh.VolumeEdges = 0;
-Mesh.VolumeFaces = 1;
-Mesh.Color.Zero = {255,0,0};
-Mesh.Color.One = {0,0,255};
-Mesh.Color.Two = {0,255,0};
-Mesh.Color.Three = {255,255,0};
-Mesh.Color.Four = {255,0,255};
-Mesh.Color.Six = {255,128,0};
-Mesh.Color.Seven = {64,128,32};
diff --git a/benchmarks/extrude/test_layers_numbering.geo b/benchmarks/extrude/test_layers_numbering.geo
deleted file mode 100644
index cbf30682a42aa2e113ac799df4b6ff3f74910e55..0000000000000000000000000000000000000000
--- a/benchmarks/extrude/test_layers_numbering.geo
+++ /dev/null
@@ -1,18 +0,0 @@
-lc = 0.1;
-
-Point(1)={0.0,0.0,0.0,lc};
-Point(2)={1.0,0.0,0.0,lc};
-
-Line(1)={1,2};
-
-Extrude Line { 1, {0,0.1,0.0} }
-{ Layers { {10,10}, {10,20}, {0.2,1} };
- Recombine;
-};
-
-Extrude Point { 1, {0,-0.2,-0.3} }
-{ Layers { {10,10}, {11,21}, {0.2,1} }; };
-
-
-Extrude Surface{ 5, {0,0.1,0.6}}
-{ Layers { {10,10}, {110,210}, {0.2,1} }; Recombine; };