fix failed tests

Author: Huangzizhou

src/polyfem/solver/SolveData.cpp

@@ -344,37 +344,51 @@ namespace polyfem::solver
 		{
 			const bool use_adaptive_barrier_stiffness = !barrier_stiffness.is_number();
 
-			if (contact_params["use_smooth_formulation"])
-			{
-				if (collision_mesh.dim() == 2)
-					contact_form = std::make_shared<SmoothContactForm<2>>(
-						collision_mesh, contact_params, avg_mass,
-						use_adaptive_barrier_stiffness, is_time_dependent, enable_shape_derivatives, broad_phase, 
-						ccd_tolerance * units.characteristic_length(), ccd_max_iterations);
-				else
-					contact_form = std::make_shared<SmoothContactForm<3>>(
-						collision_mesh, contact_params, avg_mass,
-						use_adaptive_barrier_stiffness, is_time_dependent, enable_shape_derivatives, broad_phase, 
-						ccd_tolerance * units.characteristic_length(), ccd_max_iterations);
-			}
-			else if (periodic_contact)
+			if (periodic_contact)
 			{
 				periodic_contact_form = std::make_shared<PeriodicContactForm>(
 					collision_mesh, tiled_to_single, dhat, avg_mass, use_area_weighting, use_improved_max_operator, use_physical_barrier,
 					use_adaptive_barrier_stiffness, is_time_dependent, enable_shape_derivatives, broad_phase, ccd_tolerance,
 					ccd_max_iterations);
+
+				if (use_adaptive_barrier_stiffness)
+				{
+					periodic_contact_form->set_barrier_stiffness(1);
+					// logger().debug("Using adaptive barrier stiffness");
+				}
+				else
+				{
+					assert(barrier_stiffness.is_number());
+					assert(barrier_stiffness.get<double>() > 0);
+					periodic_contact_form->set_barrier_stiffness(barrier_stiffness);
+					// logger().debug("Using fixed barrier stiffness of {}", contact_form->barrier_stiffness());
+				}
+
+				// periodic_contact_form is not pushed into forms since it takes different input vectors.
 			}
 			else
 			{
-				contact_form = std::make_shared<BarrierContactForm>(
-					collision_mesh, dhat, avg_mass, use_area_weighting, use_improved_max_operator, use_physical_barrier,
-					use_adaptive_barrier_stiffness, is_time_dependent, enable_shape_derivatives, broad_phase, ccd_tolerance * units.characteristic_length(),
-					ccd_max_iterations);
-			}
-
+				if (contact_params["use_smooth_formulation"])
+				{
+					if (collision_mesh.dim() == 2)
+						contact_form = std::make_shared<SmoothContactForm<2>>(
+							collision_mesh, contact_params, avg_mass,
+							use_adaptive_barrier_stiffness, is_time_dependent, enable_shape_derivatives, broad_phase, 
+							ccd_tolerance * units.characteristic_length(), ccd_max_iterations);
+					else
+						contact_form = std::make_shared<SmoothContactForm<3>>(
+							collision_mesh, contact_params, avg_mass,
+							use_adaptive_barrier_stiffness, is_time_dependent, enable_shape_derivatives, broad_phase, 
+							ccd_tolerance * units.characteristic_length(), ccd_max_iterations);
+				}
+				else
+				{
+					contact_form = std::make_shared<BarrierContactForm>(
+						collision_mesh, dhat, avg_mass, use_area_weighting, use_improved_max_operator, use_physical_barrier,
+						use_adaptive_barrier_stiffness, is_time_dependent, enable_shape_derivatives, broad_phase, ccd_tolerance * units.characteristic_length(),
+						ccd_max_iterations);
+				}
 
-			if (contact_form)
-			{
 				if (use_adaptive_barrier_stiffness)
 				{
 					contact_form->set_barrier_stiffness(contact_params["initial_barrier_stiffness"]);
@@ -389,15 +403,15 @@ namespace polyfem::solver
 				}
 
 				forms.push_back(contact_form);
+			}
 
-				if (friction_coefficient != 0)
-				{
-					friction_form = std::make_shared<FrictionForm>(
-						collision_mesh, time_integrator, epsv, friction_coefficient,
-						broad_phase, *contact_form, friction_iterations);
-					friction_form->init_lagging(sol);
-					forms.push_back(friction_form);
-				}
+			if (friction_coefficient != 0)
+			{
+				friction_form = std::make_shared<FrictionForm>(
+					collision_mesh, time_integrator, epsv, friction_coefficient,
+					broad_phase, *contact_form, friction_iterations);
+				friction_form->init_lagging(sol);
+				forms.push_back(friction_form);
 			}
 
 			if (adhesion_enabled)

tests/test_periodic.cpp

@@ -110,9 +110,9 @@ namespace
 		double former_functional_val = problem.value(x - theta * dt);
 
 		double finite_difference = (next_functional_val - former_functional_val) / dt / 2;
-		logger().trace("f(x) {.16} f(x-dt) {.16} f(x+dt) {.16}", functional_val, former_functional_val, next_functional_val);
-		logger().trace("derivative: {.12}, fd: {.12}", derivative, finite_difference);
-		logger().trace("relative error: {.12}", abs((finite_difference - derivative) / derivative));
+		logger().trace("f(x) {:.16f} f(x-dt) {:.16f} f(x+dt) {:.16f}", functional_val, former_functional_val, next_functional_val);
+		logger().trace("derivative: {:.12f}, fd: {:.12f}", derivative, finite_difference);
+		logger().trace("relative error: {:.12f}", abs((finite_difference - derivative) / derivative));
 		REQUIRE(derivative == Catch::Approx(finite_difference).epsilon(tol));
 	}
 
@@ -134,9 +134,9 @@ namespace
 		double former_functional_val = problem.value(x - theta * dt);
 
 		double finite_difference = (next_functional_val - former_functional_val) / dt / 2;
-		logger().trace("f(x) {.16} f(x-dt) {.16} f(x+dt) {.16}", functional_val, former_functional_val, next_functional_val);
-		logger().trace("derivative: {.12}, fd: {.12}", derivative, finite_difference);
-		logger().trace("relative error: {.12}", abs((finite_difference - derivative) / derivative));
+		logger().trace("f(x) {:.16f} f(x-dt) {:.16f} f(x+dt) {:.16f}", functional_val, former_functional_val, next_functional_val);
+		logger().trace("derivative: {:.12f}, fd: {:.12f}", derivative, finite_difference);
+		logger().trace("relative error: {:.12f}", abs((finite_difference - derivative) / derivative));
 		REQUIRE(derivative == Catch::Approx(finite_difference).epsilon(tol));
 	}
 } // namespace