Merge branch 'polyfem:main' into main

maxpaik16 · web-flow · commit 3118f47b6610 · 2026-04-06T15:58:37.000-04:00
diff --git a/input/barycenter-target.json b/input/barycenter-target.json
@@ -40,6 +40,7 @@
     },
     "contact": {
         "enabled": true,
+        "use_convergent_formulation": true,
         "friction_coefficient": 0.2
     },
     "solver": {
@@ -97,4 +98,4 @@
             "save_time_sequence": false
         }
     }
-}
+}
diff --git a/input/barycenter.json b/input/barycenter.json
@@ -40,6 +40,7 @@
     },
     "contact": {
         "enabled": true,
+        "use_convergent_formulation": true,
         "friction_coefficient": 0.2
     },
     "solver": {
@@ -97,4 +98,4 @@
             "save_time_sequence": false
         }
     }
-}
+}
diff --git a/input/damping-transient-target.json b/input/damping-transient-target.json
@@ -54,6 +54,7 @@
     },
     "contact": {
         "enabled": true,
+        "use_convergent_formulation": true,
         "friction_coefficient": 0.5
     },
     "solver": {
@@ -112,4 +113,4 @@
             "save_time_sequence": false
         }
     }
-}
+}
diff --git a/input/damping-transient.json b/input/damping-transient.json
@@ -54,6 +54,7 @@
     },
     "contact": {
         "enabled": true,
+        "use_convergent_formulation": true,
         "friction_coefficient": 0.5
     },
     "solver": {
@@ -112,4 +113,4 @@
             "save_time_sequence": false
         }
     }
-}
+}
diff --git a/input/dirichlet-ref.json b/input/dirichlet-ref.json
@@ -75,6 +75,7 @@
     },
     "contact": {
         "enabled": true,
+        "use_convergent_formulation": true,
         "friction_coefficient": 0
     },
     "solver": {
@@ -239,4 +240,4 @@
             "save_time_sequence": false
         }
     }
-}
+}
diff --git a/input/dirichlet-sdf.json b/input/dirichlet-sdf.json
@@ -89,6 +89,7 @@
     },
     "contact": {
         "enabled": true,
+        "use_convergent_formulation": true,
         "dhat": 1e-3,
         "friction_coefficient": 0.5
     },
diff --git a/input/homogenize-stress-periodic.json b/input/homogenize-stress-periodic.json
@@ -16,6 +16,7 @@
     },
     "contact": {
         "enabled": true,
+        "use_convergent_formulation": true,
         "dhat": 5e-3,
         "periodic": true
     },
@@ -55,4 +56,4 @@
         "E": 1e3,
         "nu": 0.5
     }
-}
+}
diff --git a/input/homogenize-stress.json b/input/homogenize-stress.json
@@ -15,6 +15,7 @@
     },
     "contact": {
         "enabled": true,
+        "use_convergent_formulation": true,
         "dhat": 1e-2,
         "periodic": false
     },
@@ -54,4 +55,4 @@
         "E": 1e3,
         "nu": 0.5
     }
-}
+}
diff --git a/input/initial-contact-target.json b/input/initial-contact-target.json
@@ -40,6 +40,7 @@
     },
     "contact": {
         "enabled": true,
+        "use_convergent_formulation": true,
         "friction_coefficient": 0.2
     },
     "solver": {
@@ -91,4 +92,4 @@
             "save_time_sequence": false
         }
     }
-}
+}
diff --git a/input/initial-contact.json b/input/initial-contact.json
@@ -40,6 +40,7 @@
     },
     "contact": {
         "enabled": true,
+        "use_convergent_formulation": true,
         "friction_coefficient": 0.2
     },
     "solver": {
@@ -91,4 +92,4 @@
             "save_time_sequence": false
         }
     }
-}
+}
diff --git a/input/material-transient-target.json b/input/material-transient-target.json
@@ -46,6 +46,7 @@
     },
     "contact": {
         "enabled": true,
+        "use_convergent_formulation": true,
         "dhat": 1e-2,
         "friction_coefficient": 0.2
     },
@@ -104,4 +105,4 @@
             "save_time_sequence": false
         }
     }
-}
+}
diff --git a/input/material-transient.json b/input/material-transient.json
@@ -46,6 +46,7 @@
     },
     "contact": {
         "enabled": true,
+        "use_convergent_formulation": true,
         "dhat": 1e-2,
         "friction_coefficient": 0.2
     },
@@ -104,4 +105,4 @@
             "save_time_sequence": false
         }
     }
