Skip to content

Commit 005be49

Browse files
maxpaik16maxpaik16
committed
update tols
1 parent 3118f47 commit 005be49

108 files changed

Lines changed: 2273 additions & 522 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎input/3d-shape-mesh-target-opt.json‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,5 +145,24 @@
145145
{
146146
"path": "3d-shape-mesh-target.json"
147147
}
148-
]
149-
}
148+
],
149+
"solver": {
150+
"advanced": {
151+
"characteristic_force_density": 1,
152+
"characteristic_length": 1
153+
},
154+
"nonlinear": {
155+
"norm_type": "Euclidean",
156+
"first_grad_norm_tol": 1e-10,
157+
"grad_norm_tol": 1e-08,
158+
"x_delta_tol": 0,
159+
"advanced": {
160+
"f_delta_tol": 0,
161+
"derivative_along_delta_x_tol": 0
162+
},
163+
"line_search": {
164+
"use_grad_norm_tol": 1e-06
165+
}
166+
}
167+
}
168+
}

‎input/3d-shape-mesh-target.json‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,22 @@
9292
{
9393
"type": "GradientDescent"
9494
}
95-
]
95+
],
96+
"norm_type": "Euclidean",
97+
"first_grad_norm_tol": 1e-10,
98+
"grad_norm_tol": 1e-08,
99+
"x_delta_tol": 0,
100+
"advanced": {
101+
"f_delta_tol": 0,
102+
"derivative_along_delta_x_tol": 0
103+
},
104+
"line_search": {
105+
"use_grad_norm_tol": 1e-06
106+
}
107+
},
108+
"advanced": {
109+
"characteristic_force_density": 1,
110+
"characteristic_length": 1
96111
}
97112
},
98113
"boundary_conditions": {

‎input/barycenter-opt.json‎

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,12 @@
66
"composition": []
77
}
88
],
9-
"parameters": [
10-
11-
],
9+
"parameters": [],
1210
"functionals": [
1311
{
1412
"type": "transient_integral",
1513
"state": 0,
16-
"static_objective":
17-
{
14+
"static_objective": {
1815
"type": "center-target",
1916
"state": 0,
2017
"target_state": 1,
@@ -29,5 +26,24 @@
2926
{
3027
"path": "barycenter-target.json"
3128
}
32-
]
29+
],
30+
"solver": {
31+
"advanced": {
32+
"characteristic_force_density": 1,
33+
"characteristic_length": 1
34+
},
35+
"nonlinear": {
36+
"norm_type": "Euclidean",
37+
"first_grad_norm_tol": 1e-10,
38+
"grad_norm_tol": 1e-08,
39+
"x_delta_tol": 0,
40+
"advanced": {
41+
"f_delta_tol": 0,
42+
"derivative_along_delta_x_tol": 0
43+
},
44+
"line_search": {
45+
"use_grad_norm_tol": 1e-06
46+
}
47+
}
48+
}
3349
}

‎input/barycenter-target.json‎

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,31 @@
4545
},
4646
"solver": {
4747
"linear": {
48-
"solver": ["Eigen::PardisoLDLT","Eigen::SimplicialLDLT"]
48+
"solver": [
49+
"Eigen::PardisoLDLT",
50+
"Eigen::SimplicialLDLT"
51+
]
4952
},
5053
"nonlinear": {
51-
"grad_norm": 1e-5,
52-
"max_iterations": 200
54+
"max_iterations": 200,
55+
"norm_type": "Euclidean",
56+
"first_grad_norm_tol": 2e-12,
57+
"grad_norm_tol": 2.0000000000000002e-07,
58+
"x_delta_tol": 0.0,
59+
"advanced": {
60+
"f_delta_tol": 0.0,
61+
"derivative_along_delta_x_tol": 0.0
62+
},
63+
"line_search": {
64+
"use_grad_norm_tol": 2e-08
65+
}
5366
},
5467
"contact": {
55-
"barrier_stiffness": 1e5
68+
"barrier_stiffness": 100000.0
69+
},
70+
"advanced": {
71+
"characteristic_force_density": 1,
72+
"characteristic_length": 1
5673
}
5774
},
5875
"boundary_conditions": {

‎input/barycenter.json‎

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,31 @@
4545
},
4646
"solver": {
4747
"linear": {
48-
"solver": ["Eigen::PardisoLDLT","Eigen::SimplicialLDLT"]
48+
"solver": [
49+
"Eigen::PardisoLDLT",
50+
"Eigen::SimplicialLDLT"
51+
]
4952
},
5053
"nonlinear": {
51-
"grad_norm": 1e-5,
52-
"max_iterations": 200
54+
"max_iterations": 200,
55+
"norm_type": "Euclidean",
56+
"first_grad_norm_tol": 2e-12,
57+
"grad_norm_tol": 2.0000000000000002e-07,
58+
"x_delta_tol": 0.0,
59+
"advanced": {
60+
"f_delta_tol": 0.0,
61+
"derivative_along_delta_x_tol": 0.0
62+
},
63+
"line_search": {
64+
"use_grad_norm_tol": 2e-08
65+
}
5366
},
5467
"contact": {
55-
"barrier_stiffness": 1e5
68+
"barrier_stiffness": 100000.0
69+
},
70+
"advanced": {
71+
"characteristic_force_density": 1,
72+
"characteristic_length": 1
5673
}
5774
},
5875
"boundary_conditions": {

‎input/control-pressure-nodes-3d-opt.json‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,5 +130,23 @@
130130
"path": "control-pressure-nodes-3d.json"
131131
}
132132
],
133-
"solver": {}
134-
}
133+
"solver": {
134+
"advanced": {
135+
"characteristic_force_density": 1,
136+
"characteristic_length": 1
137+
},
138+
"nonlinear": {
139+
"norm_type": "Euclidean",
140+
"first_grad_norm_tol": 1e-10,
141+
"grad_norm_tol": 1e-08,
142+
"x_delta_tol": 0,
143+
"advanced": {
144+
"f_delta_tol": 0,
145+
"derivative_along_delta_x_tol": 0
146+
},
147+
"line_search": {
148+
"use_grad_norm_tol": 1e-06
149+
}
150+
}
151+
}
152+
}

