Skip to content

Commit 394938d

Browse files
maxpaik16maxpaik16
authored
Merge pull request #1 from polyfem/main
update polyfem-data 11/25
2 parents d0d9632 + ba7e79f commit 394938d

File tree

4 files changed

+265
-113
lines changed

4 files changed

+265
-113
lines changed

‎contact/examples/2D/large-ratios/large-mass-ratio.json

Lines changed: 79 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,93 @@
11
{
22
"boundary_conditions": {
3-
"dirichlet_boundary": [{
4-
"id": 1,
5-
"value": [0, 0]
6-
}],
7-
"rhs": [0, 9.81]
3+
"dirichlet_boundary": [
4+
{
5+
"id": 1,
6+
"value": [
7+
0,
8+
0
9+
]
10+
}
11+
],
12+
"rhs": [
13+
0,
14+
9.81
15+
]
816
},
917
"common": "../../common.json",
1018
"contact": {
1119
"friction_coefficient": 0.1
1220
},
13-
"geometry": [{
14-
"mesh": "../../../meshes/2D/simple/square.obj",
15-
"transformation": {
16-
"scale": 1,
17-
"translation": [0, 0.45]
21+
"geometry": [
22+
{
23+
"mesh": "../../../meshes/2D/simple/square.obj",
24+
"transformation": {
25+
"scale": 1,
26+
"translation": [
27+
0,
28+
0.45
29+
]
30+
},
31+
"volume_selection": 1
32+
},
33+
{
34+
"mesh": "../../../meshes/2D/simple/square.obj",
35+
"transformation": {
36+
"scale": 0.1,
37+
"translation": [
38+
0,
39+
-0.15
40+
]
41+
},
42+
"volume_selection": 2
1843
},
19-
"volume_selection": 1
20-
}, {
21-
"mesh": "../../../meshes/2D/simple/square.obj",
22-
"transformation": {
23-
"scale": 0.1,
24-
"translation": [0, -0.15]
44+
{
45+
"mesh": "../../../meshes/2D/simple/square.obj",
46+
"surface_selection": 1,
47+
"transformation": {
48+
"scale": [
49+
2,
50+
0.01
51+
],
52+
"translation": [
53+
0,
54+
-0.25
55+
]
56+
},
57+
"volume_selection": 3
58+
}
59+
],
60+
"materials": [
61+
{
62+
"E": 100000000,
63+
"id": 1,
64+
"nu": 0.4,
65+
"rho": 10000,
66+
"type": "NeoHookean"
2567
},
26-
"volume_selection": 2
27-
}, {
28-
"mesh": "../../../meshes/2D/simple/square.obj",
29-
"surface_selection": 1,
30-
"transformation": {
31-
"scale": [2, 0.01],
32-
"translation": [0, -0.25]
68+
{
69+
"E": 1000000,
70+
"id": 2,
71+
"nu": 0.4,
72+
"rho": 1000,
73+
"type": "NeoHookean"
3374
},
34-
"volume_selection": 3
35-
}],
36-
"materials": [{
37-
"E": 100000000.0,
38-
"id": 1,
39-
"nu": 0.4,
40-
"rho": 10000,
41-
"type": "NeoHookean"
42-
}, {
43-
"E": 1000000.0,
44-
"id": 2,
45-
"nu": 0.4,
46-
"rho": 1000,
47-
"type": "NeoHookean"
48-
}, {
49-
"E": 200000000000.0,
50-
"id": 3,
51-
"nu": 0.3,
52-
"rho": 7750,
53-
"type": "NeoHookean"
54-
}],
75+
{
76+
"E": 200000000000,
77+
"id": 3,
78+
"nu": 0.3,
79+
"rho": 7750,
80+
"type": "NeoHookean"
81+
}
82+
],
5583
"tests": {
56-
"err_h1": 0.2514348557190261,
57-
"err_h1_semi": 0.14635995143467767,
58-
"err_l2": 0.20444620633918906,
59-
"err_linf": 0.22593956075974939,
60-
"err_linf_grad": 0.22593956075974939,
61-
"err_lp": 0.211146253326902,
62-
"margin": 1e-05,
84+
"err_h1": 0.25144660239320593,
85+
"err_h1_semi": 0.1463522823796857,
86+
"err_l2": 0.20446614217846373,
87+
"err_linf": 0.22595852588023266,
88+
"err_linf_grad": 0.22595852588023266,
89+
"err_lp": 0.21116501905646945,
90+
"margin": 0.00001,
6391
"time_steps": "all"
6492
},
6593
"time": {

‎contact/examples/3D/large-ratios/large-mass-ratio.json

Lines changed: 85 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,99 @@
11
{
22
"boundary_conditions": {
3-
"dirichlet_boundary": [{
4-
"id": 1,
5-
"value": [0, 0, 0]
6-
}],
7-
"rhs": [0, 9.81, 0]
3+
"dirichlet_boundary": [
4+
{
5+
"id": 1,
6+
"value": [
7+
0,
8+
0,
9+
0
10+
]
11+
}
12+
],
13+
"rhs": [
14+
0,
15+
9.81,
16+
0
17+
]
818
},
919
"common": "../../common.json",
1020
"contact": {
1121
"friction_coefficient": 0.5
1222
},
13-
"geometry": [{
14-
"mesh": "../../../meshes/3D/simple/cube.msh",
15-
"transformation": {
16-
"scale": 1,
17-
"translation": [0, 0.45, 0]
23+
"geometry": [
24+
{
25+
"mesh": "../../../meshes/3D/simple/cube.msh",
26+
"transformation": {
27+
"scale": 1,
28+
"translation": [
29+
0,
30+
0.45,
31+
0
32+
]
33+
},
34+
"volume_selection": 1
35+
},
36+
{
37+
"mesh": "../../../meshes/3D/simple/cube.msh",
38+
"transformation": {
39+
"scale": 0.1,
40+
"translation": [
41+
0,
42+
-0.15,
43+
0
44+
]
45+
},
46+
"volume_selection": 2
1847
},
19-
"volume_selection": 1
20-
}, {
21-
"mesh": "../../../meshes/3D/simple/cube.msh",
22-
"transformation": {
23-
"scale": 0.1,
24-
"translation": [0, -0.15, 0]
48+
{
49+
"mesh": "../../../meshes/3D/simple/cube.msh",
50+
"surface_selection": 1,
51+
"transformation": {
52+
"scale": [
53+
2,
54+
0.01,
55+
2
56+
],
57+
"translation": [
58+
0,
59+
-0.25,
60+
0
61+
]
62+
},
63+
"volume_selection": 3
64+
}
65+
],
66+
"materials": [
67+
{
68+
"E": 100000000,
69+
"id": 1,
70+
"nu": 0.4,
71+
"rho": 10000,
72+
"type": "NeoHookean"
2573
},
26-
"volume_selection": 2
27-
}, {
28-
"mesh": "../../../meshes/3D/simple/cube.msh",
29-
"surface_selection": 1,
30-
"transformation": {
31-
"scale": [2, 0.01, 2],
32-
"translation": [0, -0.25, 0]
74+
{
75+
"E": 1000000,
76+
"id": 2,
77+
"nu": 0.4,
78+
"rho": 1000,
79+
"type": "NeoHookean"
3380
},
34-
"volume_selection": 3
35-
}],
36-
"materials": [{
37-
"E": 100000000.0,
38-
"id": 1,
39-
"nu": 0.4,
40-
"rho": 10000,
41-
"type": "NeoHookean"
42-
}, {
43-
"E": 1000000.0,
44-
"id": 2,
45-
"nu": 0.4,
46-
"rho": 1000,
47-
"type": "NeoHookean"
48-
}, {
49-
"E": 200000000000.0,
50-
"id": 3,
51-
"nu": 0.3,
52-
"rho": 7750,
53-
"type": "NeoHookean"
54-
}],
81+
{
82+
"E": 200000000000,
83+
"id": 3,
84+
"nu": 0.3,
85+
"rho": 7750,
86+
"type": "NeoHookean"
87+
}
88+
],
5589
"tests": {
56-
"err_h1": 0.18488832029142743,
57-
"err_h1_semi": 0.05224921214763542,
58-
"err_l2": 0.17735194053107184,
59-
"err_linf": 0.1807586717588081,
60-
"err_linf_grad": 0.1807586717588081,
61-
"err_lp": 0.17746271141840017,
62-
"margin": 1e-05,
90+
"err_h1": 0.18509951096110944,
91+
"err_h1_semi": 0.05193907299057232,
92+
"err_l2": 0.17766305652814227,
93+
"err_linf": 0.18101400712077417,
94+
"err_linf_grad": 0.18101400712077417,
95+
"err_lp": 0.1777693606214452,
96+
"margin": 0.00001,
6397
"time_steps": "all"
6498
},
6599
"time": {

‎standard/ring.json

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,21 @@
2929
"discr_order": 2,
3030
"advanced": {
3131
"quadrature_order": 5,
32-
"use_corner_quadrature": true
32+
"use_corner_quadrature": true,
33+
"count_flipped_els_continuous": true
3334
}
3435
},
3536
"boundary_conditions": {
3637
"dirichlet_boundary": [{
3738
"id": 1,
3839
"value": [
39-
"rotate_2D_x(x, y, -3 * pi * t) - x",
40-
"rotate_2D_y(x, y, -3 * pi * t) - y"
40+
"rotate_2D_x(x, y, -2.5 * pi * t) - x",
41+
"rotate_2D_y(x, y, -2.5 * pi * t) - y"
4142
]
4243
}]
4344
},
4445
"time": {
45-
"tend": 1,
46+
"tend": 0.7,
4647
"dt": 0.01
4748
},
4849
"geometry": [{
@@ -65,13 +66,13 @@
6566
"type": "NeoHookean"
6667
},
6768
"tests": {
68-
"err_h1": 0.511268312961,
69-
"err_h1_semi": 0.502313365725,
70-
"err_l2": 0.0952710367962,
71-
"err_linf": 0.110593985158,
72-
"err_linf_grad": 2.01638310035,
73-
"err_lp": 0.0746798251068,
74-
"margin": 1e-05,
69+
"err_h1": 5.29565605345573,
70+
"err_h1_semi": 4.74227709521791,
71+
"err_l2": 2.35685828777928,
72+
"err_linf": 1.88577209452532,
73+
"err_linf_grad": 3.7751596155191,
74+
"err_lp": 1.77568802841361,
75+
"margin": 1e-03,
7576
"time_steps": "all"
7677
}
7778
}

0 commit comments

Comments
 (0)