-}
+}
diff --git a/input/node-trajectory.json b/input/node-trajectory.json
@@ -24,6 +24,7 @@
     },
     "contact": {
         "enabled": true,
+        "use_convergent_formulation": true,
         "dhat": 0.001
     },
     "solver": {
@@ -72,4 +73,4 @@
             "save_time_sequence": false
         }
     }
-}
+}
diff --git a/input/shape-contact-adhesion.json b/input/shape-contact-adhesion.json
@@ -55,6 +55,7 @@
     },
     "contact": {
         "enabled": true,
+        "use_convergent_formulation": true,
         "dhat": 0.0005,
         "adhesion": {
             "adhesion_enabled": true,
@@ -100,4 +101,4 @@
         "nu": 0.3,
         "rho": 1
     }
-}
+}
diff --git a/input/shape-contact-force-norm-adhesion.json b/input/shape-contact-force-norm-adhesion.json
@@ -69,6 +69,7 @@
     },
     "contact": {
         "enabled": true,
+        "use_convergent_formulation": true,
         "dhat": 0.01,
         "friction_coefficient": 0.4000,
         "adhesion": {
diff --git a/input/shape-contact-force-norm.json b/input/shape-contact-force-norm.json
@@ -69,6 +69,7 @@
     },
     "contact": {
         "enabled": true,
+        "use_convergent_formulation": true,
         "dhat": 0.01,
         "friction_coefficient": 0.4000
     },
@@ -130,4 +131,4 @@
             "save_time_sequence": false
         }
     }
-}
+}
diff --git a/input/shape-contact.json b/input/shape-contact.json
@@ -55,6 +55,7 @@
     },
     "contact": {
         "enabled": true,
+        "use_convergent_formulation": true,
         "dhat": 0.001
     },
     "solver": {
@@ -94,4 +95,4 @@
         "nu": 0.3,
         "rho": 1
     }
-}
+}
diff --git a/input/shape-neumann-nodes.json b/input/shape-neumann-nodes.json
@@ -61,6 +61,7 @@
     },
     "contact": {
         "enabled": true,
+        "use_convergent_formulation": true,
         "dhat": 0.001
     },
     "boundary_conditions": {
@@ -111,4 +112,4 @@
             "nu": 0.3
         }
     ]
-}
+}
diff --git a/input/shape-pressure-neumann-nodes.json b/input/shape-pressure-neumann-nodes.json
@@ -61,6 +61,7 @@
     },
     "contact": {
         "enabled": true,
+        "use_convergent_formulation": true,
         "dhat": 0.001
     },
     "boundary_conditions": {
diff --git a/input/shape-pressure-nodes-2d.json b/input/shape-pressure-nodes-2d.json
@@ -83,6 +83,7 @@
     },
     "contact": {
         "enabled": true,
+        "use_convergent_formulation": true,
         "dhat": 0.001
     },
     "boundary_conditions": {
diff --git a/input/shape-pressure-nodes-3d.json b/input/shape-pressure-nodes-3d.json
@@ -102,6 +102,7 @@
     },
     "contact": {
         "enabled": true,
+        "use_convergent_formulation": true,
         "dhat": 0.001
     },
     "boundary_conditions": {
diff --git a/input/shape-transient-friction-sdf.json b/input/shape-transient-friction-sdf.json
@@ -67,6 +67,7 @@
     },
     "contact": {
         "enabled": true,
+        "use_convergent_formulation": true,
         "dhat": 0.001,
         "friction_coefficient": 0.2
     },
@@ -110,4 +111,4 @@
             "save_time_sequence": false
         }
     }
-}
+}
diff --git a/input/shape-transient-friction.json b/input/shape-transient-friction.json
@@ -40,6 +40,7 @@
     },
     "contact": {
         "enabled": true,
+        "use_convergent_formulation": true,
         "dhat": 0.001,
         "friction_coefficient": 0.2
     },
diff --git a/optimizations/2d-shape-traction-force/state.json b/optimizations/2d-shape-traction-force/state.json
@@ -84,6 +84,7 @@
     },
     "contact": {
         "enabled": true,
+        "use_convergent_formulation": true,
         "dhat": 0.001
     },
     "boundary_conditions": {
@@ -166,4 +167,4 @@
             "save_time_sequence": false
         }
     }
-}
+}
diff --git a/optimizations/3d-bspline-shape-matching/state.json b/optimizations/3d-bspline-shape-matching/state.json
@@ -54,6 +54,7 @@
     },
     "contact": {
         "enabled": true,
+        "use_convergent_formulation": true,
         "friction_coefficient": 0.0
     },
     "solver": {
@@ -88,4 +89,4 @@
             }
         ]
     }
