diff --git a/benchmarks/3d/magnetron/magnetron1.geo b/benchmarks/3d/magnetron/magnetron1.geo index 07e0e3e66196c6133876d11b0a2ada664083581c..2bd9c915cb6f51ce3998544ebf35956779cb38f3 100644 --- a/benchmarks/3d/magnetron/magnetron1.geo +++ b/benchmarks/3d/magnetron/magnetron1.geo @@ -42,7 +42,6 @@ centre1=newp;Point(centre1)= { 0.0, 0.0 , 0.0 , lcpba2 }; centre2=newp;Point(centre2)= { 0.0, 0.0 , eppba2 , lcpba2 }; centre3=newp;Point(centre3)= { 0.0, 0.0 , eppba1 , lcpba2 }; centre4=newp;Point(centre4)= { 0.0, 0.0 , eppba3 , lcpba2 }; - Circle(20) = {1,centre1,9}; Circle(21) = {2,centre2,10}; Circle(22) = {3,centre2,11}; @@ -111,7 +110,7 @@ EndFor arc1=newreg; Circle(arc1)={8,centre3,Boxes_Point2[2]}; arc2=newreg; Circle(arc2)={Boxes_Point5[2],centre3,Boxes_Point2[1]}; arc3=newreg; Circle(arc3)={7,centre4,Boxes_Point11[2]}; -arc4=newreg; Circle(arc4)={Boxes_Point12[2],centre3,Boxes_Point11[1]}; +arc4=newreg; Circle(arc4)={Boxes_Point12[2],centre4,Boxes_Point11[1]}; axex1=newreg; Line(axex1) = {Cyles_Point2[0],8}; axex2=newreg; @@ -258,10 +257,3 @@ Circle(906) = {900,centre1,901}; Circle(907) = {902,centre1,903}; Circle(908) = {904,centre1,905}; */ - - - - - - - diff --git a/benchmarks/3d/magnetron/magnetron2.geo b/benchmarks/3d/magnetron/magnetron2.geo index d5578b2b83809ef388b07811b26ad5594e08e4ea..f045bffe02b663a695604e27f37fbf43bae9fa84 100644 --- a/benchmarks/3d/magnetron/magnetron2.geo +++ b/benchmarks/3d/magnetron/magnetron2.geo @@ -127,28 +127,28 @@ Line Loop(surfpbc2)={28,29,30,31,32,33,34,35}; Plane Surface(surfpbc2+1)={surfpbc2}; surfpbc3=newreg; Line Loop(surfpbc3)={27,40,-35,-47}; -Plane Surface(surfpbc3+1)={surfpbc3}; +Ruled Surface(surfpbc3+1)={surfpbc3}; surfpbc4=newreg; Line Loop(surfpbc4)={20,41,-28,-40}; -Plane Surface(surfpbc4+1)={surfpbc4}; +Ruled Surface(surfpbc4+1)={surfpbc4}; surfpbc5=newreg; Line Loop(surfpbc5)={21,42,-29,-41}; -Plane Surface(surfpbc5+1)={surfpbc5}; +Ruled Surface(surfpbc5+1)={surfpbc5}; surfpbc6=newreg; Line Loop(surfpbc6)={axex1,Fomes_Linep12p13[1],Fomes_Linep13p14[1],Fomes_Linep14p11[1],axex2,43,-30,-42}; Plane Surface(surfpbc6+1)={surfpbc6,Fomes_LineLoop5[2]}; surfpbc7=newreg; Line Loop(surfpbc7)={23,44,-31,-43}; -Plane Surface(surfpbc7+1)={surfpbc7}; +Ruled Surface(surfpbc7+1)={surfpbc7}; surfpbc8=newreg; Line Loop(surfpbc8)={24,45,-32,-44}; -Plane Surface(surfpbc8+1)={surfpbc8}; +Ruled Surface(surfpbc8+1)={surfpbc8}; surfpbc9=newreg; Line Loop(surfpbc9)={25,46,-33,-45}; -Plane Surface(surfpbc9+1)={surfpbc9}; +Ruled Surface(surfpbc9+1)={surfpbc9}; surfpbc10=newreg; Line Loop(surfpbc10)={26,47,-34,-46}; -Plane Surface(surfpbc10+1)={surfpbc10}; +Ruled Surface(surfpbc10+1)={surfpbc10}; volpbc=newreg; Surface Loop(volpbc)={surfpbc1+1,surfpbc2+1,surfpbc3+1,surfpbc4+1,surfpbc5+1,surfpbc6+1,surfpbc7+1,surfpbc8+1,surfpbc9+1,surfpbc10+1,Fomes_Surf5[{1:2}]}; Volume(volpbc+1)={volpbc}; @@ -167,7 +167,7 @@ Line Loop(surfpbl1)={axex3,-Fomes_Linep4p5[1],axex4,61,62,63}; Plane Surface(surfpbl1+1)={surfpbl1}; surfpbl2=newreg; Line Loop(surfpbl2)={64,65,66,67}; -Plane Surface(surfpbl2+1)={surfpbl2}; +Ruled Surface(surfpbl2+1)={surfpbl2}; surfpbl3=newreg; Line Loop(surfpbl3)={-63,73,67,-70}; Ruled Surface(surfpbl3+1)={surfpbl3}; @@ -179,7 +179,7 @@ Line Loop(surfpbl5)={61,72,-65,-71}; Ruled Surface(surfpbl5+1)={surfpbl5}; surfpbl6=newreg; Line Loop(surfpbl6)={62,73,-66,-72}; -Plane Surface(surfpbl6+1)={surfpbl6}; +Ruled Surface(surfpbl6+1)={surfpbl6}; volpbl=newreg; Surface Loop(volpbl)={surfpbl1+1,surfpbl2+1,surfpbl3+1,surfpbl4+1,surfpbl5+1,surfpbl6+1,Fomes_Surf2[{1:2}]}; Volume(volpbl+1)={volpbl}; diff --git a/benchmarks/3d/transfinite.geo b/benchmarks/3d/transfinite.geo index c0c7314aba4f2fa8c96c6f3d6a02901e3c63dde4..737a6f721734064829aa684ece489dd95e671938 100644 --- a/benchmarks/3d/transfinite.geo +++ b/benchmarks/3d/transfinite.geo @@ -43,8 +43,9 @@ Complex Volume(26) = {25}; Transfinite Line {7,9,11,12} = 5; Transfinite Line {3,10,14} = 10; -Transfinite Line {4} = 10 Using Bump 1.5; -Transfinite Line {-1,2} = 20 Using Power 1.6; +Transfinite Line {4} = 10 Using Bump 10; +Transfinite Line {1} = 20 Using Power 1.1; +Transfinite Line {2} = 20 Using Power 0.9; Transfinite Line {8,13} = 20 ; Transfinite Surface {6} = {1,2,6,5};