‎input/control-pressure-nodes-3d.json‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,22 @@
9393
"Newton": {
9494
"use_psd_projection": false,
9595
"use_psd_projection_in_regularized": false
96+
},
97+
"norm_type": "Euclidean",
98+
"first_grad_norm_tol": 2e-12,
99+
"grad_norm_tol": 2e-10,
100+
"x_delta_tol": 0.0,
101+
"advanced": {
102+
"f_delta_tol": 0.0,
103+
"derivative_along_delta_x_tol": 0.0
104+
},
105+
"line_search": {
106+
"use_grad_norm_tol": 2e-08
96107
}
108+
},
109+
"advanced": {
110+
"characteristic_force_density": 1,
111+
"characteristic_length": 1
97112
}
98113
},
99114
"boundary_conditions": {
@@ -147,7 +162,7 @@
147162
{
148163
"id": 1,
149164
"type": "NeoHookean",
150-
"E": 1e5,
165+
"E": 100000.0,
151166
"nu": 0.3
152167
}
153168
],

‎input/damping-transient-opt.json‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,21 @@
2323
"functionals": [
2424
{
2525
"type": "transient_integral",
26-
"static_objective":
27-
{
26+
"static_objective": {
2827
"type": "target",
2928
"state": 0,
3029
"target_state": 1,
3130
"matching": "exact",
32-
"volume_selection": [1],
33-
"surface_selection": [1],
34-
"reference_cached_body_ids": [1, 3]
31+
"volume_selection": [
32+
1
33+
],
34+
"surface_selection": [
35+
1
36+
],
37+
"reference_cached_body_ids": [
38+
1,
39+
3
40+
]
3541
},
3642
"state": 0
3743
}

‎input/damping-transient-target.json‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,30 @@
5959
},
6060
"solver": {
6161
"linear": {
62-
"solver": ["Eigen::PardisoLDLT","Eigen::SimplicialLDLT"]
62+
"solver": [
63+
"Eigen::PardisoLDLT",
64+
"Eigen::SimplicialLDLT"
65+
]
6366
},
6467
"nonlinear": {
6568
"line_search": {
66-
"use_grad_norm_tol": 1e-3
69+
"use_grad_norm_tol": 1e-05
70+
},
71+
"norm_type": "Euclidean",
72+
"first_grad_norm_tol": 1e-12,
73+
"grad_norm_tol": 1e-10,
74+
"x_delta_tol": 0.0,
75+
"advanced": {
76+
"f_delta_tol": 0.0,
77+
"derivative_along_delta_x_tol": 0.0
6778
}
6879
},
6980
"contact": {
7081
"barrier_stiffness": 100000.0
82+
},
83+
"advanced": {
84+
"characteristic_force_density": 1,
85+
"characteristic_length": 1
7186
}
7287
},
7388
"boundary_conditions": {

‎input/damping-transient.json‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,30 @@
5959
},
6060
"solver": {
6161
"linear": {
62-
"solver": ["Eigen::PardisoLDLT","Eigen::SimplicialLDLT"]
62+
"solver": [
63+
"Eigen::PardisoLDLT",
64+
"Eigen::SimplicialLDLT"
65+
]
6366
},
6467
"nonlinear": {
6568
"line_search": {
66-
"use_grad_norm_tol": 1e-3
69+
"use_grad_norm_tol": 1e-05
70+
},
71+
"norm_type": "Euclidean",
72+
"first_grad_norm_tol": 1e-12,
73+
"grad_norm_tol": 1e-10,
74+
"x_delta_tol": 0.0,
75+
"advanced": {
76+
"f_delta_tol": 0.0,
77+
"derivative_along_delta_x_tol": 0.0
6778
}
6879
},
6980
"contact": {
7081
"barrier_stiffness": 100000.0
82+
},
83+
"advanced": {
84+
"characteristic_force_density": 1,
85+
"characteristic_length": 1
7186
}
7287
},
7388
"boundary_conditions": {

0 commit comments

Comments
 (0)