Skip to content

Commit 2e8ea12

Browse files
maxpaik16maxpaik16
authored
Merge pull request #1 from polyfem/main
update 3/14
2 parents 7e49f24 + e3376ce commit 2e8ea12

18 files changed

Lines changed: 295 additions & 44 deletions

‎input/damping-transient-opt.json‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,24 @@
11
{
22
"variable_to_simulation": [
3-
3+
{
4+
"type": "damping",
5+
"state": 0,
6+
"composition": [
7+
{
8+
"type": "slice",
9+
"parameter_index": 0
10+
}
11+
]
12+
}
413
],
514
"parameters": [
6-
15+
{
16+
"number": 2,
17+
"initial": [
18+
10,
19+
10
20+
]
21+
}
722
],
823
"functionals": [
924
{
@@ -34,4 +49,4 @@
3449
"debug_fd_eps": 1e-3
3550
}
3651
}
37-
}
52+
}

‎input/friction-contact-opt.json‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
{
2+
"variable_to_simulation": [
3+
{
4+
"type": "friction",
5+
"state": 0,
6+
"composition": []
7+
}
8+
],
9+
"parameters": [],
10+
"functionals": [
11+
{
12+
"type": "transient_integral",
13+
"state": 0,
14+
"static_objective": {
15+
"type": "target",
16+
"state": 0,
17+
"target_state": 1,
18+
"matching": "exact",
19+
"surface_selection": [
20+
1
21+
]
22+
}
23+
}
24+
],
25+
"states": [
26+
{
27+
"path": "initial-contact.json"
28+
},
29+
{
30+
"path": "initial-contact-target.json"
31+
}
32+
]
33+
}

‎input/initial-contact-min-dist-opt.json‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
{
2+
"variable_to_simulation": [
3+
{
4+
"type": "initial",
5+
"state": 0,
6+
"composition": []
7+
}
8+
],
9+
"parameters": [
10+
{
11+
"number": 1036
12+
}
13+
],
14+
"functionals": [
15+
{
16+
"type": "transient_integral",
17+
"state": 0,
18+
"static_objective": {
19+
"type": "target",
20+
"state": 0,
21+
"target_state": 1,
22+
"matching": "exact",
23+
"surface_selection": [
24+
1
25+
]
26+
}
27+
},
28+
{
29+
"type": "min-dist-target",
30+
"state": 0,
31+
"target": [
32+
0.05,
33+
0.2
34+
],
35+
"volume_selection": [
36+
1
37+
],
38+
"steps": [
39+
2,
40+
4
41+
]
42+
}
43+
],
44+
"states": [
45+
{
46+
"path": "initial-contact.json"
47+
},
48+
{
49+
"path": "initial-contact-target.json"
50+
}
51+
]
52+
}

‎input/initial-contact-smooth-opt.json‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
{
2+
"variable_to_simulation": [
3+
{
4+
"type": "initial",
5+
"state": 0,
6+
"composition": []
7+
}
8+
],
9+
"parameters": [
10+
{
11+
"number": 1036
12+
}
13+
],
14+
"functionals": [
15+
{
16+
"type": "transient_integral",
17+
"state": 0,
18+
"static_objective": {
19+
"type": "target",
20+
"state": 0,
21+
"target_state": 1,
22+
"matching": "exact",
23+
"surface_selection": [
24+
1
25+
]
26+
}
27+
},
28+
{
29+
"type": "transient_integral",
30+
"integral_type": "final",
31+
"state": 0,
32+
"static_objective": {
33+
"type": "smooth_contact_force_norm",
34+
"state": 0,
35+
"surface_selection": [
36+
1,
37+
3
38+
]
39+
}
40+
}
41+
],
42+
"states": [
43+
{
44+
"path": "initial-contact.json"
45+
},
46+
{
47+
"path": "initial-contact-target.json"
48+
}
49+
]
50+
}

‎input/linear_elasticity-surface-3d-opt.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
],
1919
"states": [
2020
{
21-
"path": "linear_elasticity-surface-3d-opt.json"
21+
"path": "linear_elasticity-surface-3d.json"
2222
}
2323
]
24-
}
24+
}

‎input/material-transient-opt.json‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,24 @@
33
{
44
"type": "elastic",
55
"state": 0,
6-
"composition": []
6+
"composition": [
7+
{
8+
"type": "append-const",
9+
"size": 115,
10+
"value": 0.3
11+
},
12+
{
13+
"type": "E-nu-to-lambda-mu",
14+
"is_volume": false
15+
}
16+
]
717
}
818
],
919
"parameters": [
10-
20+
{
21+
"number": 115,
22+
"initial": []
23+
}
1124
],
1225
"functionals": [
1326
{
@@ -37,4 +50,4 @@
3750
"debug_fd_eps": 1e-5
3851
}
3952
}
40-
}
53+
}

‎input/neohookean-stress-3d.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@
3838
"E": 1e5,
3939
"nu": 0.3
4040
}
41-
}
41+
}

‎input/shape-contact-force-norm-3d-opt.json‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,11 @@
1616
]
1717
}
1818
],
19-
"parameters": [],
19+
"parameters": [
20+
{
21+
"number": 42
22+
}
23+
],
2024
"functionals": [
2125
{
2226
"type": "transient_integral",
@@ -39,4 +43,4 @@
3943
}
4044
],
4145
"solver": {}
42-
}
46+
}

‎input/shape-contact-force-norm-3d.json‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,16 @@
6666
"friction_iterations": 1
6767
},
6868
"nonlinear": {
69-
"grad_norm": 1e-6
69+
"grad_norm": 1e-12
7070
}
7171
},
7272
"contact": {
7373
"enabled": true,
7474
"dhat": 0.02,
75-
"friction_coefficient": 0.4000
75+
"friction_coefficient": 0.0,
76+
"use_gcp_formulation": true,
77+
"use_convergent_formulation": false,
78+
"alpha_t": 0.95
7679
},
7780
"boundary_conditions": {
7881
"rhs": [
@@ -134,4 +137,4 @@
134137
"save_time_sequence": true
135138
}
136139
}
137-
}
140+
}

‎input/shape-contact-force-norm-adhesion.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,4 +137,4 @@
137137
"save_time_sequence": false
138138
}
139139
}
140-
}
140+
}

0 commit comments

Comments
 (0)