-}
+}
diff --git a/optimizations/3d-bspline-shape-mesh-matching/state.json b/optimizations/3d-bspline-shape-mesh-matching/state.json
@@ -54,6 +54,7 @@
     },
     "contact": {
         "enabled": true,
+        "use_convergent_formulation": true,
         "friction_coefficient": 0.0
     },
     "solver": {
@@ -88,4 +89,4 @@
             }
         ]
     }
-}
+}
diff --git a/optimizations/3d-bspline-shape-trajectory-opt/state.json b/optimizations/3d-bspline-shape-trajectory-opt/state.json
@@ -99,6 +99,7 @@
     },
     "contact": {
         "enabled": true,
+        "use_convergent_formulation": true,
         "friction_coefficient": 0.0
     },
     "solver": {
@@ -149,4 +150,4 @@
             }
         ]
     }
-}
+}
diff --git a/optimizations/3d-bspline-shape-trajectory-opt/target.json b/optimizations/3d-bspline-shape-trajectory-opt/target.json
@@ -99,6 +99,7 @@
     },
     "contact": {
         "enabled": true,
+        "use_convergent_formulation": true,
         "friction_coefficient": 0.0
     },
     "solver": {
@@ -149,4 +150,4 @@
             }
         ]
     }
-}
+}
diff --git a/optimizations/3d-shape-layer-thickness/state.json b/optimizations/3d-shape-layer-thickness/state.json
@@ -37,6 +37,7 @@
     },
     "contact": {
         "enabled": true,
+        "use_convergent_formulation": true,
         "friction_coefficient": 0.0
     },
     "solver": {
diff --git a/optimizations/damping-opt/state.json b/optimizations/damping-opt/state.json
diff --git a/optimizations/damping-opt/target.json b/optimizations/damping-opt/target.json
diff --git a/optimizations/friction-opt/state.json b/optimizations/friction-opt/state.json
diff --git a/optimizations/friction-opt/target.json b/optimizations/friction-opt/target.json
diff --git a/optimizations/initial-condition-trajectory-opt/barycenter-target.json b/optimizations/initial-condition-trajectory-opt/barycenter-target.json
diff --git a/optimizations/initial-condition-trajectory-opt/barycenter.json b/optimizations/initial-condition-trajectory-opt/barycenter.json
diff --git a/optimizations/initial-opt/run.json b/optimizations/initial-opt/run.json
diff --git a/optimizations/initial-opt/target.json b/optimizations/initial-opt/target.json
diff --git a/optimizations/multiparameter-sdf-trajectory-surface-opt/state.json b/optimizations/multiparameter-sdf-trajectory-surface-opt/state.json
diff --git a/optimizations/shape-trajectory-surface-opt-bspline/state.json b/optimizations/shape-trajectory-surface-opt-bspline/state.json
diff --git a/optimizations/shape-trajectory-surface-opt-bspline/target.json b/optimizations/shape-trajectory-surface-opt-bspline/target.json
diff --git a/optimizations/shape-trajectory-surface-opt-new/state.json b/optimizations/shape-trajectory-surface-opt-new/state.json
diff --git a/optimizations/shape-trajectory-surface-opt-new/target.json b/optimizations/shape-trajectory-surface-opt-new/target.json

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@`
`40`	`40`	`},`
`41`	`41`	`"contact": {`
`42`	`42`	`"enabled": true,`
	`43`	`+ "use_convergent_formulation": true,`
`43`	`44`	`"friction_coefficient": 0.2`
`44`	`45`	`},`
`45`	`46`	`"solver": {`
`@@ -97,4 +98,4 @@`
`97`	`98`	`"save_time_sequence": false`
`98`	`99`	`}`
`99`	`100`	`}`
`100`		`-}`
	`101`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@`
`54`	`54`	`},`
`55`	`55`	`"contact": {`
`56`	`56`	`"enabled": true,`
	`57`	`+ "use_convergent_formulation": true,`
`57`	`58`	`"friction_coefficient": 0.5`
`58`	`59`	`},`
`59`	`60`	`"solver": {`
`@@ -112,4 +113,4 @@`
`112`	`113`	`"save_time_sequence": false`
`113`	`114`	`}`
`114`	`115`	`}`
`115`		`-}`
	`116`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,7 @@`
`75`	`75`	`},`
`76`	`76`	`"contact": {`
`77`	`77`	`"enabled": true,`
	`78`	`+ "use_convergent_formulation": true,`
`78`	`79`	`"friction_coefficient": 0`
`79`	`80`	`},`
`80`	`81`	`"solver": {`
`@@ -239,4 +240,4 @@`
`239`	`240`	`"save_time_sequence": false`
`240`	`241`	`}`
`241`	`242`	`}`
`242`		`-}`
	`243`	`+}`