update layers to remove warnings

benchmarks/extrude/Cube-01-ExtrMesh.geo

@@ -12,8 +12,7 @@ Line Loop(5) = {2,3,4,1};
 Plane Surface(6) = {5};                                          
 Extrude {0,0.0,1}{                               
   Surface{6};
-  Layers {{10,5,10},{100,200,300},{.1,.9,1.}};                                  
+  Layers {{10,5,10},{.1,.9,1.}};                                  
   //Recombine;
 }
 
-Physical Volume(99) = {100,200,300};

benchmarks/extrude/Cube-02-ExtrMesh.geo

@@ -14,7 +14,7 @@ Line Loop(5) = {2,3,4,1};
 Plane Surface(6) = {5};                                                
 Extrude Surface {6, {0,0.0,1}}                                     
 {                                     
-      Layers { {120}, {1.}, {1} };                                        
+  Layers { 120 };
 } ;                                    
            
 Line(29) = {4,6};        

benchmarks/extrude/Cube-05-ExtrMesh.geo

@@ -26,7 +26,7 @@ Plane Surface(11) = {9,10};
             
 Extrude Surface{11, {0.0,1,0}, {-.5,0.0,0.0}, 3.14159/4 }          
 {                                                
-      Layers { {5,15,5} , {10,20,10} , {.1,.9,1.} };
+      Layers { {5,15,5} , {.1,.9,1.} };
 } ;            
 
 Extrude Surface{24, {0.0,.3,0} };            

benchmarks/extrude/Cube-06-ExtrMesh.geo

@@ -25,5 +25,5 @@ Line Loop(10) = {7,8,5,6};
 Plane Surface(11) = {9,10};        
 Extrude Surface {11, {.0,0.0,.1}}
 {    
- Layers { {2,3,2} , {44,55,44} , {.1,.9,1.} };                 
+ Layers { {2,3,2} , {.1,.9,1.} };                 
 };        

benchmarks/extrude/Torus-ExtrMesh-2.geo

@@ -14,7 +14,7 @@ Plane Surface(6) = {5};
             
 Extrude Surface{6, {0.0,1,0}, {0,0.0,0.0}, 3.14159/2}
 {    
-   Layers {{10,25,10},{11,22,11},{.1,.9,1.}} ;    
+   Layers {{10,25,10},{.1,.9,1.}} ;    
 } ;            
 
 Coherence;            
@@ -27,7 +27,7 @@ Complex Volume(52) = {51};
 
 Extrude Surface {45, {0,2,0.0}}
 {    
-   Layers {{10,25,10},{111,222,111},{.1,.9,1.}};    
+   Layers {{10,25,10},{.1,.9,1.}};    
 } ; 
 Coherence; 
 

benchmarks/extrude/Torus-ExtrMesh.geo

@@ -14,7 +14,7 @@ Plane Surface(6) = {5};
             
 Extrude Surface{6, {0.0,1,0}, {0,0.0,0.0}, 3.14159/2}
 {    
-   Layers {{3,10,3},{11,22,11},{.1,.9,1.}} ;    
+   Layers {{3,10,3}, {.1,.9,1.}} ;    
 } ;            
 
 Coherence;            

benchmarks/extrude/afpm.geo

@@ -20,15 +20,15 @@ EndFor
 
 For i In {0:6}
   For j In {0:9}
-    Extrude Line {num[i], {0,0,1}, {0,0,0}, t[j]*deg2rad}{Layers{1,1,1};Recombine;};
+    Extrude Line {num[i], {0,0,1}, {0,0,0}, t[j]*deg2rad}{Layers{1};Recombine;};
     num[i] = newreg-(i?3:2);
   EndFor
 EndFor
 
 For i In {1:70}
-  Extrude Surface {i, {0,0,0.005}}{Layers{1,3*1e8+1*1e6+i,1};Recombine;};
+  Extrude Surface {i, {0,0,0.005}}{Layers{1};Recombine;};
   For j In {1:5}
-     Extrude Surface {news-1, {0,0,0.005}}{Layers{1,3*1e8+(j+1)*1e6+i,1};Recombine;};
+     Extrude Surface {news-1, {0,0,0.005}}{Layers{1};Recombine;};
   EndFor
 EndFor
 

benchmarks/extrude/degenerate.geo

@@ -34,100 +34,33 @@ Line Loop(14) = {13,-1,-9,10};
 Plane Surface(15) = {14};
 
 Extrude Surface { 15, {0,1,0} , {0,0,0} , Pi/2 } { 
-  Recombine ; Layers { n, 200, 1 } ; 
+  Recombine ; Layers { n, 1 } ; 
 };
 
 
 // Induc
 Line Loop(16) = {2,11,12,13};
 Plane Surface(17) = {16};
-Physical Surface(100) = {17};
 
 Extrude Surface { 17, {0,1,0} , {0,0,0} , Pi/2 } { 
-  Recombine ; Layers { n, 201, 1 } ; 
+  Recombine ; Layers { n, 1 } ; 
 };
 
-Physical Surface(101) = {24, 117, 113};
-Physical Surface(102) = {122};
-Physical Surface(103) = {109};
-
-Physical Volume(1) = {201};
-
 // Air
 Line Loop(18) = {-10,-8,-6,-3,11,12};
 Plane Surface(19) = {18};
-Physical Surface(104) = {15,19};
 
 Extrude Surface { 19, {0,1,0} , {0,0,0} , Pi/2 } { 
-  Recombine ; Layers { n, 202, 1 } ; 
+  Recombine ; Layers { n, 1 } ; 
 };
 
-Physical Surface(105) = {32, 149};
-Physical Surface(106) = {136};
-Physical Surface(107) = {27, 140};
-
-Physical Volume(2) = {201, 202};
-
 // AirInf
 Line Loop(20) = {-7,-5,-4,6};
 Plane Surface(21) = {20};
-Physical Surface(108) = {21};
-Physical Surface(109) = {166};
-Physical Surface(110) = {158};
-Physical Surface(111) = {162};
 
 Extrude Surface { 21, {0,1,0} , {0,0,0} , Pi/2 } { 
-  Recombine ; Layers { n, 203, 1 } ; 
+  Recombine ; Layers { n, 1 } ; 
 };
 
 
-Physical Volume(3) = {203};
-
-// Symetrie 
-/*
- Symmetry { 0,1,0,0 } {
-    Duplicata{ Surface{24}; }
-   }
- Symmetry { 0,1,0,0 } {
-    Duplicata{ Surface{117}; }
-   }
- Symmetry { 0,1,0,0 } {
-    Duplicata{ Surface{113}; }
-   }
- Physical Surface(200) = {167, 172, 177};
- 
- Symmetry { 0,1,0,0 } {
-    Duplicata{ Surface{17}; }
-   }
- Symmetry { 0,1,0,0 } {
-    Duplicata{ Surface{122}; }   
-   }
- Physical Surface(201) = {201, 202};
- 
- Symmetry { 0,1,0,0 } {
-    Duplicata{ Surface{15}; }
-   }
- Symmetry { 0,1,0,0 } {
-    Duplicata{ Surface{19}; }
-   }
- Symmetry { 0,1,0,0 } {
-    Duplicata{ Surface{21}; }
-   }
- Physical Surface(202) = {203, 208, 212};
-   
- Symmetry { 0,1,0,0 } {
-    Duplicata{ Surface{32}; }
-   }
- Symmetry { 0,1,0,0 } {
-    Duplicata{ Surface{149}; }
-   }
- Symmetry { 0,1,0,0 } {
-    Duplicata{ Surface{166}; }
-   }
- Physical Surface(203) = {215, 220,224};
-*/
-// bug ???
-
 Symmetry { 0,1,0,0 } { Duplicata{ Surface{158}; } }
-
-Physical Surface(204) = {215, 220,224};

benchmarks/extrude/hybrid.geo

@@ -14,7 +14,7 @@ Plane Surface(6) = {5};
             
 Extrude Surface{6, {0.0,1,0}, {0,0.0,0.0}, 3.14159/2}
 {    
-   Layers {{5,10,5},{11,22,11},{.1,.9,1.}} ;    
+   Layers {{5,10,5}, {.1,.9,1.}} ;    
 } ;            
             
 Coherence;              
