diff --git a/tutorials/Makefile.am b/tutorials/Makefile.am index 46da2394..648c2bde 100644 --- a/tutorials/Makefile.am +++ b/tutorials/Makefile.am @@ -7,5 +7,5 @@ dist_pkgdata_DATA = boxcyl.geo circle_on_cube.geo cone.geo cube.geo \ sculpture.geo shaft.geo shell.geo sphere.geo sphereincube.geo torus.geo trafo.geo \ twobricks.geo twocubes.geo twocyl.geo \ hinge.stl part1.stl frame.step screw.step \ - demo2d.in2d square.in2d + squarehole.in2d square.in2d diff --git a/tutorials/square.in2d b/tutorials/square.in2d index 5b6aee67..3dd9971f 100644 --- a/tutorials/square.in2d +++ b/tutorials/square.in2d @@ -1,14 +1,35 @@ -splinecurves2d -5 +# keyword for 2D geometry, version 2 +splinecurves2dv2 + + +# a global grading factor +2 + + +# the points (point number, x and y coordinates) +points +1 0 0 -maxh=0.01 +2 1 0 +3 1 1 +4 0 1 + + +# boundary curves consisting of +# dl dr np p1 p1 flaglist +# with +# dl ... sub-domain nr on left side +# dr ... sub-domain nr on right side +# np ... curve is given by 2 (or 3) points +# p1, p2 ... points defining the curve +# flagslist +segments +1 0 2 1 2 -bc=1 -maxh=0.1 +1 0 2 2 3 -bc=1 +1 0 2 3 4 -bc=1 +1 0 2 4 1 -bc=2 + + +materials +1 domain1 -maxh=0.3 -4 -0 0 1 -1 0 1 -1 1 1 -0 1 1 -4 -1 0 2 1 2 1 -1 0 2 2 3 1 -1 0 2 3 4 1 -1 0 2 4 1 1 diff --git a/tutorials/squarecircle.in2d b/tutorials/squarecircle.in2d new file mode 100644 index 00000000..ab563a19 --- /dev/null +++ b/tutorials/squarecircle.in2d @@ -0,0 +1,48 @@ +# keyword for 2D geometry, version 2 +splinecurves2dv2 + + +# a global grading factor +2 + + +# the points (point number, x and y coordinates) +points +1 0 0 +2 1 0 +3 1 1 +4 0 1 +5 0.5 0.4 +6 0.6 0.4 +7 0.6 0.5 +8 0.6 0.6 +9 0.5 0.6 +10 0.4 0.6 +11 0.4 0.5 +12 0.4 0.4 + + +# boundary curves consisting of +# dl dr np p1 p1 flaglist +# with +# dl ... sub-domain nr on left side +# dr ... sub-domain nr on right side +# np ... curve is given by 2 (or 3) points +# p1, p2 ... points defining the curve + +# flagslist +segments +1 0 2 1 2 -bc=1 +1 0 2 2 3 -bc=1 +1 0 2 3 4 -bc=1 +1 0 2 4 1 -bc=1 +2 1 3 5 6 7 -bc=2 +2 1 3 7 8 9 -bc=2 +2 1 3 9 10 11 -bc=2 +2 1 3 11 12 5 -bc=2 + +materials +1 domain1 -maxh=0.2 +2 domain2 -maxh=0.05 + +