removed overloading and updated polyfem

teseoch · teseoch · commit cd7e7dded8bb · 2019-02-26T11:26:39.000-05:00
diff --git a/cmake/PolyfemPythonDownloadExternal.cmake b/cmake/PolyfemPythonDownloadExternal.cmake
@@ -27,7 +27,7 @@ endfunction()
 function(polyfem_python_download_polyfem)
     polyfem_python_download_project(polyfem
         GIT_REPOSITORY https://github.com/polyfem/polyfem.git
-        GIT_TAG         c679ec3b52e8be63d4e092fd2f315432045a73f5
+        GIT_TAG         263ce74e59a0a207d2e42ac5fe6fdb5cbd947597
     )
 endfunction()
 
diff --git a/src/binding.cpp b/src/binding.cpp
@@ -82,20 +82,20 @@ PYBIND11_MODULE(polyfempy, m) {
 	"sets polyfem log level, valid value between 0 (all logs) and 6 (no logs)",
 	py::arg("log_level"))
 
-	.def("load_mesh", [](polyfem::State &s) {
+	.def("load_mesh_from_settings", [](polyfem::State &s) {
 		init_globals();
 		s.load_mesh();
 	},
 	"Loads a mesh from the 'mesh' field of the json and 'bc_tag' if any bc tags")
 
-	.def("load_mesh", [](polyfem::State &s, const std::string &path) {
+	.def("load_mesh_from_path", [](polyfem::State &s, const std::string &path) {
 		init_globals();
 		s.args["mesh"] = path;
 		s.load_mesh();
 	},
 	"Loads a mesh from the path and 'bc_tag' from the json if any bc tags",
 	py::arg("path"))
-	.def("load_mesh", [](polyfem::State &s, const std::string &path, const std::string &bc_tag) {
+	.def("load_mesh_from_path_and_tags", [](polyfem::State &s, const std::string &path, const std::string &bc_tag) {
 		init_globals();
 		s.args["mesh"] = path;
 		s.args["bc_tag"] = bc_tag;
@@ -106,17 +106,13 @@ PYBIND11_MODULE(polyfempy, m) {
 	.def("set_mesh", [](polyfem::State &s, const Eigen::MatrixXd &V, const Eigen::MatrixXi &F) {
 		init_globals();
 
-		GEO::Mesh M;
 		if(V.cols() == 2)
-			polyfem::to_geogram_mesh(V, F, M);
+			s.mesh = std::make_unique<polyfem::Mesh2D>();
 		else
-			polyfem::to_geogram_mesh_3d(V, F, M);
-		s.load_mesh(M, [](const polyfem::RowVectorNd&){ return -1; }, true);
+			s.mesh = std::make_unique<polyfem::Mesh3D>();
+		s.mesh->build_from_matrices(V, F);
 
-		double boundary_id_threshold = s.args["boundary_id_threshold"];
-		if(boundary_id_threshold <= 0)
-			boundary_id_threshold = s.mesh->is_volume() ? 1e-2 : 1e-7;
-		s.mesh->compute_boundary_ids(boundary_id_threshold);
+		s.load_mesh();
 	},
 	"Loads a mesh from vertices and connectivity",
 	py::arg("vertices"), py::arg("connectivity"))
@@ -142,7 +138,7 @@ PYBIND11_MODULE(polyfempy, m) {
 	py::arg("boundary_marker"))
 
 
-	.def("set_rhs", [](polyfem::State &s, std::string &path) {
+	.def("set_rhs_from_path", [](polyfem::State &s, std::string &path) {
 		init_globals();
 		s.args["rhs_path"] = path;
 	},
diff --git a/tests/bending.py b/tests/bending.py
@@ -34,7 +34,7 @@ def test_run(self):
         solver = pf.Solver()
 
         solver.settings(str(settings))
-        solver.load_mesh(mesh_path, tag_path)
+        solver.load_mesh_from_path_and_tags(mesh_path, tag_path)
 
         solver.solve()
 
diff --git a/tests/gravity.py b/tests/gravity.py
@@ -2,7 +2,7 @@
 
 import numpy as np
 import polyfempy as pf
-from utils import plot
+from .utils import plot
 
 
 class Gravity(unittest.TestCase):
diff --git a/tests/inflation.py b/tests/inflation.py
@@ -31,7 +31,7 @@ def test_run(self):
 
 
 		solver.settings(str(settings))
-		solver.load_mesh(mesh_path)
+		solver.load_mesh_from_path(mesh_path)
 
 		solver.solve()
 		sol = solver.get_solution()
@@ -46,7 +46,7 @@ def test_run(self):
 
 		#reload the parameters and mesh
 		solver.settings(settings.serialize())
-		solver.load_mesh(mesh_path)
+		solver.load_mesh_from_path(mesh_path)
 
 		#set the rhs as prev sol
 		solver.set_rhs(sol)
diff --git a/tests/plane_hole.py b/tests/plane_hole.py
@@ -34,7 +34,7 @@ def test_run(self):
         solver = pf.Solver()
 
         solver.settings(str(settings))
-        solver.load_mesh(mesh_path)
+        solver.load_mesh_from_path(mesh_path)
 
         solver.solve()
 
diff --git a/tests/torsion.py b/tests/torsion.py
@@ -39,7 +39,7 @@ def test_run(self):
 
 
         solver.settings(str(settings))
-        solver.load_mesh(mesh_path)
+        solver.load_mesh_from_path(mesh_path)
 
         solver.solve()
 

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ endfunction()`
`27`	`27`	`function(polyfem_python_download_polyfem)`
`28`	`28`	`polyfem_python_download_project(polyfem`
`29`	`29`	`GIT_REPOSITORY https://github.com/polyfem/polyfem.git`
`30`		`- GIT_TAG c679ec3b52e8be63d4e092fd2f315432045a73f5`
	`30`	`+ GIT_TAG 263ce74e59a0a207d2e42ac5fe6fdb5cbd947597`
`31`	`31`	`)`
`32`	`32`	`endfunction()`
`33`	`33`