Commit 2406456e authored by Christophe Geuzaine's avatar Christophe Geuzaine

naming consistency

parent 7903b6a5
Pipeline #1290 passed with stage
in 60 minutes and 26 seconds
......@@ -12,7 +12,7 @@ Line(1) = {1,2};
Line(2) = {2,3};
Line(3) = {3,4};
Line(4) = {4,1};
Line Loop(1) = {1,2,3,4};
Curve Loop(1) = {1,2,3,4};
Plane Surface(1) = {1};
Point(5) = {0.2,0.2,0};
......@@ -23,7 +23,7 @@ Line(5) = {5,6};
Line(6) = {6,7};
Line(7) = {7,8};
Line(8) = {8,5};
Line Loop(2) = {5,6,7,8};
Curve Loop(2) = {5,6,7,8};
Plane Surface(2) = {2};
Disk(3) = {0.6, 0.6, 0, 0.5, 0.3};
......
......@@ -12,7 +12,7 @@ Line(1) = {1,2};
Line(2) = {2,3};
Line(3) = {3,4};
Line(4) = {4,1};
Line Loop(1) = {1,2,3,4};
Curve Loop(1) = {1,2,3,4};
Plane Surface(1) = {1};
Point(5) = {0.2,0.2,0};
......@@ -23,7 +23,7 @@ Line(5) = {5,6};
Line(6) = {6,7};
Line(7) = {7,8};
Line(8) = {8,5};
Line Loop(2) = {5,6,7,8};
Curve Loop(2) = {5,6,7,8};
Plane Surface(2) = {2};
Disk(3) = {0.6, 0.6, 0, 0.5, 0.3};
......
......@@ -29,6 +29,6 @@ EndFor
Printf("disk tags: ", b());
c() = BooleanFragments{ Line{t}; Surface{1:6,b()}; Delete; }{};
c() = BooleanFragments{ Curve{t}; Surface{1:6,b()}; Delete; }{};
Printf("all tags (disk and top line tags should be unchanged!): ", c());
......@@ -20,7 +20,7 @@ Line(10001) = {10004, 10003};
Line(10002) = {10003, 10002};
Line(10003) = {10002, 10001};
Line(10004) = {10001, 10004};
Line Loop(10005) = {10002, 10003, 10004, 10001};
Curve Loop(10005) = {10002, 10003, 10004, 10001};
Plane Surface(10006) = {10005};
tmp[] = Extrude {0, 0, (zmax - zmin) + 2 * l} {
Surface{10006};
......
......@@ -27,6 +27,6 @@ ddz = flag_Symmetry_Z ? dz / 2 : dz;
v_box=newv;
Box(newv) = {x_min_, y_min_, z_min_, ddx, ddy, ddz};
l_wire[] = BooleanIntersection { Line{l_wire[]}; Delete; }{ Volume{v_box}; };
l_wire[] = BooleanIntersection { Curve{l_wire[]}; Delete; }{ Volume{v_box}; };
Printf("after intersection: new l_wire[] = ", l_wire[]);
......@@ -20,10 +20,10 @@ Macro dendrite
Circle(numc+1) = {nump+2,nump,nump+3};
Circle(numc+2) = {nump+3,nump,nump+4};
Circle(numc+3) = {nump+4,nump,nump+1};
Line Loop(numw) = {numc:numc+3};
Curve Loop(numw) = {numc:numc+3};
Else // single periodic surface
Circle(numw) = {x,y,z, r};
Line Loop(numw) = numw;
Curve Loop(numw) = numw;
EndIf
ll() += numw;
EndFor
......
......@@ -35,11 +35,11 @@ p = newp;
l = newl;
Bezier(l) = {p,p+4,p+3,p+2}; Line(l+1) = {p+2,p+1}; Line(l+2) = {p+1,p};
ll = newll;
Line Loop(ll) = {l:l+2};
Curve Loop(ll) = {l:l+2};
Plane Surface(news) = {ll};
l = newl; Circle(l) = {x++,y,0, 0.3}; Circle(l+1) = {x-1,y-0.1,0, 0.1};
ll = newll; Line Loop(ll) = l; Line Loop(ll+1) = l+1;
ll = newll; Curve Loop(ll) = l; Curve Loop(ll+1) = l+1;
Plane Surface(news) = {ll, ll+1};
p = newp;
......@@ -48,7 +48,7 @@ p = newp;
l = newl;
Bezier(l) = {p,p+4,p+3,p+2}; Line(l+1) = {p+2,p+1}; Line(l+2) = {p+1,p};
ll = newll;
Line Loop(ll) = {l:l+2};
Curve Loop(ll) = {l:l+2};
Surface(news) = {ll};
// 1D
......
......@@ -12,7 +12,7 @@ Line(1) = {1,2};
Line(2) = {2,3};
Line(3) = {3,4};
Line(4) = {4,1};
Line Loop(1) = {1,2,3,4};
Curve Loop(1) = {1,2,3,4};
Plane Surface(1) = {1};
Point(5) = {0.2,0.2,0};
......@@ -23,7 +23,7 @@ Line(5) = {5,6};
Line(6) = {6,7};
Line(7) = {7,8};
Line(8) = {8,5};
Line Loop(2) = {5,6,7,8};
Curve Loop(2) = {5,6,7,8};
Plane Surface(2) = {2};
Disk(3) = {0.6, 0.6, 0, 0.5, 0.3};
......
......@@ -12,7 +12,7 @@ Line(1) = {1,2};
Line(2) = {2,3};
Line(3) = {3,4};
Line(4) = {4,1};
Line Loop(1) = {1,2,3,4};
Curve Loop(1) = {1,2,3,4};
Plane Surface(1) = {1};
Point(5) = {0.2,0.2,0};
......@@ -23,7 +23,7 @@ Line(5) = {5,6};
Line(6) = {6,7};
Line(7) = {7,8};
Line(8) = {8,5};
Line Loop(2) = {5,6,7,8};
Curve Loop(2) = {5,6,7,8};
Plane Surface(2) = {2};
Disk(3) = {0.6, 0.6, 0, 0.5, 0.3};
......
......@@ -9,5 +9,5 @@ Line(1) = {1,2};
Line(2) = {2,3};
Line(3) = {3,4};
Line(4) = {4,1};
Line Loop(1) = {1,2,3,4};
Curve Loop(1) = {1,2,3,4};
Plane Surface(1) = {1};
......@@ -12,7 +12,7 @@ Line(1) = {1,2};
Line(2) = {2,3};
Line(3) = {3,4};
Line(4) = {4,1};
Line Loop(1) = {1,2,3,4};
Curve Loop(1) = {1,2,3,4};
Point(5) = {0.2,0.2,0};
Point(6) = {0.5,0.2,0};
......@@ -22,6 +22,6 @@ Line(5) = {5,6};
Line(6) = {6,7};
Line(7) = {7,8};
Line(8) = {8,5};
Line Loop(2) = {5,6,7,8};
Curve Loop(2) = {5,6,7,8};
Plane Surface(1) = {1,2};
......@@ -12,7 +12,7 @@ Line(1) = {1,2};
Line(2) = {2,3};
Line(3) = {3,4};
Line(4) = {4,1};
Line Loop(1) = {1,2,3,4};
Curve Loop(1) = {1,2,3,4};
Plane Surface(1) = {1};
Point(5) = {0.2,0.2,0};
......@@ -23,7 +23,7 @@ Line(5) = {5,6};
Line(6) = {6,7};
Line(7) = {7,8};
Line(8) = {8,5};
Line Loop(2) = {5,6,7,8};
Curve Loop(2) = {5,6,7,8};
Plane Surface(2) = {2};
Disk(3) = {0.6, 0.6, 0, 0.5, 0.3};
......
......@@ -17,11 +17,11 @@ Line(5) = {5,1};
Line(6) = {5,2};
Line(7) = {5,3};
Line(8) = {5,4};
Line Loop(1) = {1,2,3,4};
Line Loop(2) = {1,5,6};
Line Loop(3) = {2,6,7};
Line Loop(4) = {3,7,8};
Line Loop(5) = {4,5,8};
Curve Loop(1) = {1,2,3,4};
Curve Loop(2) = {1,5,6};
Curve Loop(3) = {2,6,7};
Curve Loop(4) = {3,7,8};
Curve Loop(5) = {4,5,8};
Plane Surface(1) = {1};
Plane Surface(2) = {2};
Plane Surface(3) = {3};
......
......@@ -12,5 +12,5 @@ Line(1) = {1,2};
Line(2) = {2,3};
Line(3) = {3,4};
Line(4) = {4,1};
Line Loop(1) = {1,2,3,4};
Curve Loop(1) = {1,2,3,4};
Surface(1) = {1};
......@@ -12,5 +12,5 @@ Line(1) = {1,2};
Line(2) = {2,3};
Line(3) = {3,4};
Line(4) = {4,1};
Line Loop(1) = {1,2,3,4};
Curve Loop(1) = {1,2,3,4};
Surface(1) = {1};
......@@ -21,7 +21,7 @@ Point(105) = {0.7,-1,0,0.1};
// periodic bspline (C2) through the control points
Spline(100) = {103,102,101,104,105,103};
Line Loop(100) = {100};
Curve Loop(100) = {100};
Plane Surface(100) = {100};
// periodic bspline with given control points and default parameters (order 3,
......
......@@ -12,8 +12,8 @@ Point(6) = {-0.6, 0.1, -0.1, 1.0};
Spline(1) = {1, 5, 2};
Spline(2) = {2, 6, 3};
Spline(3) = {3, 4, 1};
Line Loop(1) = {1, 2, 3};
// bspline surface bounded by line loop 1
Curve Loop(1) = {1, 2, 3};
// bspline surface bounded by curve loop 1
Surface(1) = {1};
Point(7) = {-0.7, 0.1, -0.2, 1.0};
......
......@@ -4,14 +4,14 @@ Mesh.Algorithm = 6;
Mesh.CharacteristicLengthMin = 0.1;
Mesh.CharacteristicLengthMax = 0.1;
// build volume through (closed) line loops
// build volume through (closed) curve loops
For i In {0:1}
c = newl; ll = newll;
Circle(c) = {i,0,0, 0.2};
Circle(c+1) = {i+0.1,0.04,1, 0.3};
Circle(c+2) = {i+0.03,-0.08,2, 0.25};
For j In {0:2}
Line Loop(ll+j) = c+j;
Curve Loop(ll+j) = c+j;
EndFor
If(i)
Ruled ThruSections(newv) = {ll:ll+2};
......@@ -20,14 +20,14 @@ For i In {0:1}
EndIf
EndFor
// build surfaces through (closed) line loops
// build surfaces through (closed) curve loops
For i In {0:1}
c = newl; ll = newll;
Circle(c) = {i+2,0,0, 0.2};
Circle(c+1) = {i+2.1,0.04,1, 0.3};
Circle(c+2) = {i+2.03,-0.08,2, 0.25};
For j In {0:2}
Line Loop(ll+j) = c+j;
Curve Loop(ll+j) = c+j;
EndFor
If(i)
Ruled ThruSections{ll:ll+2}
......
......@@ -14,11 +14,11 @@ l() = Unique(Abs(Boundary{ Surface{s()}; }));
N = DefineNumber[ 10, Name "Parameters/N" ];
// simple transfinite mesh
Transfinite Line {l()} = N;
Transfinite Curve{l()} = N;
Transfinite Surface{5};
// transfinite mesh with explicit corners
Transfinite Line {9} = 2*N-1;
Transfinite Curve{9} = 2*N-1;
l4() = Abs(Boundary{ Surface{4}; });
p4() = Unique(Abs(Boundary{ Line{l4()}; }));
p4() = Unique(Abs(Boundary{ Curve{l4()}; }));
Transfinite Surface{4} = {p4({0:3})};
......@@ -18,14 +18,14 @@ Ellipse(2) = {3, 5, 4};
Ellipse(3) = {1, 5, 4};
Ellipse(4) = {1, 5, 2};
l~{1}() = {1:4};
Line Loop(1) = l~{1}();
Curve Loop(1) = l~{1}();
N = DefineNumber[3, Name "Parameters/Number of slices", Min 2, Max 10, Step 1];
angle = DefineNumber[Pi/4, Name "Parameters/Angle", Min 0, Max 2*Pi, Step 0.1];
For i In {2:N}
l~{i}() = Translate{0,0,1/(N-1)}{ Duplicata{ Line{l~{i-1}()}; } };
Rotate {{0, 0, 1}, {0, 0, 0}, angle/(N-1)} { Line{l~{i}()}; }
Line Loop(i) = l~{i}();
l~{i}() = Translate{0,0,1/(N-1)}{ Duplicata{ Curve{l~{i-1}()}; } };
Rotate {{0, 0, 1}, {0, 0, 0}, angle/(N-1)} { Curve{l~{i}()}; }
Curve Loop(i) = l~{i}();
EndFor
ThruSections(1) = {1:N};
......
// The two longitudinal bars
f4 = 0.6 ;
f5 = 1.33 ;
f4 = 0.6 ;
f5 = 1.33 ;
xmin =-27.e-3 ;
LL = 1821.3e-3 ;
ll = 20.e-3 ;
LL = 1821.3e-3 ;
ll = 20.e-3 ;
hh = 20.e-3 ;
dc = 8.e-3 ;
em = 8.e-3/2 ;
em = 8.e-3/2 ;
eM = 40.e-3/2 ;
t = ArcTan(eM/2-em/2/LL) ;
Point(1) = {xmin, -em-hh, -ll/2, f4*ll/2} ; Point(5) = {xmin, em, -ll/2, f4*ll/2} ;
Point(2) = {xmin, -em-hh, ll/2, f4*ll/2} ; Point(6) = {xmin, em, ll/2, f4*ll/2} ;
Point(3) = {xmin, -em, -ll/2, f4*ll/2} ; Point(7) = {xmin, em+hh, -ll/2, f4*ll/2} ;
Point(4) = {xmin, -em, ll/2, f4*ll/2} ; Point(8) = {xmin, em+hh, ll/2, f4*ll/2} ;
Point(1) = {xmin, -em-hh, -ll/2, f4*ll/2} ; Point(5) = {xmin, em, -ll/2, f4*ll/2} ;
Point(2) = {xmin, -em-hh, ll/2, f4*ll/2} ; Point(6) = {xmin, em, ll/2, f4*ll/2} ;
Point(3) = {xmin, -em, -ll/2, f4*ll/2} ; Point(7) = {xmin, em+hh, -ll/2, f4*ll/2} ;
Point(4) = {xmin, -em, ll/2, f4*ll/2} ; Point(8) = {xmin, em+hh, ll/2, f4*ll/2} ;
Point(9) = {xmin+LL, -eM-hh, -ll/2, f5*ll/2} ; Point(13) = {xmin+LL, eM, -ll/2, f5*ll/2} ;
Point(10) = {xmin+LL, -eM-hh, ll/2, f5*ll/2} ; Point(14) = {xmin+LL, eM, ll/2, f5*ll/2} ;
Point(11) = {xmin+LL, -eM, -ll/2, f5*ll/2} ; Point(15) = {xmin+LL, eM+hh, -ll/2, f5*ll/2} ;
Point(12) = {xmin+LL, -eM, ll/2, f5*ll/2} ; Point(16) = {xmin+LL, eM+hh, ll/2, f5*ll/2} ;
Point(9) = {xmin+LL, -eM-hh, -ll/2, f5*ll/2} ; Point(13) = {xmin+LL, eM, -ll/2, f5*ll/2} ;
Point(10) = {xmin+LL, -eM-hh, ll/2, f5*ll/2} ; Point(14) = {xmin+LL, eM, ll/2, f5*ll/2} ;
Point(11) = {xmin+LL, -eM, -ll/2, f5*ll/2} ; Point(15) = {xmin+LL, eM+hh, -ll/2, f5*ll/2} ;
Point(12) = {xmin+LL, -eM, ll/2, f5*ll/2} ; Point(16) = {xmin+LL, eM+hh, ll/2, f5*ll/2} ;
Line(1) = {5,6}; Line(11) = {13,14};
Line(2) = {6,8}; Line(12) = {14,16};
Line(3) = {8,7}; Line(13) = {16,15};
Line(4) = {7,5}; Line(14) = {15,13};
Line(5) = {1,2}; Line(15) = {9,10};
Line(5) = {1,2}; Line(15) = {9,10};
Line(6) = {2,4}; Line(16) = {10,12};
Line(7) = {4,3}; Line(17) = {12,11};
Line(8) = {3,1}; Line(18) = {11,9};
Line(8) = {3,1}; Line(18) = {11,9};
Line(9) = {4,6}; Line(19) = {12,14};
Line(10) = {3,5}; Line(20) = {11,13};
Line(21) = {8,16}; Line(25) = {2,10};
Line(22) = {7,15}; Line(26) = {4,12};
Line(23) = {6,14}; Line(27) = {3,11};
Line(24) = {5,13}; Line(28) = {1,9};
Line(21) = {8,16}; Line(25) = {2,10};
Line(22) = {7,15}; Line(26) = {4,12};
Line(23) = {6,14}; Line(27) = {3,11};
Line(24) = {5,13}; Line(28) = {1,9};
// The 22 resonators
......@@ -89,30 +89,30 @@ dx = d20; rx = r20; sx = s20; lx = l20; e =-e20; x =2000; Include "antenna.i1" ;
dx = d21; rx = r21; sx = s21; lx = l21; e = e21; x =2100; Include "antenna.i1" ;
dx = d22; rx = r22; sx = s22; lx = l22; e =-e22; x =2200; Include "antenna.i1" ;
// Surfaces for longitudinal bars
Line Loop(3001) = {-13,-21,3,22}; Plane Surface(3101) = {3001}; // ymax
Line Loop(3002) = {23,-11,-24,1}; Plane Surface(3102) = {3002}; // ymax - eps
Line Loop(3003) = {-27,-7,26,17}; Plane Surface(3103) = {3003}; // ymin + eps
Line Loop(3004) = {25,-15,-28,5}; Plane Surface(3104) = {3004}; // ymin
Line Loop(3005) = {3,4,1,2}; Plane Surface(3105) = {3005}; // left top
Line Loop(3006) = {7,8,5,6}; Plane Surface(3106) = {3006}; // left bottom
Line Loop(3007) = {11,12,13,14}; Plane Surface(3107) = {3007}; // right top
Line Loop(3008) = {18,15,16,17}; Plane Surface(3108) = {3008}; // right bottom
Line Loop(3011) = {-9,7,10,1}; Plane Surface(3111) = {3011}; // input
Line Loop(3012) = {-11,-20,-17,19};Plane Surface(3112) = {3012}; // output
Line Loop(3013) = {-26,-6,25,16};
Line Loop(3014) = {-28,-8,27,18};
Line Loop(3015) = {-21,-2,23,12};
Line Loop(3016) = {-24,-4,22,14};
// Surfaces for longitudinal bars
Curve Loop(3001) = {-13,-21,3,22}; Plane Surface(3101) = {3001}; // ymax
Curve Loop(3002) = {23,-11,-24,1}; Plane Surface(3102) = {3002}; // ymax - eps
Curve Loop(3003) = {-27,-7,26,17}; Plane Surface(3103) = {3003}; // ymin + eps
Curve Loop(3004) = {25,-15,-28,5}; Plane Surface(3104) = {3004}; // ymin
Curve Loop(3005) = {3,4,1,2}; Plane Surface(3105) = {3005}; // left top
Curve Loop(3006) = {7,8,5,6}; Plane Surface(3106) = {3006}; // left bottom
Curve Loop(3007) = {11,12,13,14}; Plane Surface(3107) = {3007}; // right top
Curve Loop(3008) = {18,15,16,17}; Plane Surface(3108) = {3008}; // right bottom
Curve Loop(3011) = {-9,7,10,1}; Plane Surface(3111) = {3011}; // input
Curve Loop(3012) = {-11,-20,-17,19};Plane Surface(3112) = {3012}; // output
Curve Loop(3013) = {-26,-6,25,16};
Curve Loop(3014) = {-28,-8,27,18};
Curve Loop(3015) = {-21,-2,23,12};
Curve Loop(3016) = {-24,-4,22,14};
Plane Surface(3113) = {3013,203,403,603,803,1003,1203,1403,1603,1803,2003,2203} ;
Plane Surface(3114) = {3014,101,301,501,701,901,1101,1301,1501,1701,1901,2101};
Plane Surface(3115) = {3015,103,303,503,703,903,1103,1303,1503,1703,1903,2103};
Plane Surface(3116) = {3016,201,401,601,801,1001,1201,1401,1601,1801,2001,2201};
// The physical entities
// The physical entities
AIR = 8001 ;
XM = 8002 ;
......@@ -131,8 +131,8 @@ CLBEM = 9005 ;
Physical Surface(CLINPUT) = {3111};
Physical Surface(CLBEM) = {4119,4106,4115,4111,4122,4124};
Physical Surface(CLLONG) = {3102,3115,3101,3116,3105,3107,3103,3114,3104,3113,3108,3106};
Physical Surface(CLBAR) =
{
Physical Surface(CLBAR) =
{
122,125,126,127,128,
124,129,130,131,132,
222,225,226,227,228,
......@@ -176,5 +176,5 @@ Physical Surface(CLBAR) =
2122,2125,2126,2127,2128,
2124,2129,2130,2131,2132,
2222,2225,2226,2227,2228,
2224,2229,2230,2231,2232
2224,2229,2230,2231,2232
};
......@@ -20,16 +20,16 @@ Circle(x+14) = {x+13,x+11,x+14}; Circle(x+18) = {x+18,x+16,x+19}; Line(x+22) = {
Circle(x+15) = {x+14,x+11,x+15}; Circle(x+19) = {x+19,x+16,x+20}; Line(x+23) = {x+14,x+19};
Circle(x+16) = {x+15,x+11,x+12}; Circle(x+20) = {x+20,x+16,x+17}; Line(x+24) = {x+15,x+20};
Line Loop(x+01) = {x+02,x+03,x+04,x+01}; Plane Surface(x+21) = {x+01};
Line Loop(x+02) = {x+07,x+08,x+05,x+06}; Plane Surface(x+22) = {x+02};
Line Loop(x+03) = {x+16,x+13,x+14,x+15}; Plane Surface(x+23) = {x+03};
Line Loop(x+04) = {x+20,x+17,x+18,x+19}; Plane Surface(x+24) = {x+04};
Line Loop(x+05) = {x+08,-(x+09),-(x+04),x+12}; Surface(x+25) = {x+05};
Line Loop(x+06) = {x+12,-(x+07),-(x+11),x+03}; Surface(x+26) = {x+06};
Line Loop(x+07) = {-(x+11),-(x+02),x+10,x+06}; Surface(x+27) = {x+07};
Line Loop(x+08) = {-(x+10),-(x+01),x+09,x+05}; Surface(x+28) = {x+08};
Line Loop(x+09) = {x+21,-(x+20),-(x+24),x+16}; Surface(x+29) = {x+09};
Line Loop(x+10) = {-(x+24),-(x+15),x+23,x+19}; Surface(x+30) = {x+10};
Line Loop(x+11) = {x+23,-(x+18),-(x+22),x+14}; Surface(x+31) = {x+11};
Line Loop(x+12) = {x+22,-(x+17),-(x+21),x+13}; Surface(x+32) = {x+12};
Curve Loop(x+01) = {x+02,x+03,x+04,x+01}; Plane Surface(x+21) = {x+01};
Curve Loop(x+02) = {x+07,x+08,x+05,x+06}; Plane Surface(x+22) = {x+02};
Curve Loop(x+03) = {x+16,x+13,x+14,x+15}; Plane Surface(x+23) = {x+03};
Curve Loop(x+04) = {x+20,x+17,x+18,x+19}; Plane Surface(x+24) = {x+04};
Curve Loop(x+05) = {x+08,-(x+09),-(x+04),x+12}; Surface(x+25) = {x+05};
Curve Loop(x+06) = {x+12,-(x+07),-(x+11),x+03}; Surface(x+26) = {x+06};
Curve Loop(x+07) = {-(x+11),-(x+02),x+10,x+06}; Surface(x+27) = {x+07};
Curve Loop(x+08) = {-(x+10),-(x+01),x+09,x+05}; Surface(x+28) = {x+08};
Curve Loop(x+09) = {x+21,-(x+20),-(x+24),x+16}; Surface(x+29) = {x+09};
Curve Loop(x+10) = {-(x+24),-(x+15),x+23,x+19}; Surface(x+30) = {x+10};
Curve Loop(x+11) = {x+23,-(x+18),-(x+22),x+14}; Surface(x+31) = {x+11};
Curve Loop(x+12) = {x+22,-(x+17),-(x+21),x+13}; Surface(x+32) = {x+12};
......@@ -5,10 +5,9 @@ Point(6) = {0,0,3,lc};
Line(1) = {1,2};
Line(2) = {2,6};
Line(3) = {6,1};
Line Loop(4) = {2,3,1};
Curve Loop(4) = {2,3,1};
Plane Surface(5) = {4};
Extrude {{0,0,1}, {0,0,0}, Pi/2} { Surface{5}; }
Extrude {{0,0,1}, {0,0,0}, Pi/2} { Surface{17}; }
Extrude {{0,0,1}, {0,0,0}, Pi/2} { Surface{29}; }
Extrude {{0,0,1}, {0,0,0}, Pi/2} { Surface{41}; }
......@@ -8,7 +8,7 @@ Line(1) = {3,2};
Line(2) = {2,1};
Line(3) = {1,4};
Line(4) = {4,3};
Line Loop(5) = {1,2,3,4};
Curve Loop(5) = {1,2,3,4};
Plane Surface(6) = {5};
// Attractor field on points 5 and on line 1. This field returns the
......@@ -54,7 +54,7 @@ Field[5].F = Sprintf("F4^3 + %g", lc / 100);
Field[6] = Box;
Field[6].VIn = lc / 15;
Field[6].VOut = lc;
Field[6].XMin = 0.3;
Field[6].XMin = 0.3;
Field[6].XMax = 0.6;
Field[6].YMin = 0.3;
Field[6].YMax = 0.6;
......
......@@ -277,19 +277,19 @@ Line(95) = {48,56};
Line(96) = {47,55};
Line(97) = {55,53};
Line(98) = {53,56};
Line Loop(99) = {11,12,9,10};
Line Loop(100) = {4,1,2,3};
Curve Loop(99) = {11,12,9,10};
Curve Loop(100) = {4,1,2,3};
Plane Surface(101) = {99,100};
Line Loop(102) = {15,16,13,14};
Line Loop(103) = {7,8,5,6};
Curve Loop(102) = {15,16,13,14};
Curve Loop(103) = {7,8,5,6};
Plane Surface(104) = {102,103};
Plane Surface(105) = {103};
Plane Surface(106) = {100};
Line Loop(107) = {31,32,29,30};
Line Loop(108) = {27,28,25,26};
Curve Loop(107) = {31,32,29,30};
Curve Loop(108) = {27,28,25,26};
Plane Surface(109) = {107,108};
Line Loop(110) = {23,24,21,22};
Line Loop(111) = {19,20,17,18};
Curve Loop(110) = {23,24,21,22};
Curve Loop(111) = {19,20,17,18};
Plane Surface(112) = {110,111};
Plane Surface(113) = {111};
Plane Surface(114) = {108};
......@@ -310,102 +310,102 @@ Line(128) = {37,28};
Line(129) = {38,29};
Line(130) = {39,30};
Line Loop(131) = {31,-124,-23,123};
Curve Loop(131) = {31,-124,-23,123};
Surface(132) = {131};
Line Loop(133) = {30,-123,-22,125};
Curve Loop(133) = {30,-123,-22,125};
Surface(134) = {133};
Line Loop(135) = {29,-125,-21,126};
Curve Loop(135) = {29,-125,-21,126};
Surface(136) = {135};
Line Loop(137) = {32,-126,-24,124};
Curve Loop(137) = {32,-126,-24,124};
Surface(138) = {137};
Line Loop(139) = {11,-117,-15,118};
Curve Loop(139) = {11,-117,-15,118};
Surface(140) = {139};
Line Loop(141) = {10,-118,-14,115};
Curve Loop(141) = {10,-118,-14,115};
Surface(142) = {141};
Line Loop(143) = {9,-115,-13,116};
Curve Loop(143) = {9,-115,-13,116};
Surface(144) = {143};
Line Loop(145) = {-116,-16,117,12};
Curve Loop(145) = {-116,-16,117,12};
Surface(146) = {145};
Line Loop(147) = {-1,-120,5,119};
Curve Loop(147) = {-1,-120,5,119};
Surface(148) = {147};
Line Loop(149) = {-6,119,2,122};
Curve Loop(149) = {-6,119,2,122};
Surface(150) = {149};
Line Loop(151) = {-7,-122,3,121};
Curve Loop(151) = {-7,-122,3,121};
Surface(152) = {151};
Line Loop(153) = {120,-4,121,8};
Curve Loop(153) = {120,-4,121,8};
Surface(154) = {153};
Line Loop(155) = {27,-128,-19,127};
Curve Loop(155) = {27,-128,-19,127};
Surface(156) = {155};
Line Loop(157) = {-127,-18,130,26};
Curve Loop(157) = {-127,-18,130,26};
Surface(158) = {157};
Line Loop(159) = {130,-25,-129,17};
Curve Loop(159) = {130,-25,-129,17};
Surface(160) = {159};
Line Loop(161) = {28,-129,-20,128};
Curve Loop(161) = {28,-129,-20,128};
Surface(162) = {161};
Line(167) = {78,75};
Line(168) = {62,58};
Line(169) = {75,66};
Line(170) = {58,66};
Line Loop(171) = {-167,-58,-86,62};
Curve Loop(171) = {-167,-58,-86,62};
Surface(172) = {171};
Line Loop(173) = {63,83,-59,167};
Curve Loop(173) = {63,83,-59,167};
Surface(174) = {173};
Line Loop(175) = {84,-56,168,61};
Curve Loop(175) = {84,-56,168,61};
Surface(176) = {175};
Line Loop(177) = {-168,-57,-85,60};
Curve Loop(177) = {-168,-57,-85,60};
Surface(178) = {177};
Line Loop(179) = {-91,-61,170,44};
Curve Loop(179) = {-91,-61,170,44};
Surface(180) = {179};
Line Loop(181) = {170,-45,-92,60};
Curve Loop(181) = {170,-45,-92,60};
Surface(182) = {181};
Line Loop(183) = {-87,-59,-58,-90,57,56};
Curve Loop(183) = {-87,-59,-58,-90,57,56};
Plane Surface(184) = {183};
Line Loop(185) = {68,-63,-62,65,60,61};
Curve Loop(185) = {68,-63,-62,65,60,61};
Plane Surface(186) = {185};
Line Loop(187) = {93,94,45,44};
Curve Loop(187) = {93,94,45,44};
Plane Surface(188) = {187};
Line Loop(189) = {-87,-83,-68,84};
Curve Loop(189) = {-87,-83,-68,84};
Plane Surface(190) = {189};
Line Loop(191) = {-90,-85,-65,86};
Curve Loop(191) = {-90,-85,-65,86};
Plane Surface(192) = {191};
Line(195) = {72,69};
Line(196) = {50,46};
Line(197) = {46,54};
Line Loop(198) = {96,-46,-197,53};
Curve Loop(198) = {96,-46,-197,53};
Surface(199) = {198};
Line Loop(200) = {197,-47,-95,52};
Curve Loop(200) = {197,-47,-95,52};
Surface(201) = {200};
Line Loop(202) = {75,-50,195,54};
Curve Loop(202) = {75,-50,195,54};
Surface(203) = {202};
Line Loop(204) = {-195,-51,-78,55};
Curve Loop(204) = {-195,-51,-78,55};
Surface(205) = {204};
Line Loop(206) = {49,196,-52,77};
Curve Loop