Merge branch 'main' into cuda-ci

zfergus · web-flow · commit b3edcb8bdb8c · 2024-09-26T23:50:52.000-04:00
diff --git a/src/ipc/ipc.cpp b/src/ipc/ipc.cpp
@@ -56,6 +56,8 @@ double compute_collision_free_stepsize(
                 "Sweep and Tiniest Queue is only supported in 3D!");
         }
         // TODO: Use correct min_distance
+        const double tolerance = TightInclusionCCD::DEFAULT_TOLERANCE;
+        const long max_iterations = TightInclusionCCD::DEFAULT_MAX_ITERATIONS;
         const double step_size = scalable_ccd::cuda::ipc_ccd_strategy(
             vertices_t0, vertices_t1, mesh.edges(), mesh.faces(),
             /*min_distance=*/0.0, max_iterations, tolerance);

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,8 @@ double compute_collision_free_stepsize(`
`56`	`56`	`"Sweep and Tiniest Queue is only supported in 3D!");`
`57`	`57`	`}`
`58`	`58`	`// TODO: Use correct min_distance`
	`59`	`+ const double tolerance = TightInclusionCCD::DEFAULT_TOLERANCE;`
	`60`	`+ const long max_iterations = TightInclusionCCD::DEFAULT_MAX_ITERATIONS;`
`59`	`61`	`const double step_size = scalable_ccd::cuda::ipc_ccd_strategy(`
`60`	`62`	`vertices_t0, vertices_t1, mesh.edges(), mesh.faces(),`
`61`	`63`	`/min_distance=/0.0, max_iterations, tolerance);`