Merge branch 'master' of github.com:Roushelfy/solid-sim-muda

Author: Roushelfy

simulators/7_self_contact/src/BarrierEnergy.cu

@@ -35,7 +35,7 @@ BarrierEnergy<T, dim>::BarrierEnergy(const BarrierEnergy<T, dim> &rhs)
 	: pimpl_{std::make_unique<Impl>(*rhs.pimpl_)} {}
 
 template <typename T, int dim>
-BarrierEnergy<T, dim>::BarrierEnergy(const std::vector<T> &x, const std::vector<T> &n, const std::vector<T> &o, const std::vector<int> &be, const std::vector<int> &bp, const std::vector<T> &contact_area) : pimpl_{std::make_unique<Impl>()}
+BarrierEnergy<T, dim>::BarrierEnergy(const std::vector<T> &x, const std::vector<T> &n, const std::vector<T> &o, const std::vector<int> &bp, const std::vector<int> &be, const std::vector<T> &contact_area) : pimpl_{std::make_unique<Impl>()}
 {
 	pimpl_->N = x.size() / dim;
 	pimpl_->device_x.copy_from(x);
@@ -377,11 +377,13 @@ T BarrierEnergy<T, dim>::init_step_size(const DeviceBuffer<T> &p)
 				   e1<<device_x(eI1*dim),device_x(eI1*dim+1);
 				   dp<<P(xI*dim),P(xI*dim+1);
 				   de0<<P(eI0*dim),P(eI0*dim+1);
-				   de1<<P(eI1*dim),P(eI1*dim+1); 
-				   if (bbox_overlap(p,e0,e1,dp,de0,de1,current_alpha)){
-					 T toc=narrow_phase_CCD(p,e0,e1,dp,de0,de1,current_alpha);
-					 device_alpha1(i)=min(device_alpha1(i),toc);
-				   }} })
+				   de1<<P(eI1*dim),P(eI1*dim+1);
+				   if (bbox_overlap(p, e0, e1, dp, de0, de1, current_alpha))
+				   {
+					   T toc = narrow_phase_CCD(p, e0, e1, dp, de0, de1, current_alpha);
+					   device_alpha1(i) = min(device_alpha1(i), toc);
+				   }
+				   } })
 		.wait();
 	return min(min_vector(device_alpha1), current_alpha);
 }

simulators/7_self_contact/src/distance/CCD.cu

@@ -15,7 +15,6 @@ __device__ __host__ bool bbox_overlap(const Eigen::Matrix<T, 2, 1> &p, const Eig
     }
     else
     {
-        // printf("min_p: %f %f\n max_p: %f %f\n min_e: %f %f\n max_e: %f %f\n", min_p[0], min_p[1], max_p[0], max_p[1], min_e[0], min_e[1], max_e[0], max_e[1]);
         return true;
     }
 }

simulators/7_self_contact/src/simulator.cu

@@ -64,7 +64,7 @@ InvFreeSimulator<T, dim>::Impl::Impl(T rho, T side_len, T initial_stretch, T K,
     generate(side_len, n_seg, x, e);
     for (int i = 0; i < (n_seg + 1) * (n_seg + 1); i++)
     {
-        x.push_back(x[i * dim] - side_len * 0.1);
+        x.push_back(x[i * dim] - side_len * 0.05);
         x.push_back(x[i * dim + 1] - side_len * 1.1);
     }
     int esize = e.size();