Skip to content

Commit d1545d9

Browse files
committed
Fixed tests
1 parent 4d08f10 commit d1545d9

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

src/ipc/collision_mesh.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,8 @@ class CollisionMesh {
236236
/// @brief Determine if the area Jacobians have been initialized by calling init_area_jacobians().
237237
bool are_area_jacobians_initialized() const
238238
{
239-
return !m_vertex_area_jacobian.empty() && !m_edge_area_jacobian.empty();
239+
return m_vertex_area_jacobian.size() == num_vertices()
240+
&& m_edge_area_jacobian.size() == num_edges();
240241
}
241242

242243
// -----------------------------------------------------------------------

tests/friction/test_force_jacobian.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
using namespace ipc;
1616

1717
void check_friction_force_jacobian(
18-
CollisionMesh mesh,
18+
const CollisionMesh& mesh,
1919
const Eigen::MatrixXd& Ut,
2020
const Eigen::MatrixXd& U,
2121
const Constraints& constraints,
@@ -92,6 +92,7 @@ void check_friction_force_jacobian(
9292
Eigen::MatrixXd fd_X = fd::unflatten(x, X.cols());
9393

9494
CollisionMesh fd_mesh(fd_X, mesh.edges(), mesh.faces());
95+
fd_mesh.init_area_jacobians();
9596

9697
FrictionConstraints fd_friction_constraints;
9798
if (recompute_constraints) {
@@ -228,6 +229,7 @@ TEST_CASE("Test friction force jacobian", "[friction][force-jacobian][thisone]")
228229
U = V1 - X;
229230

230231
CollisionMesh mesh(X, E, F);
232+
mesh.init_area_jacobians();
231233

232234
check_friction_force_jacobian(
233235
mesh, Ut, U, constraints, mu, epsv_times_h, dhat, barrier_stiffness,
@@ -303,6 +305,7 @@ TEST_CASE(
303305
std::vector<bool> is_on_surface =
304306
CollisionMesh::construct_is_on_surface(X.rows(), E);
305307
CollisionMesh mesh(is_on_surface, X, E, F);
308+
mesh.init_area_jacobians();
306309

307310
X = mesh.vertices(X);
308311
if (Ut.rows() != X.rows()) {

0 commit comments

Comments
 (0)