Commit d457b300 authored by GILLES Sebastien's avatar GILLES Sebastien

#1232 Movemesh helper: fix a clang release warning (and modify slightly...

#1232 Movemesh helper: fix a clang release warning (and modify slightly prototype to remove one additional parameter in release mode).
parent ac9a42d0
......@@ -31,21 +31,17 @@ namespace MoReFEM
{
void MovemeshHelper::ConstructHelper(const GodOfDof& god_of_dof,
const NodeBearer::vector_shared_ptr& node_bearer_list,
void MovemeshHelper::ConstructHelper(const NodeBearer::vector_shared_ptr& node_bearer_list,
const ExtendedUnknown& extended_unknown
# ifndef NDEBUG
, const GeometricMeshRegion& mesh
, const Dof::vector_shared_ptr& felt_space_dof_list
# endif // NDEBUG
)
{
#ifndef NDEBUG
const auto& mesh = god_of_dof.GetGeometricMeshRegion();
const auto Ncoords = this->Ncoords();
assert(Ncoords == static_cast<std::size_t>(mesh.NprocessorWiseCoord() + mesh.NghostCoord()));
const auto dimension = static_cast<std::size_t>(mesh.GetDimension());
#endif // NDEBUG
const auto& unknown = extended_unknown.GetUnknown();
......@@ -105,7 +101,7 @@ namespace MoReFEM
if (new_entry.empty())
continue;
assert(new_entry.size() == dimension);
assert(new_entry.size() == static_cast<std::size_t>(mesh.GetDimension()));
dof_index_list_per_coord_[coords_index] = std::move(new_entry);
initial_position_per_coord_[coords_index] = coords.GetCoordinateList();
}
......@@ -131,18 +127,18 @@ namespace MoReFEM
dof_index_list_per_coord_.resize(static_cast<std::size_t>(Ncoords));
initial_position_per_coord_.resize(static_cast<std::size_t>(Ncoords));
ConstructHelper(god_of_dof,
god_of_dof.GetProcessorWiseNodeBearerList(),
ConstructHelper(god_of_dof.GetProcessorWiseNodeBearerList(),
extended_unknown
# ifndef NDEBUG
, mesh
, felt_space_processor_wise_dof_list
#endif // NDEBUG
);
ConstructHelper(god_of_dof,
god_of_dof.GetGhostNodeBearerList(),
ConstructHelper(god_of_dof.GetGhostNodeBearerList(),
extended_unknown
# ifndef NDEBUG
, mesh
, felt_space_ghosted_dof_list
#endif // NDEBUG
);
......
......@@ -162,7 +162,6 @@ namespace MoReFEM
* Constructor does basically the same work for two cases: processor-wise \a Coords and ghosted ones;
* current method is the way to respect the DRY principle.
*
* \param[in] god_of_dof God of dof to which the finite element space that calls current class belongs to.
* \param[in] node_bearer_list \a NodeBearer list to consider (either processor-wise or ghosted ones).
* \param[in] extended_unknown Encompass the pair unknown/Numbering subset upon which the displacement
* vector is defined.
......@@ -170,16 +169,16 @@ namespace MoReFEM
* [DEBUG ONLY] \param[in] felt_space_dof_list List of dof list present
* in the finite element space to consider, used only for a consistency check. It might be either
* the processor-wise one or the ghosted ones.
* [DEBUG ONLY] \param[in] mesh Mesh considered.
*/
void ConstructHelper(const GodOfDof& god_of_dof,
const NodeBearer::vector_shared_ptr& node_bearer_list,
void ConstructHelper(const NodeBearer::vector_shared_ptr& node_bearer_list,
const ExtendedUnknown& extended_unknown
# ifndef NDEBUG
, const GeometricMeshRegion& mesh
, const Dof::vector_shared_ptr& felt_space_dof_list
# endif // NDEBUG
);
/*!
* \brief An helper method of \a Movemesh method which move all the \a Coords of a given list.
*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment