1

Author: Roushelfy

simulators/1_mass_spring/src/MassSpringEnergy.cu

@@ -154,7 +154,7 @@ SparseMatrix<T> MassSpringEnergy<T, dim>::hess()
 		H_block << H_diff, -H_diff,
 			-H_diff, H_diff;
 
-		make_PSD(H_block, H_local);
+		//make_PSD(H_block, H_local);
 		// add to global matrix
 		for (int ni = 0; ni < 2; ni++)
 			for (int nj = 0; nj < 2; nj++)

simulators/1_mass_spring/src/main.cpp

@@ -2,8 +2,8 @@
 
 int main()
 {
-    float rho = 1000, k = 1e5, initial_stretch = 1.4, n_seg = 4, h = 0.004, side_len = 1, tol = 0.01;
-    // 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);
-    MassSpringSimulator<float, 2> simulator(rho, side_len, initial_stretch, k, h, tol, n_seg);
-    simulator.run();
+	float rho = 1000, k = 1e5, initial_stretch = 1.4, n_seg = 20, h = 0.004, side_len = 2, tol = 0.01;
+	// 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);
+	MassSpringSimulator<float, 2> simulator(rho, side_len, initial_stretch, k, h, tol, n_seg);
+	simulator.run();
 }

simulators/1_mass_spring/src/uti.cu

@@ -76,7 +76,7 @@ template double max_vector<double>(const std::vector<double> &a);
 template <typename T>
 void search_dir(const std::vector<T> &grad, const SparseMatrix<T> &hess, std::vector<T> &dir)
 {
-    LinearSystemContext ctx;
+    static LinearSystemContext ctx;
     auto neg_grad = mult_vector<T>(grad, -1);
     int N = grad.size();
     DeviceDenseVector<T> x_device(N);
@@ -87,7 +87,8 @@ void search_dir(const std::vector<T> &grad, const SparseMatrix<T> &hess, std::ve
     Hess.resize_triplets(hess.get_size());
     Hess.row_indices().copy_from(hess.get_row_buffer().data());
     Hess.col_indices().copy_from(hess.get_col_buffer().data());
-    Hess.values().copy_from(hess.get_val_buffer().data());
+    Hess.values()
+        .copy_from(hess.get_val_buffer().data());
     DeviceCOOMatrix<T> A_coo;
     ctx.convert(Hess, A_coo);
     DeviceCSRMatrix<T> A_csr;