7 self contact simulator

Author: Roushelfy

simulators/6_inv_free/src/main.cpp

@@ -6,7 +6,7 @@ int main()
 	double nu = 0.4, E = 1e5;
 	double Mu = E / (2 * (1 + nu)), Lam = E * nu / ((1 + nu) * (1 - 2 * nu));
 	double rho = 1000,
-		   k = 4e4, initial_stretch = 1, n_seg = 4, h = 0.01, side_len = 1, tol = 0.01, mu = 0.11;
+		   k = 4e4, initial_stretch = 1, n_seg = 10, h = 0.01, side_len = 1, tol = 0.01, mu = 0.11;
 	// printf("Running mass-spring simulator with parameters: rho = %f, k = %f, initial_stretch = %f, n_seg = %d, h = %f, side_len = %f, tol = %f\n", rho, k, initial_stretch, n_seg, h, side_len, tol);
 	InvFreeSimulator<double, 2> simulator(rho, side_len, initial_stretch, k, h, tol, mu, Mu, Lam, n_seg);
 	simulator.run();

simulators/7_self_contact/include/simulator.h

@@ -5,14 +5,14 @@
 #include "square_mesh.h"
 #include <iostream>
 template <typename T, int dim>
-class InvFreeSimulator
+class SelfContactSimulator
 {
 public:
-    InvFreeSimulator();
-    ~InvFreeSimulator();
-    InvFreeSimulator(InvFreeSimulator &&rhs);
-    InvFreeSimulator &operator=(InvFreeSimulator &&rhs);
-    InvFreeSimulator(T rho, T side_len, T initial_stretch, T K, T h, T tol, T mu, T Mu_, T Lam_, int n_seg);
+    SelfContactSimulator();
+    ~SelfContactSimulator();
+    SelfContactSimulator(SelfContactSimulator &&rhs);
+    SelfContactSimulator &operator=(SelfContactSimulator &&rhs);
+    SelfContactSimulator(T rho, T side_len, T initial_stretch, T K, T h, T tol, T mu, T Mu_, T Lam_, int n_seg);
     void run();
 
 private:

simulators/7_self_contact/src/BarrierEnergy.cu

@@ -193,7 +193,8 @@ const DeviceBuffer<T> &BarrierEnergy<T, dim>::grad()
 								}
 							   } })
 		.wait();
-
+							   std::vector<T> host_grad(device_grad.size());
+							   device_grad.copy_to(host_grad);
 	return device_grad;
 }
 

simulators/7_self_contact/src/NeoHookeanEnergy.cu

@@ -125,7 +125,8 @@ const DeviceBuffer<T> &NeoHookeanEnergy<T, dim>::grad()
             }
         } })
         .wait();
-
+	std::vector<T> host_grad(device_grad.size());
+	device_grad.copy_to(host_grad);
     return device_grad;
 }
 

simulators/7_self_contact/src/main.cpp

@@ -6,8 +6,8 @@ int main()
 	double nu = 0.4, E = 1e5;
 	double Mu = E / (2 * (1 + nu)), Lam = E * nu / ((1 + nu) * (1 - 2 * nu));
 	double rho = 1000,
-		   k = 4e4, initial_stretch = 1, n_seg = 2, h = 0.01, side_len = 0.45, tol = 0.01, mu = 0.11;
+		   k = 4e4, initial_stretch = 1, n_seg = 4, h = 0.01, side_len = 0.45, tol = 0.01, mu = 0.4;
 	// printf("Running mass-spring simulator with parameters: rho = %f, k = %f, initial_stretch = %f, n_seg = %d, h = %f, side_len = %f, tol = %f\n", rho, k, initial_stretch, n_seg, h, side_len, tol);
-	InvFreeSimulator<double, 2> simulator(rho, side_len, initial_stretch, k, h, tol, mu, Mu, Lam, n_seg);
+	SelfContactSimulator<double, 2> simulator(rho, side_len, initial_stretch, k, h, tol, mu, Mu, Lam, n_seg);
 	simulator.run();
 }