@@ -22,7 +22,7 @@ Extrude Surface {6, {0,0.0,2}} ;
 
 Extrude Surface {45, {0,2,0.0}}
 {    
-   Layers {{2,2,2},{111,222,111},{.3,.6,1.}};    
+   Layers {{2,2,2}, {.3,.6,1.}};    
 } ; 
 Coherence; 
 Extrude Surface {65, {-1,0,0}};

benchmarks/extrude/jonas.geo

@@ -97,10 +97,6 @@ Circle(207) = {211,210,209};
 Line(208) = {212,211};
 Line(209) = {213,212};
 
-// Set attributes
-
-//Physical Line(01010100010) = {2:9,102:109,202:209};
-
 // Define the bumperbeam
 
 size_beam = 10;
@@ -138,12 +134,12 @@ Line(308) = {304,305};
 For i In {2:9}
 
 Extrude Line {i, {0,face,0}} {
-  Layers {face/size_pend,1000,1};
+  Layers {face/size_pend};
   Recombine;
 };
 
 Extrude Line {i, {0,-face,0}} {
-  Layers {face/size_pend,1000,1};
+  Layers {face/size_pend};
   Recombine;
 };
 
@@ -153,12 +149,12 @@ For i In {102:109}
 
 Extrude Line {i, {0,0,1}, {-102+tx,203+ty,0+tz},
 -Pi/2} {
-  Layers {arch/size_pend,1001,1};
+  Layers {arch/size_pend};
   Recombine;
 };
 
 Extrude Line {i, {-depth,0,0}} {
-  Layers {depth/size_pend,1001,1};
+  Layers {depth/size_pend};
   Recombine;
 };
 
@@ -168,12 +164,12 @@ For i In {202:209}
 
 Extrude Line {i, {0,0,1}, {-102+tx,-203+ty,0+tz},
 Pi/2} {
-  Layers {arch/size_pend,1002,1};
+  Layers {arch/size_pend};
   Recombine;
 };
 
 Extrude Line {i, {-depth,0,0}} {
-  Layers {depth/size_pend,1002,1};
+  Layers {depth/size_pend};
   Recombine;
 };
 
@@ -184,20 +180,14 @@ EndFor
 For i In {301:308}
 
 Extrude Line {i, {0,0,1}, {cx+btx,bty,btz}, angle} {
-  Layers {barch/size_beam,1003,1};
+  Layers {barch/size_beam};
   Recombine;
 };
 
 Extrude Line {i, {0,0,1}, {cx+btx,bty,btz}, -angle} {
-  Layers {barch/size_beam,1003,1};
+  Layers {barch/size_beam};
   Recombine;
 };
 
 EndFor
 
-// Set beam attribute on autogenerated surfaces.
-
-Physical Surface(1) = 1000;
-Physical Surface(2) = 1001;
-Physical Surface(3) = 1002;
-Physical Surface(4) = 1003;

benchmarks/extrude/onde.geo

@@ -16,11 +16,6 @@ Line(2) = {7,1};
 Line(3) = {1,2};
 Line Loop(4) = {3,1,2};
 Plane Surface(5) = {4};
-Extrude Surface {5, {0,1,0}, {0,0,0}, Pi/2}  
-{Layers{10,100,1}; };
+Extrude Surface {5, {0,1,0}, {0,0,0}, Pi/2}{ Layers{10}; };
 
-//Surface Loop(18) = {5,17,13,16};
-//Volume(19) = {18};
-
-//Physical Volume(1)=100;
 

benchmarks/extrude/p7-ExtrMesh.geo

@@ -124,5 +124,5 @@ Coherence;
       
 Extrude Surface {35, {0,0.0,19}}  
 {  
-  Layers { {3,3,3}, {100,200,300}, {.1,.9,1.}} ;  
+  Layers { {3,3,3}, {.1,.9,1.}} ;  
 };  

benchmarks/extrude/point.geo

@@ -3,23 +3,23 @@ lclev = L / 4;
 
 Point(1) = {0.0*L, 0.0*L,   0.0, lclev};
 
-Extrude Point {1, {L,0,0}}{ Layers { {5,10}, {1,1}, {0.7,1} } ; Recombine; };
-Extrude Line {1, {0,L/2,0}}{ Layers { {5,10}, {2,2}, {0.7,1} } ; Recombine;  };
-Extrude Surface {5, {0,0,L}}{ Layers { {5,10}, {3,3}, {0.7,1} } ; Recombine; };
+Extrude Point {1, {L,0,0}}{ Layers { {5,10}, {0.7,1} } ; Recombine; };
+Extrude Line {1, {0,L/2,0}}{ Layers { {5,10}, {0.7,1} } ; Recombine;  };
+Extrude Surface {5, {0,0,L}}{ Layers { {5,10}, {0.7,1} } ; Recombine; };
 
 Point(1000) = {1, 0, 0, lclev};
 Extrude Point {1000, {0,0,1} , {0.85,0,0} , -2*Pi/3 }{
-  Layers { {5,10}, {1,1}, {0.7,1} } ; Recombine; 
+  Layers { {5,10}, {0.7,1} } ; Recombine; 
 };
 Extrude Point {1001, {0,0,1} , {0.85,0,0} , -2*Pi/3 }{
-  Layers { {5,10}, {1,1}, {0.7,1} } ; Recombine; 
+  Layers { {5,10}, {0.7,1} } ; Recombine; 
 };
 Extrude Point {1003, {0,0,1} , {0.85,0,0} , -2*Pi/3 }{
-  Layers { {5,10}, {1,1}, {0.7,1} } ; Recombine; 
+  Layers { {5,10}, {0.7,1} } ; Recombine; 
 };
 
 Line Loop(31) = {29,30,28};
 Plane Surface(32) = {31};
 Extrude Surface {32, {0,0,L/2}}{
-  Layers { {5,10}, {1,1}, {0.7,1} } ; Recombine; 
+  Layers { {5,10}, {0.7,1} } ; Recombine; 
 };

benchmarks/extrude/point_new.geo

@@ -4,29 +4,29 @@ lclev = L / 4;
 Point(1) = {0.0*L, 0.0*L,   0.0, lclev};
 
 Extrude {L,0,0} { 
-  Point{1}; Layers { {5,10}, {1,1}, {0.7,1} } ; Recombine; 
+  Point{1}; Layers { {5,10}, {0.7,1} } ; Recombine; 
 }
 Extrude {0,L/2,0} { 
-  Line{1}; Layers { {5,10}, {2,2}, {0.7,1} } ; Recombine;  
+  Line{1}; Layers { {5,10}, {0.7,1} } ; Recombine;  
 }
 Extrude {0,0,L} {
-  Surface{5}; Layers { {5,10}, {3,3}, {0.7,1} } ; Recombine; 
+  Surface{5}; Layers { {5,10}, {0.7,1} } ; Recombine; 
 }
 
 Point(1000) = {1, 0, 0, lclev};
 Extrude { {0,0,1} , {0.85,0,0} , -2*Pi/3 } { 
-  Point{1000}; Layers { {5,10}, {1,1}, {0.7,1} } ; Recombine; 
+  Point{1000}; Layers { {5,10}, {0.7,1} } ; Recombine; 
 }
 
 Extrude { {0,0,1} , {0.85,0,0} , -2*Pi/3 } { 
-  Point{1001}; Layers { {5,10}, {1,1}, {0.7,1} } ; Recombine; 
+  Point{1001}; Layers { {5,10}, {0.7,1} } ; Recombine; 
 }
 Extrude { {0,0,1} , {0.85,0,0} , -2*Pi/3 } { 
-  Point{1003}; Layers { {5,10}, {1,1}, {0.7,1} } ; Recombine; 
+  Point{1003}; Layers { {5,10}, {0.7,1} } ; Recombine; 
 }
 
 Line Loop(31) = {29,30,28};
 Plane Surface(32) = {31};
 Extrude {0,0,L/2} { 
-  Surface{32}; Layers { {5,10}, {1,1}, {0.7,1} } ; Recombine; 
+  Surface{32}; Layers { {5,10}, {0.7,1} } ; Recombine; 
 }

benchmarks/extrude/runner_simple_3d-ExtrMesh.geo

