Fixed compilation issues due to make_mass_matrix() in bases_utils.cpp (See issue #73).

datafl4sh · datafl4sh · commit ed130966df35 · 2020-10-15T12:26:59.000+02:00
diff --git a/apps/maxwell/maxwell.cpp b/apps/maxwell/maxwell.cpp
@@ -958,16 +958,16 @@ vector_wave_solver(Mesh<T,2,Storage>& msh, size_t order, const typename Mesh<T,2
         auto esol = disk::static_decondensation(lhs, rhs, edofs);
         Matrix<T, Dynamic, 1> lsol = esol.segment(0, cb.size());
 
-        Matrix<T, Dynamic, Dynamic> MMe = disk::make_mass_matrix(msh, cl, cb, 1);
-        Matrix<T, Dynamic, 1> arhs = disk::make_rhs(msh, cl, cb, sol_fun, 1);
+        Matrix<T, Dynamic, Dynamic> MMe = disk::make_mass_matrix(msh, cl, cb);
+        Matrix<T, Dynamic, 1> arhs = disk::make_rhs(msh, cl, cb, sol_fun);
         Matrix<T, Dynamic, 1> asol = MMe.llt().solve(arhs);
 
         Matrix<T, Dynamic, 1> prj = project_tangent(msh, cl, chdi, sol_fun);
 
         energy_err += (prj-esol).dot(lhs*(prj-esol));
 #else
-        Matrix<T, Dynamic, Dynamic> MMe = disk::make_mass_matrix(msh, cl, cb, 1);
-        Matrix<T, Dynamic, 1> arhs = disk::make_rhs(msh, cl, cb, sol_fun, 1);
+        Matrix<T, Dynamic, Dynamic> MMe = disk::make_mass_matrix(msh, cl, cb);
+        Matrix<T, Dynamic, 1> arhs = disk::make_rhs(msh, cl, cb, sol_fun);
         Matrix<T, Dynamic, 1> asol = MMe.llt().solve(arhs);
         Matrix<T, Dynamic, 1> lsol = sol.segment(cell_i*cb.size(), cb.size());
 #endif
@@ -1121,21 +1121,21 @@ vector_wave_solver(Mesh<T,3,Storage>& msh, size_t order, const typename Mesh<T,3
         auto MM = make_vector_mass_oper(msh, cl, chdi);
         Matrix<T, Dynamic, Dynamic> lhs = CR.second + alpha*ST - (omega*omega)*MM;
         Matrix<T, Dynamic, 1> rhs = Matrix<T, Dynamic, 1>::Zero(lhs.rows());
-        rhs.segment(0, cb.size()) = make_rhs(msh, cl, cb, rhs_fun, 1);
+        rhs.segment(0, cb.size()) = make_rhs(msh, cl, cb, rhs_fun);
         auto edofs = assm.get_element_dofs(msh, cl, sol);
         auto esol = disk::static_decondensation(lhs, rhs, edofs);
         Matrix<T, Dynamic, 1> lsol = esol.segment(0, cb.size());
 
-        Matrix<T, Dynamic, Dynamic> MMe = disk::make_mass_matrix(msh, cl, cb, 1);
-        Matrix<T, Dynamic, 1> arhs = disk::make_rhs(msh, cl, cb, sol_fun, 1);
+        Matrix<T, Dynamic, Dynamic> MMe = disk::make_mass_matrix(msh, cl, cb);
+        Matrix<T, Dynamic, 1> arhs = disk::make_rhs(msh, cl, cb, sol_fun);
         Matrix<T, Dynamic, 1> asol = MMe.llt().solve(arhs);
 
         Matrix<T, Dynamic, 1> prj = project_tangent(msh, cl, chdi, sol_fun);
 
         energy_err += (prj-esol).dot(lhs*(prj-esol));
 #else
-        Matrix<T, Dynamic, Dynamic> MMe = disk::make_mass_matrix(msh, cl, cb, 1);
-        Matrix<T, Dynamic, 1> arhs = disk::make_rhs(msh, cl, cb, sol_fun, 1);
+        Matrix<T, Dynamic, Dynamic> MMe = disk::make_mass_matrix(msh, cl, cb);
+        Matrix<T, Dynamic, 1> arhs = disk::make_rhs(msh, cl, cb, sol_fun);
         Matrix<T, Dynamic, 1> asol = MMe.llt().solve(arhs);
         Matrix<T, Dynamic, 1> lsol = sol.segment(cell_i*cb.size(), cb.size());
 #endif
diff --git a/apps/maxwell/maxwell_sip_dg.cpp b/apps/maxwell/maxwell_sip_dg.cpp
@@ -358,8 +358,8 @@ run_maxwell_solver(Mesh& msh, size_t degree, const typename Mesh::coordinate_typ
     {
         auto cb = make_vector_monomial_basis(msh, cl, degree);
 
-        Matrix<T, Dynamic, Dynamic> MMe = disk::make_mass_matrix(msh, cl, cb, 1);
-        Matrix<T, Dynamic, 1> arhs = disk::make_rhs(msh, cl, cb, sol_fun, 1);
+        Matrix<T, Dynamic, Dynamic> MMe = disk::make_mass_matrix(msh, cl, cb);
+        Matrix<T, Dynamic, 1> arhs = disk::make_rhs(msh, cl, cb, sol_fun);
         Matrix<T, Dynamic, 1> asol = MMe.llt().solve(arhs);
         Matrix<T, Dynamic, 1> lsol = sol.segment(cell_i*cb.size(), cb.size());
 
diff --git a/apps/tests/curl_reconstruction.cpp b/apps/tests/curl_reconstruction.cpp
@@ -127,12 +127,12 @@ struct test_functor_curl_reconstruction<Mesh<T,3,Storage>, mixed>
         for (auto& cl : msh)
         {
             auto CR = disk::curl_reconstruction(msh, cl, hdi);
-            auto proj = disk::project_tangent(msh, cl, hdi, f,3);
+            auto proj = disk::project_tangent(msh, cl, hdi, f);
             Matrix<T, Dynamic, 1> rf = CR.first * proj;
             auto rb = disk::make_vector_monomial_basis(msh, cl, rd);
 
-            Matrix<T, Dynamic, Dynamic> mass         = disk::make_mass_matrix(msh, cl, rb,3);
-            Matrix<T, Dynamic, 1>       rhs          = disk::make_rhs(msh, cl, rb, f,3);
+            Matrix<T, Dynamic, Dynamic> mass         = disk::make_mass_matrix(msh, cl, rb);
+            Matrix<T, Dynamic, 1>       rhs          = disk::make_rhs(msh, cl, rb, f);
             Matrix<T, Dynamic, 1>       exp_reconstr = mass.ldlt().solve(rhs);
             Matrix<T, Dynamic, 1>       diff = exp_reconstr;
             diff.head(3) = exp_reconstr.head(3);
diff --git a/apps/tests/curl_reconstruction_pk.cpp b/apps/tests/curl_reconstruction_pk.cpp
@@ -80,12 +80,12 @@ struct test_functor_curl_reconstruction<Mesh<T,3,Storage>, mixed>
         for (auto& cl : msh)
         {
             auto CR = disk::make_vector_hho_curl_impl_pk(msh, cl, hdi);
-            auto proj = disk::project_tangent(msh, cl, hdi, f, 2);
+            auto proj = disk::project_tangent(msh, cl, hdi, f);
             Matrix<T, Dynamic, 1> rf = CR.first * proj;
             auto rb = disk::make_vector_monomial_basis(msh, cl, rd);
 
-            Matrix<T, Dynamic, Dynamic> mass         = disk::make_mass_matrix(msh, cl, rb, 2);
-            Matrix<T, Dynamic, 1>       rhs          = disk::make_rhs(msh, cl, rb, sol, 2);
+            Matrix<T, Dynamic, Dynamic> mass         = disk::make_mass_matrix(msh, cl, rb);
+            Matrix<T, Dynamic, 1>       rhs          = disk::make_rhs(msh, cl, rb, sol);
             Matrix<T, Dynamic, 1>       exp_reconstr = mass.ldlt().solve(rhs);
             Matrix<T, Dynamic, 1>       diff = exp_reconstr - rf;
         
diff --git a/apps/tests/curl_stabilization.cpp b/apps/tests/curl_stabilization.cpp
@@ -65,7 +65,7 @@ struct test_functor_curl_stab<Mesh<T,2,Storage>, mixed>
         {
             auto stab = disk::curl_hdg_stabilization(msh, cl, hdi);
 
-            Matrix<scalar_type, Dynamic, 1> proj = disk::project_tangent(msh, cl, hdi, f, 2);
+            Matrix<scalar_type, Dynamic, 1> proj = disk::project_tangent(msh, cl, hdi, f);
 
             error += proj.dot(stab * proj);
         }
@@ -110,7 +110,7 @@ struct test_functor_curl_stab<Mesh<T,3,Storage>, mixed>
         {
             auto stab = disk::curl_hdg_stabilization(msh, cl, hdi);
 
-            Matrix<scalar_type, Dynamic, 1> proj = disk::project_tangent(msh, cl, hdi, f, 2);
+            Matrix<scalar_type, Dynamic, 1> proj = disk::project_tangent(msh, cl, hdi, f);
 
             error += proj.dot(stab * proj);
         }
diff --git a/core/bases/bases_utils.hpp b/core/bases/bases_utils.hpp
@@ -220,8 +220,10 @@ make_mass_matrix(const Mesh& msh, const Element& elem, const Basis& basis, size_
     return ret;
 }
 
-/*
+/* We have a problem here: this definition could be ambiguous with the previous
+ * one. */
 template<typename Mesh, typename Element, typename Basis, typename MaterialField>
+[[deprecated("DiSk++ issue: this declaration is ambiguous, fix is needed")]]
 Matrix<typename Basis::scalar_type, Dynamic, Dynamic>
 make_mass_matrix(const Mesh& msh, const Element& elem, const Basis& basis, const MaterialField& material_tensor, size_t di = 0)
 {
@@ -245,7 +247,6 @@ make_mass_matrix(const Mesh& msh, const Element& elem, const Basis& basis, const
     return ret;
 }
 
-*/
 template<typename Mesh, typename Element, typename Basis>
 Matrix<typename Basis::scalar_type, Dynamic, Dynamic>
 make_stiffness_matrix(const Mesh& msh, const Element& elem, const Basis& basis)

Original file line number	Diff line number	Diff line change
`@@ -358,8 +358,8 @@ run_maxwell_solver(Mesh& msh, size_t degree, const typename Mesh::coordinate_typ`
`358`	`358`	`{`
`359`	`359`	`auto cb = make_vector_monomial_basis(msh, cl, degree);`
`360`	`360`
`361`		`- Matrix<T, Dynamic, Dynamic> MMe = disk::make_mass_matrix(msh, cl, cb, 1);`
`362`		`- Matrix<T, Dynamic, 1> arhs = disk::make_rhs(msh, cl, cb, sol_fun, 1);`
	`361`	`+ Matrix<T, Dynamic, Dynamic> MMe = disk::make_mass_matrix(msh, cl, cb);`
	`362`	`+ Matrix<T, Dynamic, 1> arhs = disk::make_rhs(msh, cl, cb, sol_fun);`
`363`	`363`	`Matrix<T, Dynamic, 1> asol = MMe.llt().solve(arhs);`
`364`	`364`	`Matrix<T, Dynamic, 1> lsol = sol.segment(cell_i*cb.size(), cb.size());`
`365`	`365`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ struct test_functor_curl_stab<Mesh<T,2,Storage>, mixed>`
`65`	`65`	`{`
`66`	`66`	`auto stab = disk::curl_hdg_stabilization(msh, cl, hdi);`
`67`	`67`
`68`		`- Matrix<scalar_type, Dynamic, 1> proj = disk::project_tangent(msh, cl, hdi, f, 2);`
	`68`	`+ Matrix<scalar_type, Dynamic, 1> proj = disk::project_tangent(msh, cl, hdi, f);`
`69`	`69`
`70`	`70`	`error += proj.dot(stab * proj);`
`71`	`71`	`}`
`@@ -110,7 +110,7 @@ struct test_functor_curl_stab<Mesh<T,3,Storage>, mixed>`
`110`	`110`	`{`
`111`	`111`	`auto stab = disk::curl_hdg_stabilization(msh, cl, hdi);`
`112`	`112`
`113`		`- Matrix<scalar_type, Dynamic, 1> proj = disk::project_tangent(msh, cl, hdi, f, 2);`
	`113`	`+ Matrix<scalar_type, Dynamic, 1> proj = disk::project_tangent(msh, cl, hdi, f);`
`114`	`114`
`115`	`115`	`error += proj.dot(stab * proj);`
`116`	`116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -220,8 +220,10 @@ make_mass_matrix(const Mesh& msh, const Element& elem, const Basis& basis, size_`
`220`	`220`	`return ret;`
`221`	`221`	`}`
`222`	`222`
`223`		`-/*`
	`223`	`+/* We have a problem here: this definition could be ambiguous with the previous`
	`224`	`+ * one. */`
`224`	`225`	`template<typename Mesh, typename Element, typename Basis, typename MaterialField>`
	`226`	`+[[deprecated("DiSk++ issue: this declaration is ambiguous, fix is needed")]]`
`225`	`227`	`Matrix<typename Basis::scalar_type, Dynamic, Dynamic>`
`226`	`228`	`make_mass_matrix(const Mesh& msh, const Element& elem, const Basis& basis, const MaterialField& material_tensor, size_t di = 0)`
`227`	`229`	`{`
`@@ -245,7 +247,6 @@ make_mass_matrix(const Mesh& msh, const Element& elem, const Basis& basis, const`
`245`	`247`	`return ret;`
`246`	`248`	`}`
`247`	`249`
`248`		`-*/`
`249`	`250`	`template<typename Mesh, typename Element, typename Basis>`
`250`	`251`	`Matrix<typename Basis::scalar_type, Dynamic, Dynamic>`
`251`	`252`	`make_stiffness_matrix(const Mesh& msh, const Element& elem, const Basis& basis)`