Skip to content

Commit

Permalink
Fix scalar stabilization compilation problem. Issue wareHHOuse#101.
Browse files Browse the repository at this point in the history
  • Loading branch information
@karolCascavita
karolCascavita committed Apr 13, 2023
1 parent 2536980 commit d3d3013
Showing 1 changed file with 31 additions and 30 deletions.
61 changes: 31 additions & 30 deletions libdiskpp/include/diskpp/methods/implementation_hho/scalar_stabilization.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -515,11 +515,11 @@ make_scalar_dg_stabilization(const Mesh& msh,
*/
template<typename Mesh>
dynamic_matrix<typename Mesh::coordinate_type>
make_scalar_hho_stabilization(const Mesh& msh,
const typename Mesh::cell_type& cl,
const dynamic_matrix<typename Mesh::coordinate_type>& reconstruction,
const CellDegreeInfo<Mesh>& cell_infos,
bool hF = true)
make_scalar_hho_stabilization(const Mesh& msh,
const typename Mesh::cell_type& cl,
const dynamic_matrix<typename Mesh::coordinate_type>& reconstruction,
const CellDegreeInfo<Mesh>& cell_infos,
bool hF = true)
{
using T = typename Mesh::coordinate_type;
typedef Matrix<T, Dynamic, Dynamic> matrix_type;
Expand Down Expand Up @@ -625,11 +625,11 @@ make_scalar_hho_stabilization(const Mesh&
*/
template<typename Mesh>
dynamic_matrix<typename Mesh::coordinate_type>
make_scalar_hho_stabilization(const Mesh& msh,
const typename Mesh::cell_type& cl,
const dynamic_matrix<typename Mesh::coordinate_type>& reconstruction,
const MeshDegreeInfo<Mesh>& msh_infos,
bool hF = true)
make_scalar_hho_stabilization(const Mesh& msh,
const typename Mesh::cell_type& cl,
const dynamic_matrix<typename Mesh::coordinate_type>& reconstruction,
const MeshDegreeInfo<Mesh>& msh_infos,
bool hF = true)
{
return make_scalar_hho_stabilization(msh, cl, reconstruction, msh_infos.cellDegreeInfo(msh, cl), hF);
}
Expand All @@ -649,11 +649,11 @@ make_scalar_hho_stabilization(const Mesh&
*/
template<typename Mesh, typename ScalarReconstructionBasis>
dynamic_matrix<typename Mesh::coordinate_type>
make_scalar_hho_stabilization(const Mesh& msh,
const typename Mesh::cell_type& cl,
const ScalarReconstructionBasis& rb,
const dynamic_matrix<typename Mesh::coordinate_type>& reconstruction,
const hho_degree_info& hdi)
make_scalar_hho_stabilization(const Mesh& msh,
const typename Mesh::cell_type& cl,
const ScalarReconstructionBasis& rb,
const dynamic_matrix<typename Mesh::coordinate_type>& reconstruction,
const hho_degree_info& hdi)
{
using T = typename Mesh::coordinate_type;
typedef Matrix<T, Dynamic, Dynamic> matrix_type;
Expand Down Expand Up @@ -682,7 +682,7 @@ make_scalar_hho_stabilization(const Mesh&
auto test = cb.eval_functions( qp.point() );
M2 += qp.weight() * test * trial.transpose();
}

matrix_type proj1 = -M1.ldlt().solve(M2 * reconstruction);

assert(M2.cols() == reconstruction.rows());
Expand Down Expand Up @@ -744,10 +744,11 @@ make_scalar_hho_stabilization(const Mesh&

template<typename Mesh>
dynamic_matrix<typename Mesh::coordinate_type>
make_scalar_hho_stabilization(const Mesh& msh,
const typename Mesh::cell_type& cl,
const dynamic_matrix<typename Mesh::coordinate_type>& reconstruction,
const hho_degree_info& hdi)
make_scalar_hho_stabilization(const Mesh& msh,
const typename Mesh::cell_type& cl,
const dynamic_matrix<typename Mesh::coordinate_type>& reconstruction,
const hho_degree_info& hdi,
bool x = false)
{
auto rb = make_scalar_monomial_basis(msh, cl, hdi.reconstruction_degree());
return make_scalar_hho_stabilization(msh, cl, rb, reconstruction, hdi);
Expand All @@ -768,11 +769,11 @@ make_scalar_hho_stabilization(const Mesh&
*/
template<typename Mesh>
dynamic_matrix<typename Mesh::coordinate_type>
make_scalar_hho_stabilization_fluxes(const Mesh& msh,
const typename Mesh::cell_type& cl,
const dynamic_matrix<typename Mesh::coordinate_type>& reconstruction,
const CellDegreeInfo<Mesh>& cell_infos,
bool hF = true)
make_scalar_hho_stabilization_fluxes(const Mesh& msh,
const typename Mesh::cell_type& cl,
const dynamic_matrix<typename Mesh::coordinate_type>& reconstruction,
const CellDegreeInfo<Mesh>& cell_infos,
bool hF = true)
{
using T = typename Mesh::coordinate_type;
typedef Matrix<T, Dynamic, Dynamic> matrix_type;
Expand Down Expand Up @@ -853,11 +854,11 @@ make_scalar_hho_stabilization_fluxes(const Mesh&
*/
template<typename Mesh>
dynamic_matrix<typename Mesh::coordinate_type>
make_scalar_hho_stabilization_fluxes(const Mesh& msh,
const typename Mesh::cell_type& cl,
const dynamic_matrix<typename Mesh::coordinate_type>& reconstruction,
const hho_degree_info& di,
bool hF = true)
make_scalar_hho_stabilization_fluxes(const Mesh& msh,
const typename Mesh::cell_type& cl,
const dynamic_matrix<typename Mesh::coordinate_type>& reconstruction,
const hho_degree_info& di,
bool hF = true)
{
const CellDegreeInfo<Mesh> cell_infos(msh, cl, di.cell_degree(), di.face_degree(), di.grad_degree());

Expand Down

0 comments on commit d3d3013

Please sign in to comment.