Commit cb9fc80f authored by GILLES Sebastien's avatar GILLES Sebastien
Browse files

#531 Drop the 531 suffix in the methods that replace the former ones (as the...

#531 Drop the 531 suffix in the methods that replace the former ones (as the former have been removed).
parent f52df387
......@@ -236,8 +236,8 @@ namespace HappyHeart
// const Domain& domain, Args&&... args) const;
template<class LinearAlgebraTupleT, typename... Args>
void Assemble531(LinearAlgebraTupleT&& linear_algebra_tuple,
const Domain& domain, Args&&... args) const;
void AssembleImpl(LinearAlgebraTupleT&& linear_algebra_tuple,
const Domain& domain, Args&&... args) const;
///@}
......@@ -335,12 +335,12 @@ namespace HappyHeart
template<typename... Args>
void PerformElementaryCalculation531(const LocalFEltSpace& local_felt_space,
void PerformElementaryCalculation(const LocalFEltSpace& local_felt_space,
LocalVariationalOperatorT& local_operator,
std::tuple<Args...>&& args) const;
void PerformElementaryCalculation531(const LocalFEltSpace& local_felt_space,
void PerformElementaryCalculation(const LocalFEltSpace& local_felt_space,
LocalVariationalOperatorT& local_operator,
std::tuple<>&& ) const;
......
......@@ -134,7 +134,7 @@ namespace HappyHeart
>
template<class LinearAlgebraTupleT, typename... Args>
void GlobalVariationalOperator<DerivedT, LocalVariationalOperatorT>
::Assemble531(LinearAlgebraTupleT&& linear_algebra_tuple,
::AssembleImpl(LinearAlgebraTupleT&& linear_algebra_tuple,
const Domain& domain,
Args&&... args) const
{
......@@ -162,15 +162,15 @@ namespace HappyHeart
auto& local_felt_space = *local_felt_space_ptr;
local_operator.SetLocalFEltSpace(local_felt_space);
PerformElementaryCalculation531(local_felt_space,
PerformElementaryCalculation(local_felt_space,
local_operator,
std::forward_as_tuple(args...));
Private::InjectInGlobalLinearAlgebra531(linear_algebra_tuple, local_felt_space, local_operator);
Private::InjectInGlobalLinearAlgebra(linear_algebra_tuple, local_felt_space, local_operator);
}
}
Private::Assembly531(linear_algebra_tuple);
Private::Assembly(linear_algebra_tuple);
}
......@@ -213,7 +213,7 @@ namespace HappyHeart
template<typename... Args>
void
GlobalVariationalOperator<DerivedT, LocalVariationalOperatorT>
::PerformElementaryCalculation531(const LocalFEltSpace& local_felt_space,
::PerformElementaryCalculation(const LocalFEltSpace& local_felt_space,
LocalVariationalOperatorT& local_operator,
std::tuple<Args...>&& additional_arguments) const
{
......@@ -240,7 +240,7 @@ namespace HappyHeart
>
void
GlobalVariationalOperator<DerivedT, LocalVariationalOperatorT>
::PerformElementaryCalculation531(const LocalFEltSpace& local_felt_space,
::PerformElementaryCalculation(const LocalFEltSpace& local_felt_space,
LocalVariationalOperatorT& local_operator,
std::tuple<>&& ) const
{
......
......@@ -40,10 +40,10 @@ namespace HappyHeart
, "Tuple is expected to include only one of those types.");
static void Assembly531(const LinearAlgebraTupleT& linear_algebra_tuple);
static void Assembly(const LinearAlgebraTupleT& linear_algebra_tuple);
template<class LocalVariationalOperatorT>
static void InjectInGlobalLinearAlgebra531(const LinearAlgebraTupleT& linear_algebra_tuple,
static void InjectInGlobalLinearAlgebra(const LinearAlgebraTupleT& linear_algebra_tuple,
const LocalFEltSpace& local_felt_space,
LocalVariationalOperatorT& local_variational_operator);
......@@ -51,16 +51,15 @@ namespace HappyHeart
// PREVIOUS COEFFICIENT ASSUME WRONGLY PREVIOUS ELT WAS SAME TYPE (MATRIX OR VECTOR!) \todo #531
template<class LocalVariationalOperatorT>
static void InjectInGlobalLinearAlgebraImpl531(const LocalFEltSpace& local_felt_space,
static void InjectInGlobalLinearAlgebraImpl(const LocalFEltSpace& local_felt_space,
LocalVariationalOperatorT& local_variational_operator,
const GlobalMatrixWithCoefficient& global_matrix,
double previous_coefficient);
template<class LocalVariationalOperatorT>
static void InjectInGlobalLinearAlgebraImpl531(const LocalFEltSpace& local_felt_space,
static void InjectInGlobalLinearAlgebraImpl(const LocalFEltSpace& local_felt_space,
LocalVariationalOperatorT& local_variational_operator,
const GlobalVectorWithCoefficient& global_vector,
double previous_coefficient);
......@@ -81,10 +80,10 @@ namespace HappyHeart
{
static void Assembly531(const LinearAlgebraTupleT& linear_algebra_tuple);
static void Assembly(const LinearAlgebraTupleT& linear_algebra_tuple);
template<class LocalVariationalOperatorT>
static void InjectInGlobalLinearAlgebra531(const LinearAlgebraTupleT& linear_algebra_tuple,
static void InjectInGlobalLinearAlgebra(const LinearAlgebraTupleT& linear_algebra_tuple,
const LocalFEltSpace& local_felt_space,
LocalVariationalOperatorT& local_variational_operator);
......
......@@ -24,14 +24,14 @@ namespace HappyHeart
template<class LinearAlgebraTupleT, std::size_t I, std::size_t TupleSizeT>
void Recursivity<LinearAlgebraTupleT, I, TupleSizeT>
::Assembly531(const LinearAlgebraTupleT& linear_algebra_tuple)
::Assembly(const LinearAlgebraTupleT& linear_algebra_tuple)
{
static_assert(I < TupleSizeT, "Otherwise endless recursion!");
auto& current_linear_algebra = std::get<I>(linear_algebra_tuple).first;
current_linear_algebra.Assembly(__FILE__, __LINE__);
Recursivity<LinearAlgebraTupleT, I + 1, TupleSizeT>::Assembly531(linear_algebra_tuple);
Recursivity<LinearAlgebraTupleT, I + 1, TupleSizeT>::Assembly(linear_algebra_tuple);
}
......@@ -39,7 +39,7 @@ namespace HappyHeart
template<class LinearAlgebraTupleT, std::size_t I, std::size_t TupleSizeT>
template<class LocalVariationalOperatorT>
void Recursivity<LinearAlgebraTupleT, I, TupleSizeT>
::InjectInGlobalLinearAlgebra531(const LinearAlgebraTupleT& linear_algebra_tuple,
::InjectInGlobalLinearAlgebra(const LinearAlgebraTupleT& linear_algebra_tuple,
const LocalFEltSpace& local_felt_space,
LocalVariationalOperatorT& local_variational_operator)
{
......@@ -61,13 +61,13 @@ namespace HappyHeart
const auto& global_linear_algebra = std::get<I>(linear_algebra_tuple);
InjectInGlobalLinearAlgebraImpl531(local_felt_space,
InjectInGlobalLinearAlgebraImpl(local_felt_space,
local_variational_operator,
global_linear_algebra,
previous_coefficient);
Recursivity<LinearAlgebraTupleT, I + 1, TupleSizeT>::InjectInGlobalLinearAlgebra531(linear_algebra_tuple,
Recursivity<LinearAlgebraTupleT, I + 1, TupleSizeT>::InjectInGlobalLinearAlgebra(linear_algebra_tuple,
local_felt_space,
local_variational_operator);
}
......@@ -76,7 +76,7 @@ namespace HappyHeart
template<class LinearAlgebraTupleT, std::size_t I, std::size_t TupleSizeT>
template<class LocalVariationalOperatorT>
void Recursivity<LinearAlgebraTupleT, I, TupleSizeT>
::InjectInGlobalLinearAlgebraImpl531(const LocalFEltSpace& local_felt_space,
::InjectInGlobalLinearAlgebraImpl(const LocalFEltSpace& local_felt_space,
LocalVariationalOperatorT& local_variational_operator,
const GlobalMatrixWithCoefficient& global_matrix_with_coefficient,
const double previous_coefficient)
......@@ -228,7 +228,7 @@ namespace HappyHeart
template<class LinearAlgebraTupleT, std::size_t I, std::size_t TupleSizeT>
template<class LocalVariationalOperatorT>
void Recursivity<LinearAlgebraTupleT, I, TupleSizeT>
::InjectInGlobalLinearAlgebraImpl531(const LocalFEltSpace& local_felt_space,
::InjectInGlobalLinearAlgebraImpl(const LocalFEltSpace& local_felt_space,
LocalVariationalOperatorT& local_variational_operator,
const GlobalVectorWithCoefficient& global_vector_with_coefficient,
const double previous_coefficient)
......@@ -269,7 +269,7 @@ namespace HappyHeart
template<class LinearAlgebraTupleT, std::size_t TupleSizeT>
void Recursivity<LinearAlgebraTupleT, TupleSizeT, TupleSizeT>
::Assembly531(const LinearAlgebraTupleT& linear_algebra_tuple)
::Assembly(const LinearAlgebraTupleT& linear_algebra_tuple)
{
// End recursion.
static_cast<void>(linear_algebra_tuple);
......@@ -279,7 +279,7 @@ namespace HappyHeart
template<class LinearAlgebraTupleT, std::size_t TupleSizeT>
template<class LocalVariationalOperatorT>
void Recursivity<LinearAlgebraTupleT, TupleSizeT, TupleSizeT>
::InjectInGlobalLinearAlgebra531(const LinearAlgebraTupleT& linear_algebra_tuple,
::InjectInGlobalLinearAlgebra(const LinearAlgebraTupleT& linear_algebra_tuple,
const LocalFEltSpace& local_felt_space,
LocalVariationalOperatorT& local_variational_operator)
{
......
......@@ -23,12 +23,12 @@ namespace HappyHeart
template<class LinearAlgebraTupleT>
void Assembly531(const LinearAlgebraTupleT& linear_algebra_tuple);
void Assembly(const LinearAlgebraTupleT& linear_algebra_tuple);
template<class LinearAlgebraTupleT, class LocalVariationalOperatorT>
void InjectInGlobalLinearAlgebra531(const LinearAlgebraTupleT& linear_algebra_tuple,
void InjectInGlobalLinearAlgebra(const LinearAlgebraTupleT& linear_algebra_tuple,
const LocalFEltSpace& local_felt_space,
LocalVariationalOperatorT& local_operator);
......
......@@ -19,25 +19,25 @@ namespace HappyHeart
template<class LinearAlgebraTupleT>
void Assembly531(const LinearAlgebraTupleT& linear_algebra_tuple)
void Assembly(const LinearAlgebraTupleT& linear_algebra_tuple)
{
static_assert(Utilities::IsSpecializationOf<std::tuple, LinearAlgebraTupleT>::value,
"Compilation error if LinearAlgebraTupleT is not a std::tuple.");
Impl::Recursivity<LinearAlgebraTupleT, 0, std::tuple_size<LinearAlgebraTupleT>::value>
::Assembly531(linear_algebra_tuple);
::Assembly(linear_algebra_tuple);
}
template<class LinearAlgebraTupleT, class LocalVariationalOperatorT>
void InjectInGlobalLinearAlgebra531(const LinearAlgebraTupleT& linear_algebra_tuple,
void InjectInGlobalLinearAlgebra(const LinearAlgebraTupleT& linear_algebra_tuple,
const LocalFEltSpace& local_felt_space,
LocalVariationalOperatorT& local_variational_operator)
{
Impl::Recursivity<LinearAlgebraTupleT, 0, std::tuple_size<LinearAlgebraTupleT>::value>
::InjectInGlobalLinearAlgebra531(linear_algebra_tuple, local_felt_space, local_variational_operator);
::InjectInGlobalLinearAlgebra(linear_algebra_tuple, local_felt_space, local_variational_operator);
}
......
......@@ -22,7 +22,7 @@ namespace HappyHeart
inline void GradOnGradientBasedElasticityTensor
::Assemble(LinearAlgebraTupleT&& linear_algebra_tuple, const Domain& domain) const
{
return Parent::Assemble531(std::move(linear_algebra_tuple), domain);
return Parent::AssembleImpl(std::move(linear_algebra_tuple), domain);
}
......
......@@ -21,7 +21,7 @@ namespace HappyHeart
template<class LinearAlgebraTupleT>
inline void GradPhiGradPhi::Assemble(LinearAlgebraTupleT&& linear_algebra_tuple, const Domain& domain) const
{
return Parent::Assemble531(std::move(linear_algebra_tuple), domain);
return Parent::AssembleImpl(std::move(linear_algebra_tuple), domain);
}
......
......@@ -21,7 +21,7 @@ namespace HappyHeart
template<class LinearAlgebraTupleT>
inline void Mass::Assemble(LinearAlgebraTupleT&& linear_algebra_tuple, const Domain& domain) const
{
return Parent::Assemble531(std::move(linear_algebra_tuple), domain);
return Parent::AssembleImpl(std::move(linear_algebra_tuple), domain);
}
......
......@@ -24,7 +24,7 @@ namespace HappyHeart
inline void ScalarDivVectorial
::Assemble(LinearAlgebraTupleT&& linear_algebra_tuple, const Domain& domain) const
{
return Parent::Assemble531(std::move(linear_algebra_tuple), domain);
return Parent::AssembleImpl(std::move(linear_algebra_tuple), domain);
}
......
......@@ -23,7 +23,7 @@ namespace HappyHeart
inline void Force::Assemble(LinearAlgebraTupleT&& global_vector_with_coeff_tuple,
const Domain& domain) const
{
return Parent::Assemble531(std::move(global_vector_with_coeff_tuple),
return Parent::AssembleImpl(std::move(global_vector_with_coeff_tuple),
domain);
}
......
......@@ -23,7 +23,7 @@ namespace HappyHeart
double time,
const Domain& domain) const
{
return Parent::Assemble531(std::move(global_vector_with_coeff_tuple),
return Parent::AssembleImpl(std::move(global_vector_with_coeff_tuple),
domain,
time);
}
......
......@@ -98,7 +98,7 @@ namespace HappyHeart
const GlobalVector& input_vector,
const Domain& domain) const
{
return Parent::Assemble531(std::move(linear_algebra_tuple), domain, input_vector);
return Parent::AssembleImpl(std::move(linear_algebra_tuple), domain, input_vector);
}
......
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