5,run

Author: Roushelfy

simulators/5_mov_dirichlet/src/SpringEnergy.cu

@@ -83,12 +83,12 @@ T SpringEnergy<T, dim>::val()
                            {
 
             int idx = device_DBC(i);
-            Eigen::Matrix<T, dim, 1> diff;
+            T d = 0;
             for (int j = 0; j < dim; ++j)
             {
-                diff(j) = device_x(idx * dim + j) - device_DBC_target(i*dim + j);
+                d += (device_x(idx * dim + j) - device_DBC_target(i * dim + j)) * (device_x(idx * dim + j) - device_DBC_target(i * dim + j));
             }
-            device_val(i) = 0.5 * k * device_m(idx) * diff.dot(diff); })
+            device_val(i) = 0.5 * k *d; })
         .wait();
 
     return devicesum(device_val);
@@ -110,15 +110,10 @@ const DeviceBuffer<T> &SpringEnergy<T, dim>::grad()
                            {
 
             int idx = device_DBC(i);
-            Eigen::Matrix<T, dim, 1> grad;
             for (int j = 0; j < dim; ++j)
             {
-                grad(j) = device_x(idx * dim + j) - device_DBC_target(i*dim + j);
-            }
-            grad *= k * device_m(idx);
-            for (int j = 0; j < dim; ++j)
-            {
-                device_grad(idx * dim + j) = grad(j);
+                device_grad(idx * dim + j) = (device_x(idx * dim + j) - device_DBC_target(i * dim + j))* k * device_m(idx);
+                printf("grad[%d] = %f\n", idx * dim + j, device_grad(idx * dim + j));
             } })
         .wait();
 

simulators/5_mov_dirichlet/src/simulator.cu

@@ -67,7 +67,7 @@ MovDirichletSimulator<T, dim>::Impl::Impl(T rho, T side_len, T initial_stretch,
     DBC_limit.push_back(0);
     DBC_limit.push_back(-0.6);
     DBC_v.push_back(0);
-    DBC_v.push_back(-0.5);
+    DBC_v.push_back(-1);
     DBC_stiff = 10;
     x.push_back(0);
     x.push_back(side_len * 0.6);
@@ -256,7 +256,7 @@ void MovDirichletSimulator<T, dim>::Impl::draw()
     }
 
     // Draw masses as circles
-    for (int i = 0; i < (x.size() - 1) / dim; ++i)
+    for (int i = 0; i < (x.size()) / dim; ++i)
     {
         sf::CircleShape circle(radius); // Set a fixed radius for each mass
         circle.setFillColor(sf::Color::Red);
@@ -276,7 +276,17 @@ T MovDirichletSimulator<T, dim>::Impl::IP_val()
 template <typename T, int dim>
 DeviceBuffer<T> MovDirichletSimulator<T, dim>::Impl::IP_grad()
 {
-    return add_vector<T>(add_vector<T>(add_vector<T>(add_vector<T>(add_vector<T>(inertialenergy.grad(), massspringenergy.grad(), 1.0, h * h), gravityenergy.grad(), 1.0, h * h), barrierenergy.grad(), 1.0, h * h), frictionenergy.grad(), 1.0, h * h), springenergy.grad(), 1.0, 1.0);
+    return add_vector<T>(add_vector<T>(add_vector<T>(add_vector<T>(add_vector<T>(inertialenergy.grad(),
+                                                                                 massspringenergy.grad(), 1.0, h * h),
+                                                                   gravityenergy.grad(), 1.0, h * h),
+                                                     barrierenergy.grad(), 1.0, h * h),
+                                       frictionenergy.grad(), 1.0, h * h),
+                         springenergy.grad(), 1.0, 1.0);
+    // return add_vector<T>(add_vector<T>(add_vector<T>(add_vector<T>(inertialenergy.grad(),
+    //                                                                massspringenergy.grad(), 1.0, h * h),
+    //                                                  gravityenergy.grad(), 1.0, h * h),
+    //                                    barrierenergy.grad(), 1.0, h * h),
+    //                      frictionenergy.grad(), 1.0, h * h);
 }
 
 template <typename T, int dim>