@@ -121,25 +121,21 @@ Plane Surface(619) = {618};
   
 ex = .05;
 
-Extrude Surface{619, {0.0,0.0,ex}}{ Layers{ {10}, {1}, {1} };  };  
+Extrude Surface{619, {0.0,0.0,ex}}{ Layers{ 10 };  };  
 Coherence;  
-Extrude Surface{301, {0.0,0.0,ex}}{ Layers{ {10}, {1}, {1} };  };  
+Extrude Surface{301, {0.0,0.0,ex}}{ Layers{ 10 };  };  
 Coherence;  
-Extrude Surface{401, {0.0,0.0,ex}}{ Layers{ {10}, {1}, {1} };  };  
+Extrude Surface{401, {0.0,0.0,ex}}{ Layers{ 10 };  };  
 Coherence;  
-Extrude Surface{403, {0.0,0.0,ex}}{ Layers{ {10}, {1}, {1} };  };  
+Extrude Surface{403, {0.0,0.0,ex}}{ Layers{ 10 };  };  
 Coherence;  
-Extrude Surface{405, {0.0,0.0,ex}}{ Layers{ {10}, {1}, {1} };  };  
+Extrude Surface{405, {0.0,0.0,ex}}{ Layers{ 10 };  };  
 Coherence;  
-Extrude Surface{407, {0.0,0.0,ex}}{ Layers{ {10}, {1}, {1} };  };  
+Extrude Surface{407, {0.0,0.0,ex}}{ Layers{ 10 };  };  
 Coherence;  
-Extrude Surface{409, {0.0,0.0,ex}}{ Layers{ {10}, {1}, {1} };  };  
+Extrude Surface{409, {0.0,0.0,ex}}{ Layers{ 10 };  };  
 Coherence;  
-Extrude Surface{411, {0.0,0.0,ex}}{ Layers{ {10}, {1}, {1} };  };  
+Extrude Surface{411, {0.0,0.0,ex}}{ Layers{ 10 };  };  
 Coherence;  
-Extrude Surface{413, {0.0,0.0,ex}}{ Layers{ {10}, {1}, {1} };  };  
+Extrude Surface{413, {0.0,0.0,ex}}{ Layers{ 10 };  };  
 Coherence;  
- 
-Physical Volume(1) = {1};
-Physical Surface(2) = {652,656,702,660,664,734,790,791,756,676,680,848,636,826,804};
- 

benchmarks/extrude/spirale.geo

@@ -37,25 +37,25 @@ zz = 0.01;
 cc = 0.1;
 
 Extrude Surface {news-1, {0,0,2*zz}, {0,0,1} , {cc,cc,0} , 0}
-                { Layers {2,1,1}; Recombine; };
+                { 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,1,1}; Recombine; };
+                  { 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,1,1}; Recombine; };
+                  { 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,1,1}; Recombine; };
+                  { Layers {1}; Recombine; };
 EndFor
 
 Extrude Surface {news-1, {0,0,2*zz}, {0,0,1} , {cc,cc,0} , 0}
-                { Layers {2,1,1}; Recombine; };
+                { Layers {2}; Recombine; };
 
 p = newp;
 
@@ -78,7 +78,7 @@ 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,1,1}; Recombine; };
+                  { Layers {10}; Recombine; };
 EndFor
 
 Point(p+4000)={0.1, -0.02 + 0.24, 0, lc};
@@ -96,5 +96,5 @@ 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,1,1}; Recombine; };
+                  { Layers {10}; Recombine; };
 EndFor

benchmarks/extrude/stator-newxtr-rec.geo

@@ -63,68 +63,68 @@ Plane Surface(10) = {9};
 
 // 1st gap
 
-Extrude Surface {2, {0,0,1}, {0,0,0}, Pi/180}{ Recombine ; Layers { 1, 9000+100, 1 } ;};
-Extrude Surface {4, {0,0,1}, {0,0,0}, Pi/180}{ Recombine ; Layers { 1, 9004+100, 1 } ;};
-Extrude Surface {6, {0,0,1}, {0,0,0}, Pi/180}{ Recombine ; Layers { 1, 9008+100, 1 } ;};
-Extrude Surface {8, {0,0,1}, {0,0,0}, Pi/180}{ Recombine ; Layers { 1, 9012+100, 1 } ;};
-Extrude Surface {10, {0,0,1}, {0,0,0}, Pi/180}{Recombine ; Layers { 1, 9016+100, 1 } ;};
+Extrude Surface {2, {0,0,1}, {0,0,0}, Pi/180}{ Recombine ; Layers { 1 } ;};
+Extrude Surface {4, {0,0,1}, {0,0,0}, Pi/180}{ Recombine ; Layers { 1 } ;};
+Extrude Surface {6, {0,0,1}, {0,0,0}, Pi/180}{ Recombine ; Layers { 1 } ;};
+Extrude Surface {8, {0,0,1}, {0,0,0}, Pi/180}{ Recombine ; Layers { 1 } ;};
+Extrude Surface {10, {0,0,1}, {0,0,0}, Pi/180}{Recombine ; Layers { 1 } ;};
 
 // 1st piezo
 ne[] = {1,1,1,nArc,1,1,1};
 nd[] = {0.02, 0.05, 0.09, 0.91, 0.95, 0.98, 1};
-Extrude Surface {37, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{ Recombine ; Layers { ne[], {9000,9000,9000,9000,9000,9000,9000}, nd[]} ;};
-Extrude Surface {59, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{ Recombine ; Layers { ne[], {9004,9004,9004,9004,9004,9004,9004}, nd[]} ;};
-Extrude Surface {81, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{ Recombine ; Layers { ne[], {9008,9008,9008,9008,9008,9008,9008}, nd[]} ;};
-Extrude Surface {103, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{ Recombine ; Layers { ne[], {9012,9012,9012,9012,9012,9012,9012 },nd[] } ;};
-Extrude Surface {125, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{ Recombine ; Layers { ne[], {9016,9016,9016,9016,9016,9016,9016 },nd[] } ;};
+Extrude Surface {37, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{ Recombine ; Layers { ne[], nd[]} ;};
+Extrude Surface {59, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{ Recombine ; Layers { ne[], nd[]} ;};
+Extrude Surface {81, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{ Recombine ; Layers { ne[], nd[]} ;};
+Extrude Surface {103, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{ Recombine ; Layers { ne[], nd[] } ;};
+Extrude Surface {125, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{ Recombine ; Layers { ne[], nd[] } ;};
 
 // 2nd gap
 
-Extrude Surface {147, {0,0,1}, {0,0,0}, Pi/180}{Recombine ; Layers { {1}, {9001+200}, {1} } ;};
-Extrude Surface {169, {0,0,1}, {0,0,0}, Pi/180}{Recombine ; Layers { {1}, {9005+200}, {1} } ;};
-Extrude Surface {191, {0,0,1}, {0,0,0}, Pi/180}{Recombine ; Layers { {1}, {9009+200}, {1} } ;};
-Extrude Surface {213, {0,0,1}, {0,0,0}, Pi/180}{Recombine ; Layers { {1}, {9013+200}, {1} } ;};
-Extrude Surface {235, {0,0,1}, {0,0,0}, Pi/180}{Recombine ; Layers { {1}, {9017+200}, {1} } ;};
+Extrude Surface {147, {0,0,1}, {0,0,0}, Pi/180}{Recombine ; Layers { 1 } ;};
+Extrude Surface {169, {0,0,1}, {0,0,0}, Pi/180}{Recombine ; Layers { 1 } ;};
+Extrude Surface {191, {0,0,1}, {0,0,0}, Pi/180}{Recombine ; Layers { 1 } ;};
+Extrude Surface {213, {0,0,1}, {0,0,0}, Pi/180}{Recombine ; Layers { 1 } ;};
+Extrude Surface {235, {0,0,1}, {0,0,0}, Pi/180}{Recombine ; Layers { 1 } ;};
 
 // 2nd pizeo
 
-Extrude Surface {257, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{Recombine ; Layers { ne[], {9001, 9001,9001,9001, 9001,9001,9001}, nd[] } ;};
-Extrude Surface {279, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{Recombine ; Layers { ne[], {9005, 9005,9005,9005, 9005,9005,9005}, nd[] } ;};
-Extrude Surface {301, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{Recombine ; Layers { ne[], {9009, 9009,9009,9009, 9009,9009,9009}, nd[] } ;};
-Extrude Surface {323, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{Recombine ; Layers { ne[], {9013, 9013,9013,9013, 9013,9013,9013}, nd[] } ;};
-Extrude Surface {345, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{Recombine ; Layers { ne[], {9017, 9017,9017,9017, 9017,9017,9017}, nd[] } ;};
+Extrude Surface {257, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{Recombine ; Layers { ne[], nd[] } ;};
+Extrude Surface {279, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{Recombine ; Layers { ne[], nd[] } ;};
+Extrude Surface {301, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{Recombine ; Layers { ne[], nd[] } ;};
+Extrude Surface {323, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{Recombine ; Layers { ne[], nd[] } ;};
+Extrude Surface {345, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{Recombine ; Layers { ne[], nd[] } ;};
 
 // 3rd gap
 
-Extrude Surface {257+110, {0,0,1}, {0,0,0}, Pi/180}{Recombine ; Layers { {1}, {9002+300}, {1} } ;};
-Extrude Surface {279+110, {0,0,1}, {0,0,0}, Pi/180}{Recombine ; Layers { {1}, {9006+300}, {1} } ;};
-Extrude Surface {301+110, {0,0,1}, {0,0,0}, Pi/180}{Recombine ; Layers { {1}, {9010+300}, {1} } ;};
-Extrude Surface {323+110, {0,0,1}, {0,0,0}, Pi/180}{Recombine ; Layers { {1}, {9014+300}, {1} } ;};
-Extrude Surface {345+110, {0,0,1}, {0,0,0}, Pi/180}{Recombine ; Layers { {1}, {9018+300}, {1} } ;};
+Extrude Surface {257+110, {0,0,1}, {0,0,0}, Pi/180}{Recombine ; Layers { 1 } ;};
+Extrude Surface {279+110, {0,0,1}, {0,0,0}, Pi/180}{Recombine ; Layers { 1 } ;};
+Extrude Surface {301+110, {0,0,1}, {0,0,0}, Pi/180}{Recombine ; Layers { 1 } ;};
+Extrude Surface {323+110, {0,0,1}, {0,0,0}, Pi/180}{Recombine ; Layers { 1 } ;};
+Extrude Surface {345+110, {0,0,1}, {0,0,0}, Pi/180}{Recombine ; Layers { 1 } ;};
 
 // 3rd piezo
 
-Extrude Surface {257+220, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{Recombine ; Layers { ne[], {9002, 9002,9002,9002, 9002,9002,9002}, nd[] } ;};
-Extrude Surface {279+220, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{Recombine ; Layers { ne[], {9006, 9006,9006,9006, 9006,9006,9006}, nd[] } ;};
-Extrude Surface {301+220, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{Recombine ; Layers { ne[], {9010, 9010,9010,9010, 9010,9010,9010}, nd[] } ;};
-Extrude Surface {323+220, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{Recombine ; Layers { ne[], {9014, 9014,9014,9014, 9014,9014,9014}, nd[] } ;};
-Extrude Surface {345+220, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{Recombine ; Layers { ne[], {9018, 9018,9018,9018, 9018,9018,9018}, nd[] } ;};
+Extrude Surface {257+220, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{Recombine ; Layers { ne[], nd[] } ;};
+Extrude Surface {279+220, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{Recombine ; Layers { ne[], nd[] } ;};
+Extrude Surface {301+220, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{Recombine ; Layers { ne[], nd[] } ;};
+Extrude Surface {323+220, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{Recombine ; Layers { ne[], nd[] } ;};
+Extrude Surface {345+220, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{Recombine ; Layers { ne[], nd[] } ;};
 
 // 4th gap
 
-Extrude Surface {257+330, {0,0,1}, {0,0,0}, Pi/180}{Recombine ; Layers { {1}, {9003+400}, {1} } ;};
-Extrude Surface {279+330, {0,0,1}, {0,0,0}, Pi/180}{Recombine ; Layers { {1}, {9007+400}, {1} } ;};
-Extrude Surface {301+330, {0,0,1}, {0,0,0}, Pi/180}{Recombine ; Layers { {1}, {9011+400}, {1} } ;};
-Extrude Surface {323+330, {0,0,1}, {0,0,0}, Pi/180}{Recombine ; Layers { {1}, {9015+400}, {1} } ;};
-Extrude Surface {345+330, {0,0,1}, {0,0,0}, Pi/180}{Recombine ; Layers { {1}, {9019+400}, {1} } ;};
+Extrude Surface {257+330, {0,0,1}, {0,0,0}, Pi/180}{Recombine ; Layers { 1 } ;};
+Extrude Surface {279+330, {0,0,1}, {0,0,0}, Pi/180}{Recombine ; Layers { 1 } ;};
+Extrude Surface {301+330, {0,0,1}, {0,0,0}, Pi/180}{Recombine ; Layers { 1 } ;};
+Extrude Surface {323+330, {0,0,1}, {0,0,0}, Pi/180}{Recombine ; Layers { 1 } ;};
+Extrude Surface {345+330, {0,0,1}, {0,0,0}, Pi/180}{Recombine ; Layers { 1 } ;};
 
 // 4th pizeo
 
-Extrude Surface {257+440, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{Recombine ; Layers { ne[], {9003,9003,9003,9003,9003,9003,9003}, nd[] } ;};
-Extrude Surface {279+440, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{Recombine ; Layers { ne[], {9007,9007,9007,9007,9007,9007,9007}, nd[] } ;};
-Extrude Surface {301+440, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{Recombine ; Layers { ne[], {9011,9011,9011,9011,9011,9011,9011}, nd[] } ;};
-Extrude Surface {323+440, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{Recombine ; Layers { ne[], {9015,9015,9015,9015,9015,9015,9015}, nd[] } ;};
-Extrude Surface {345+440, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{Recombine ; Layers { ne[], {9019,9019,9019,9019,9019,9019,9019}, nd[] } ;};
+Extrude Surface {257+440, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{Recombine ; Layers { ne[], nd[] } ;};
+Extrude Surface {279+440, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{Recombine ; Layers { ne[], nd[] } ;};
+Extrude Surface {301+440, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{Recombine ; Layers { ne[], nd[] } ;};
+Extrude Surface {323+440, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{Recombine ; Layers { ne[], nd[] } ;};
+Extrude Surface {345+440, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{Recombine ; Layers { ne[], nd[] } ;};
 
 PZTA = 1000;
 PZTB = 1500;
@@ -147,23 +147,3 @@ Point101 = 1011;
 Cover = 1012;
 
 
-Physical Volume (PZTA) = {9012,9013,9016,9017  , 9012+100,9013+200,9016+100,9017+200 } ;
-Physical Volume (PZTB) = {9014,9015,9018,9019  , 9014+300,9015+400,9018+300,9019+400 } ;
-
-Physical Volume (Stator) = {9000,9001,9002,9003, 9004,9005,9006,9007, 9008,9009,9010,9011,
-                             9000+100,9001+200,9002+300,9003+400,
-                             9004+100,9005+200,9006+300,9007+400,     
-			     9008+100,9009+200,9010+300,9011+400  } ; 
-
-Physical Surface (Electrode1)       = {208,230} ;
-Physical Surface (Electrode2)       = {428,450} ;
-Physical Surface (Electrode3)       = {648,670} ;
-Physical Surface (Electrode4)       = {861,882} ;
-Physical Surface (Electrode_Upper1) = {142,164} ;
-Physical Surface (Electrode_Upper2) = {362,384} ; 
-Physical Surface (Electrode_Upper3) = {582,604} ;
-Physical Surface (Electrode_Upper4) = {802,823} ;
-Physical Surface (Inner_Cylinder)   = {36,146,256,366, 476,586,696,806, 102,212,322,432,542,652,762,865} ;
-
-Physical Point (Point99) = {201};
-Physical Point (Point101) = {203};

benchmarks/extrude/stator-newxtr.geo

@@ -63,151 +63,68 @@ Plane Surface(10) = {9};
 
 // 1st gap
 
-Geometry.AutoCoherence = 0;
-
-Extrude Surface {2, {0,0,1}, {0,0,0}, Pi/180}{  
- Layers { {1}, {9000+100}, {1} } ;
-};
-Extrude Surface {4, {0,0,1}, {0,0,0}, Pi/180}{
- Layers { {1}, {9004+100}, {1} } ;
-};
-Extrude Surface {6, {0,0,1}, {0,0,0}, Pi/180}{
- Layers { {1}, {9008+100}, {1} } ;
-};
-Extrude Surface {8, {0,0,1}, {0,0,0}, Pi/180}{
- Layers { {1}, {9012+100}, {1} } ;
-};
-Extrude Surface {10, {0,0,1}, {0,0,0}, Pi/180}{
- Layers { {1}, {9016+100}, {1} } ;
-};
+Extrude Surface {2, {0,0,1}, {0,0,0}, Pi/180}{  Layers { 1 } ;};
+Extrude Surface {4, {0,0,1}, {0,0,0}, Pi/180}{  Layers { 1 } ;};
+Extrude Surface {6, {0,0,1}, {0,0,0}, Pi/180}{  Layers { 1 } ;};
+Extrude Surface {8, {0,0,1}, {0,0,0}, Pi/180}{  Layers { 1 } ;};
+Extrude Surface {10, {0,0,1}, {0,0,0}, Pi/180}{ Layers { 1 } ;};
 
 // 1st piezo
-
-Extrude Surface {37, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{                     
- Layers { {1,1,1,nArc,1,1,1}, {9000,9000,9000,9000,9000,9000,9000 },{0.02, 0.05, 0.09, 0.91, 0.95, 0.98, 1} } ;
-};
-Extrude Surface {59, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{
- Layers { {1,1,1,nArc,1,1,1}, {9004,9004,9004,9004,9004,9004,9004 },{0.02, 0.05, 0.09, 0.91, 0.95, 0.98, 1 } } ;
-};
-Extrude Surface {81, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{
- Layers { {1,1,1,nArc,1,1,1}, {9008,9008,9008,9008,9008,9008,9008},{0.02, 0.05, 0.09, 0.91, 0.95, 0.98, 1 } } ;
-};
-Extrude Surface {103, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{
- Layers { {1,1,1,nArc,1,1,1}, {9012,9012,9012,9012,9012,9012,9012 },{0.02, 0.05, 0.09, 0.91, 0.95, 0.98, 1 } } ;
-};
-Extrude Surface {125, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{
- Layers { {1,1,1,nArc,1,1,1}, {9016,9016,9016,9016,9016,9016,9016 },{0.02, 0.05, 0.09, 0.91, 0.95, 0.98, 1 } } ;
-};
+ne[] = {1,1,1,nArc,1,1,1};
+nd[] = {0.02, 0.05, 0.09, 0.91, 0.95, 0.98, 1};
+Extrude Surface {37, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{  Layers { ne[], nd[]} ;};
+Extrude Surface {59, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{  Layers { ne[], nd[]} ;};
+Extrude Surface {81, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{  Layers { ne[], nd[]} ;};
+Extrude Surface {103, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{  Layers { ne[], nd[] } ;};
+Extrude Surface {125, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{  Layers { ne[], nd[] } ;};
 
 // 2nd gap
 
-Extrude Surface {147, {0,0,1}, {0,0,0}, Pi/180}{
- Layers { {1}, {9001+200}, {1} } ;
-};
-Extrude Surface {169, {0,0,1}, {0,0,0}, Pi/180}{
- Layers { {1}, {9005+200}, {1} } ;
-};
-Extrude Surface {191, {0,0,1}, {0,0,0}, Pi/180}{
- Layers { {1}, {9009+200}, {1} } ;
-};
-Extrude Surface {213, {0,0,1}, {0,0,0}, Pi/180}{
- Layers { {1}, {9013+200}, {1} } ;
-};
-Extrude Surface {235, {0,0,1}, {0,0,0}, Pi/180}{
- Layers { {1}, {9017+200}, {1} } ;
-};
+Extrude Surface {147, {0,0,1}, {0,0,0}, Pi/180}{ Layers { 1 } ;};
+Extrude Surface {169, {0,0,1}, {0,0,0}, Pi/180}{ Layers { 1 } ;};
+Extrude Surface {191, {0,0,1}, {0,0,0}, Pi/180}{ Layers { 1 } ;};
+Extrude Surface {213, {0,0,1}, {0,0,0}, Pi/180}{ Layers { 1 } ;};
+Extrude Surface {235, {0,0,1}, {0,0,0}, Pi/180}{ Layers { 1 } ;};
 
 // 2nd pizeo
 
-Extrude Surface {257, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{
- Layers { {1,1,1,nArc,1,1,1}, {9001,9001,9001,9001,9001,9001,9001}, {0.02, 0.05, 0.09, 0.91, 0.95, 0.98, 1} } ;
-};
-Extrude Surface {279, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{
- Layers { {1,1,1,nArc,1,1,1}, {9005, 9005,9005,9005, 9005,9005,9005}, {0.02, 0.05, 0.09, 0.91, 0.95, 0.98, 1} } ;
-};
-Extrude Surface {301, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{
- Layers { {1,1,1,nArc,1,1,1}, {9009, 9009,9009,9009, 9009,9009,9009}, {0.02, 0.05, 0.09, 0.91, 0.95, 0.98, 1} } ;
-};
-Extrude Surface {323, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{
- Layers { {1,1,1,nArc,1,1,1}, {9013, 9013,9013,9013, 9013,9013,9013}, {0.02, 0.05, 0.09, 0.91, 0.95, 0.98, 1} } ;
-};
-Extrude Surface {345, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{
- Layers { {1,1,1,nArc,1,1,1}, {9017, 9017,9017,9017, 9017,9017,9017}, {0.02, 0.05, 0.09, 0.91, 0.95, 0.98, 1} } ;
-};
+Extrude Surface {257, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{ Layers { ne[], nd[] } ;};
+Extrude Surface {279, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{ Layers { ne[], nd[] } ;};
+Extrude Surface {301, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{ Layers { ne[], nd[] } ;};
+Extrude Surface {323, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{ Layers { ne[], nd[] } ;};
+Extrude Surface {345, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{ Layers { ne[], nd[] } ;};
 
 // 3rd gap
 
-Extrude Surface {257+110, {0,0,1}, {0,0,0}, Pi/180}{
- Layers { {1}, {9002+300}, {1} } ;
-};
-Extrude Surface {279+110, {0,0,1}, {0,0,0}, Pi/180}{
- Layers { {1}, {9006+300}, {1} } ;
-};
-Extrude Surface {301+110, {0,0,1}, {0,0,0}, Pi/180}{
- Layers { {1}, {9010+300}, {1} } ;
-};
-Extrude Surface {323+110, {0,0,1}, {0,0,0}, Pi/180}{
- Layers { {1}, {9014+300}, {1} } ;
-};
-Extrude Surface {345+110, {0,0,1}, {0,0,0}, Pi/180}{
- Layers { {1}, {9018+300}, {1} } ;
-};
+Extrude Surface {257+110, {0,0,1}, {0,0,0}, Pi/180}{ Layers { 1 } ;};
+Extrude Surface {279+110, {0,0,1}, {0,0,0}, Pi/180}{ Layers { 1 } ;};
+Extrude Surface {301+110, {0,0,1}, {0,0,0}, Pi/180}{ Layers { 1 } ;};
+Extrude Surface {323+110, {0,0,1}, {0,0,0}, Pi/180}{ Layers { 1 } ;};
+Extrude Surface {345+110, {0,0,1}, {0,0,0}, Pi/180}{ Layers { 1 } ;};
 
 // 3rd piezo
 
-Extrude Surface {257+220, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{
- Layers { {1,1,1,nArc,1,1,1}, {9002, 9002,9002,9002, 9002,9002,9002 }, {0.02, 0.05, 0.09, 0.91, 0.95, 0.98, 1} } ;
-};
-Extrude Surface {279+220, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{
- Layers { {1,1,1,nArc,1,1,1}, {9006, 9006,9006,9006, 9006,9006,9006}, {0.02, 0.05, 0.09, 0.91, 0.95, 0.98, 1} } ;
-};
-Extrude Surface {301+220, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{
- Layers { {1,1,1,nArc,1,1,1}, {9010, 9010,9010,9010, 9010,9010,9010}, {0.02, 0.05, 0.09, 0.91, 0.95, 0.98, 1} } ;
-};
-Extrude Surface {323+220, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{
- Layers { {1,1,1,nArc,1,1,1}, {9014, 9014,9014,9014, 9014,9014,9014}, {0.02, 0.05, 0.09, 0.91, 0.95, 0.98, 1} } ;
-};
-Extrude Surface {345+220, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{
- Layers { {1,1,1,nArc,1,1,1}, {9018, 9018,9018,9018, 9018,9018,9018}, {0.02, 0.05, 0.09, 0.91, 0.95, 0.98, 1} } ;
-};
+Extrude Surface {257+220, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{ Layers { ne[], nd[] } ;};
+Extrude Surface {279+220, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{ Layers { ne[], nd[] } ;};
+Extrude Surface {301+220, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{ Layers { ne[], nd[] } ;};
+Extrude Surface {323+220, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{ Layers { ne[], nd[] } ;};
+Extrude Surface {345+220, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{ Layers { ne[], nd[] } ;};
 
 // 4th gap
 
-Extrude Surface {257+330, {0,0,1}, {0,0,0}, Pi/180}{
- Layers { {1}, {9003+400}, {1} } ;
-};
-Extrude Surface {279+330, {0,0,1}, {0,0,0}, Pi/180}{
- Layers { {1}, {9007+400}, {1} } ;
-};
-Extrude Surface {301+330, {0,0,1}, {0,0,0}, Pi/180}{
- Layers { {1}, {9011+400}, {1} } ;
-};
-Extrude Surface {323+330, {0,0,1}, {0,0,0}, Pi/180}{
- Layers { {1}, {9015+400}, {1} } ;
-};
-Extrude Surface {345+330, {0,0,1}, {0,0,0}, Pi/180}{
- Layers { {1}, {9019+400}, {1} } ;
-};
+Extrude Surface {257+330, {0,0,1}, {0,0,0}, Pi/180}{ Layers { 1 } ;};
+Extrude Surface {279+330, {0,0,1}, {0,0,0}, Pi/180}{ Layers { 1 } ;};
+Extrude Surface {301+330, {0,0,1}, {0,0,0}, Pi/180}{ Layers { 1 } ;};
+Extrude Surface {323+330, {0,0,1}, {0,0,0}, Pi/180}{ Layers { 1 } ;};
+Extrude Surface {345+330, {0,0,1}, {0,0,0}, Pi/180}{ Layers { 1 } ;};
 
 // 4th pizeo
 
-Extrude Surface {257+440, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{
- Layers { {1,1,1,nArc,1,1,1 }, {9003,9003,9003,9003,9003,9003,9003},{0.02, 0.05, 0.09, 0.91, 0.95, 0.98, 1} } ;
-};
-Extrude Surface {279+440, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{
- Layers { {1,1,1,nArc,1,1,1}, {9007,9007,9007,9007,9007,9007,9007}, {0.02, 0.05, 0.09, 0.91, 0.95, 0.98, 1} } ;
-};
-Extrude Surface {301+440, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{
- Layers { {1,1,1,nArc,1,1,1}, {9011,9011,9011,9011,9011,9011,9011}, {0.02, 0.05, 0.09, 0.91, 0.95, 0.98, 1}} ;
-};
-Extrude Surface {323+440, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{
- Layers { {1,1,1,nArc,1,1,1}, {9015,9015,9015,9015,9015,9015,9015}, {0.02, 0.05, 0.09, 0.91, 0.95, 0.98, 1} } ;
-};
-Extrude Surface {345+440, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{
- Layers { {1,1,1,nArc,1,1,1}, {9019,9019,9019,9019,9019,9019,9019}, {0.02, 0.05, 0.09, 0.91, 0.95, 0.98, 1} } ;
-};
-
-Coherence;
+Extrude Surface {257+440, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{ Layers { ne[], nd[] } ;};
+Extrude Surface {279+440, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{ Layers { ne[], nd[] } ;};
+Extrude Surface {301+440, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{ Layers { ne[], nd[] } ;};
+Extrude Surface {323+440, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{ Layers { ne[], nd[] } ;};
+Extrude Surface {345+440, {0,0,1}, {0,0,0}, Pi/2-Pi/180}{ Layers { ne[], nd[] } ;};
 
 PZTA = 1000;
 PZTB = 1500;
@@ -230,23 +147,3 @@ Point101 = 1011;
 Cover = 1012;
 
 
-Physical Volume (PZTA) = {9012,9013,9016,9017  , 9012+100,9013+200,9016+100,9017+200 } ;
-Physical Volume (PZTB) = {9014,9015,9018,9019  , 9014+300,9015+400,9018+300,9019+400 } ;
-
-Physical Volume (Stator) = {9000,9001,9002,9003, 9004,9005,9006,9007, 9008,9009,9010,9011,
-                             9000+100,9001+200,9002+300,9003+400,
-                             9004+100,9005+200,9006+300,9007+400,     
-			     9008+100,9009+200,9010+300,9011+400  } ; 
-
-Physical Surface (Electrode1)       = {208,230} ;
-Physical Surface (Electrode2)       = {428,450} ;
-Physical Surface (Electrode3)       = {648,670} ;
-Physical Surface (Electrode4)       = {861,882} ;
-Physical Surface (Electrode_Upper1) = {142,164} ;
-Physical Surface (Electrode_Upper2) = {362,384} ; 
-Physical Surface (Electrode_Upper3) = {582,604} ;
-Physical Surface (Electrode_Upper4) = {802,823} ;
-Physical Surface (Inner_Cylinder)   = {36,146,256,366, 476,586,696,806, 102,212,322,432,542,652,762,865} ;
-
-Physical Point (Point99) = {201};
-Physical Point (Point101) = {203};

benchmarks/extrude/stator1910.geo

@@ -56,35 +56,35 @@ V_100dent   = 123456;
 i_sect = 1;
 
 Extrude Surface {2, {0,0,1}, {0,0,0}, teta_gap/2}{
-  Recombine ; Layers { 1, V_corp, 1};                           // corp   
+  Recombine ; Layers { 1};                           // corp   
   };
 Extrude Surface {4, {0,0,1}, {0,0,0}, teta_gap/2}{
-  Recombine ; Layers { 1, V_100dent, 1};                        // pas de dent
+  Recombine ; Layers { 1};                        // pas de dent
   };
 Extrude Surface {6, {0,0,1}, {0,0,0}, teta_gap/2}{
-  Recombine ; Layers { 1, V_100dent, 1};                        // pas de dent
+  Recombine ; Layers { 1};                        // pas de dent
   };
 Extrude Surface {8, {0,0,1}, {0,0,0}, teta_gap/2}{
-  Recombine ; Layers { 1 ,V_PZT_lower + N_*(i_sect-1), 1 };     // PZT_lower
+  Recombine ; Layers { 1 };     // PZT_lower
   };
 Extrude Surface {10, {0,0,1}, {0,0,0}, teta_gap/2}{
-  Recombine ; Layers { 1, V_PZT_upper + N_*(i_sect-1), 1 };     // PZT_upper 
+  Recombine ; Layers { 1};     // PZT_upper 
   };
 
 Extrude Surface {86, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
-  Recombine ; Layers { 1 ,V_corp, 1 };                                // corp
+  Recombine ; Layers { 1 };                                // corp
   };
 Extrude Surface {108, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
-  Recombine ; Layers { 1, V_100dent, 1 };                             // pas de dent
+  Recombine ; Layers { 1 };                             // pas de dent
   };
 Extrude Surface {130, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
-  Recombine ; Layers { 1, V_100dent, 1 };                             // pas de dent
+  Recombine ; Layers { 1 };                             // pas de dent
   };
 Extrude Surface {152, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
-  Recombine ; Layers { 1, V_PZT_lower + N_*(i_sect-1), 1};            // PZT_lower
+  Recombine ; Layers { 1 };            // PZT_lower
   };
 Extrude Surface {174, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
-  Recombine ; Layers { 1, V_PZT_upper + N_*(i_sect-1), 1};            //  PZT_upper 
+  Recombine ; Layers { 1 };            //  PZT_upper 
   };
 
 L_sec=(Pi/12-teta_vide)*R; 
@@ -92,10 +92,6 @@ l_vide=teta_vide*R/L_sec;
 l_dent=teta_tooth*R/L_sec;
 
 For i In {0:4}
-  ListVol1[i]=V_corp ;   // corp
-  ListVol2[i]=V_dent+i; //  dents ou vides : V_dent<-dent, V_dent+1<-vide ...
-  ListVol3[i]=V_PZT_lower + N_*(i_sect-1);   // PZT_lower        
-  ListVol4[i]=V_PZT_upper + N_*(i_sect-1);   // PZT_upper
   ListExt[i]=1;
 EndFor
 
@@ -111,51 +107,51 @@ EndFor
 ListDiv[4]=1;
 
 Extrude Surface {86+insc, {0,0,1}, {0,0,0}, Pi/12-teta_vide}{
-  Recombine ; Layers {  ListExt[{0:4}] , ListVol1[{0:4}], ListDiv[{0:4}] }; 
+  Recombine ; Layers {  ListExt[{0:4}] , ListDiv[{0:4}] }; 
   };
 Extrude Surface {108+insc, {0,0,1}, {0,0,0}, Pi/12-teta_vide}{
-  Recombine ; Layers {  ListExt[{0:4}] , ListVol2[{0:4}], ListDiv[{0:4}] }; 
+  Recombine ; Layers {  ListExt[{0:4}] , ListDiv[{0:4}] }; 
   };
 Extrude Surface {130+insc, {0,0,1}, {0,0,0}, Pi/12-teta_vide}{
-  Recombine ; Layers {  ListExt[{0:4}] , ListVol2[{0:4}], ListDiv[{0:4}] };
+  Recombine ; Layers {  ListExt[{0:4}] , ListDiv[{0:4}] };
   };
 Extrude Surface {152+insc, {0,0,1}, {0,0,0}, Pi/12-teta_vide}{
-  Recombine ; Layers {  ListExt[{0:4}] , ListVol3[{0:4}], ListDiv[{0:4}] };
+  Recombine ; Layers {  ListExt[{0:4}] , ListDiv[{0:4}] };
   };
 Extrude Surface {174+insc, {0,0,1}, {0,0,0}, Pi/12-teta_vide}{
-  Recombine ; Layers {  ListExt[{0:4}] , ListVol4[{0:4}], ListDiv[{0:4}] };
+  Recombine ; Layers {  ListExt[{0:4}] , ListDiv[{0:4}] };
   };
 
 Extrude Surface {86+2*insc, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
-  Recombine ; Layers { 1 ,V_corp, 1 };                                // corp
+  Recombine ; Layers { 1 };                                // corp
   };
 Extrude Surface {108+2*insc, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
-  Recombine ; Layers { 1, V_100dent, 1 };                             // pas de dent
+  Recombine ; Layers { 1 };                             // pas de dent
   };
 Extrude Surface {130+2*insc, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
-  Recombine ; Layers { 1, V_100dent, 1};                              // pas de dent
+  Recombine ; Layers { 1 };                              // pas de dent
   };
 Extrude Surface {152+2*insc, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
-  Recombine ; Layers { 1, V_PZT_lower + N_*(i_sect-1), 1};                            // PZT_lower
+  Recombine ; Layers { 1 };                            // PZT_lower
   };
 Extrude Surface {174+2*insc, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
-  Recombine ; Layers { 1, V_PZT_upper + N_*(i_sect-1), 1};                            //  PZT_upper 
+  Recombine ; Layers { 1 };                            //  PZT_upper 
   };
 
 Extrude Surface {86+3*insc, {0,0,1}, {0,0,0}, teta_gap/2}{
-  Recombine ; Layers { 1, V_corp, 1};                          // corp   
+  Recombine ; Layers { 1 };                          // corp   
   };
 Extrude Surface {108+3*insc, {0,0,1}, {0,0,0}, teta_gap/2}{
-  Recombine ; Layers { 1, V_100dent, 1};                       // pas de dent
+  Recombine ; Layers { 1 };                       // pas de dent
   };
 Extrude Surface {130+3*insc, {0,0,1}, {0,0,0}, teta_gap/2}{
-  Recombine ; Layers { 1, V_100dent, 1};                       // pas de dent
+  Recombine ; Layers { 1 };                       // pas de dent
   };
 Extrude Surface {152+3*insc, {0,0,1}, {0,0,0}, teta_gap/2}{
-  Recombine ; Layers { 1, V_PZT_lower + N_*(i_sect-1), 1 };    // PZT_lower
+  Recombine ; Layers { 1 };    // PZT_lower
   };
 Extrude Surface {174+3*insc, {0,0,1}, {0,0,0}, teta_gap/2}{
-  Recombine ; Layers { 1, V_PZT_upper + N_*(i_sect-1), 1 };    // PZT_upper 
+  Recombine ; Layers { 1 };    // PZT_upper 
   };
 
 
@@ -164,89 +160,84 @@ Extrude Surface {174+3*insc, {0,0,1}, {0,0,0}, teta_gap/2}{
 For i_sect In {2:NodLin}
 
 Extrude Surface {86+((i_sect-2)*5+4)*insc, {0,0,1}, {0,0,0}, teta_gap/2}{
-  Recombine ; Layers { 1, V_corp, 1};                          // corp   
+  Recombine ; Layers { 1 };                          // corp   
   };
 Extrude Surface {108+((i_sect-2)*5+4)*insc, {0,0,1}, {0,0,0}, teta_gap/2}{
-  Recombine ; Layers { 1, V_100dent, 1};                       // pas de dent
+  Recombine ; Layers { 1 };                       // pas de dent
   };
 Extrude Surface {130+((i_sect-2)*5+4)*insc, {0,0,1}, {0,0,0}, teta_gap/2}{
-  Recombine ; Layers { 1, V_100dent, 1};                       // pas de dent
+  Recombine ; Layers { 1 };                       // pas de dent
   };
 Extrude Surface {152+((i_sect-2)*5+4)*insc, {0,0,1}, {0,0,0}, teta_gap/2}{
-  Recombine ; Layers { 1, V_PZT_lower + N_*(i_sect-1), 1 };   // PZT_lower
+  Recombine ; Layers { 1 };   // PZT_lower
   };
 Extrude Surface {174+((i_sect-2)*5+4)*insc, {0,0,1}, {0,0,0}, teta_gap/2}{
-  Recombine ; Layers { 1, V_PZT_upper + N_*(i_sect-1), 1 };   // PZT_upper 
+  Recombine ; Layers { 1 };   // PZT_upper 
   };
 
 
 Extrude Surface {86+((i_sect-2)*5+5)*insc, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
-  Recombine ; Layers { 1, V_corp, 1 };                                // corp
+  Recombine ; Layers { 1 };                                // corp
   };
 Extrude Surface {108+((i_sect-2)*5+5)*insc, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
-  Recombine ; Layers { 1, V_100dent, 1 };                             // pas de dent
+  Recombine ; Layers { 1 };                             // pas de dent
   };
 Extrude Surface {130+((i_sect-2)*5+5)*insc, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
-  Recombine ; Layers { 1, V_100dent, 1};                              // pas de dent
+  Recombine ; Layers { 1 };                              // pas de dent
   };
 Extrude Surface {152+((i_sect-2)*5+5)*insc, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
-  Recombine ; Layers { 1, V_PZT_lower + N_*(i_sect-1), 1};            // PZT_lower
+  Recombine ; Layers { 1 };            // PZT_lower
   };
 Extrude Surface {174+((i_sect-2)*5+5)*insc, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
-  Recombine ; Layers { 1, V_PZT_upper + N_*(i_sect-1), 1};            //  PZT_upper 
+  Recombine ; Layers { 1 };            //  PZT_upper 
   };
 
-For i In {0:4}
-  ListVol4[i] = V_PZT_lower + N_*(i_sect-1);   // PZT_lower
-  ListVol5[i] = V_PZT_upper + N_*(i_sect-1);   // PZT_upper
-EndFor
-
 Extrude Surface {86+((i_sect-2)*5+6)*insc, {0,0,1}, {0,0,0}, Pi/12-teta_vide}{
-  Recombine ; Layers {  ListExt[{0:4}] , ListVol1[{0:4}], ListDiv[{0:4}] }; 
+  Recombine ; Layers {  ListExt[{0:4}] , ListDiv[{0:4}] }; 
   };
 Extrude Surface {108+((i_sect-2)*5+6)*insc, {0,0,1}, {0,0,0}, Pi/12-teta_vide}{
-  Recombine ; Layers {  ListExt[{0:4}] , ListVol2[{0:4}], ListDiv[{0:4}] }; 
+  Recombine ; Layers {  ListExt[{0:4}] , ListDiv[{0:4}] }; 
   };
 Extrude Surface {130+((i_sect-2)*5+6)*insc, {0,0,1}, {0,0,0}, Pi/12-teta_vide}{
-  Recombine ; Layers {  ListExt[{0:4}] , ListVol2[{0:4}], ListDiv[{0:4}] };
+  Recombine ; Layers {  ListExt[{0:4}] , ListDiv[{0:4}] };
   };
 Extrude Surface {152+((i_sect-2)*5+6)*insc, {0,0,1}, {0,0,0}, Pi/12-teta_vide}{
-  Recombine ; Layers {  ListExt[{0:4}] , ListVol3[{0:4}], ListDiv[{0:4}] };
+  Recombine ; Layers {  ListExt[{0:4}] , ListDiv[{0:4}] };
   };
 Extrude Surface {174+((i_sect-2)*5+6)*insc, {0,0,1}, {0,0,0}, Pi/12-teta_vide}{
-  Recombine ; Layers {  ListExt[{0:4}] , ListVol4[{0:4}], ListDiv[{0:4}] };
+  Recombine ; Layers {  ListExt[{0:4}] , ListDiv[{0:4}] };
   };
 
 Extrude Surface {86+((i_sect-2)*5+7)*insc, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
-  Recombine ; Layers { 1, V_corp, 1 };                             // corp
+  Recombine ; Layers { 1 };                             // corp
   };
 Extrude Surface {108+((i_sect-2)*5+7)*insc, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
-  Recombine ; Layers { 1, V_100dent, 1 };                             // pas de dent
+  Recombine ; Layers { 1 };                             // pas de dent
   };
 Extrude Surface {130+((i_sect-2)*5+7)*insc, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
-  Recombine ; Layers { 1, V_100dent, 1};                              // pas de dent
+  Recombine ; Layers { 1 };                              // pas de dent
   };
 Extrude Surface {152+((i_sect-2)*5+7)*insc, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
-  Recombine ; Layers { 1, V_PZT_lower + N_*(i_sect-1), 1};                              // PZT_lower
+  Recombine ; Layers { 1 };                              // PZT_lower
   };
 Extrude Surface {174+((i_sect-2)*5+7)*insc, {0,0,1}, {0,0,0}, teta_vide/2 -teta_gap/2 }{
-  Recombine ; Layers { 1, V_PZT_upper + N_*(i_sect-1), 1};                          //  PZT_upper 
+  Recombine ; Layers { 1 };                          //  PZT_upper 
   };
 
 Extrude Surface {86+((i_sect-2)*5+8)*insc, {0,0,1}, {0,0,0}, teta_gap/2}{
-  Recombine ; Layers { 1, V_corp, 1};                 // corp   
+  Recombine ; Layers { 1 };                 // corp   
   };
 Extrude Surface {108+((i_sect-2)*5+8)*insc, {0,0,1}, {0,0,0}, teta_gap/2}{
-  Recombine ; Layers { 1, V_100dent, 1};                 // pas de dent
+  Recombine ; Layers { 1 };                 // pas de dent
   };
 Extrude Surface {130+((i_sect-2)*5+8)*insc, {0,0,1}, {0,0,0}, teta_gap/2}{
-  Recombine ; Layers { 1, V_100dent, 1};                 // pas de dent
+  Recombine ; Layers { 1 };                 // pas de dent
   };
 Extrude Surface {152+((i_sect-2)*5+8)*insc, {0,0,1}, {0,0,0}, teta_gap/2}{
-  Recombine ; Layers { 1, V_PZT_lower + N_*(i_sect-1), 1 };                // PZT_lower
+  Recombine ; Layers { 1 };                // PZT_lower
   };
 Extrude Surface {174+((i_sect-2)*5+8)*insc, {0,0,1}, {0,0,0}, teta_gap/2}{
-  Recombine ; Layers { 1, V_PZT_upper + N_*(i_sect-1), 1 };                // PZT_upper 
+  Recombine ; Layers { 1 };                // PZT_upper 
   };
 
 EndFor 
@@ -272,7 +263,6 @@ Point101 = 1011;
 For i In {0:2}
    ListDent[i]=V_dent+i*2;
 EndFor
-Physical Volume(Corp) = {V_corp, ListDent[{0:2}]};
 
 
 i_plus[{1:12}]={1,2,  5,6,  9,10,    13,14,    17,18,    21,22}; //  (++)(--)(++)(--)(++)(--)(++)(--)(++)(--)(++)(--)
@@ -289,8 +279,6 @@ For i In {1:12}
       ListPZT_lower_minus[i] = V_PZT_lower + N_*(i_minus[i]-1);
 EndFor
 
-Physical Volume(PZTplus)  = {  ListPZT_lower_plus[{1:12}],  ListPZT_upper_plus[{1:12}] } ; 
-Physical Volume(PZTminus) = {  ListPZT_lower_minus[{1:12}], ListPZT_upper_minus[{1:12}] } ;
 
 
 For i In {1:NodLin*5}  // taking into account the gaps,...
@@ -303,21 +291,14 @@ i_upper_minus[{1:48}]={   12:19,    32:39,    52:59,    72:79,    92:99,     112
 i_lower_plus[{1:48}]={1,2,3,4,   17:24,    37:44,    57:64,    77:84,    97:104,     117,118,119,120};
 i_lower_minus[{1:48}]={      7:14,    27:34,    47:54,    67:74,    87:94,     107:114};
 
-Physical Surface (ElectrodeUpper) = { List_Electrode_Upper[{i_upper_plus[{1:48}]}], List_Electrode_Upper[{i_upper_minus[{1:48}]}] } ;
-Physical Surface (ElectrodeLower) = { List_Electrode_Lower[{i_lower_plus[{1:48}]}], List_Electrode_Lower[{i_lower_minus[{1:48}]}] } ;
-
 For i In {1:NodLin*5}  // taking into account the gaps,...
   List_Emasse_upper[i]=85+(i-1)*insc;
   List_Emasse_lower[i]=69+(i-1)*insc;
 EndFor
-Physical Surface (Masse)  = { List_Emasse_upper[{1:120}], List_Emasse_lower[{1:120}] } ;
 
 For i In {1:NodLin*5}
   List_IC[i]=53+(i-1)*insc;
 EndFor
-Physical Surface (Inner_Cylinder)  =  { List_IC[{1:120}] };
-
-//Physical Point (Point99) = {};  
 
 
 

benchmarks/extrude/torus_hexa.geo

@@ -44,14 +44,16 @@ Transfinite Surface {22} = {11,12,13,10};
 
 Recombine Surface {14:22:2};
 
+Geometry.ExtrudeReturnLateralEntities = 0;
+
 s[] = Extrude {{0,0,1}, {0,0,0}, 2*Pi/3}{
-  Surface{14:22:2}; Recombine; Layers{10,73,1};
+  Surface{14:22:2}; Recombine; Layers{10,1};
 };
 
 s[] = Extrude {{0,0,1}, {0,0,0}, 2*Pi/3}{
-  Surface{s[{0:8:2}]}; Recombine; Layers{10,73,1};
+  Surface{s[{0:8:2}]}; Recombine; Layers{10,1};
 };
 
 Extrude {{0,0,1}, {0,0,0}, 2*Pi/3}{
-  Surface{s[{0:8:2}]}; Recombine; Layers{10,73,1};
+  Surface{s[{0:8:2}]}; Recombine; Layers{10,1};
 }