Commit 3d27ec99 authored by GILLES Sebastien's avatar GILLES Sebastien
Browse files

#551 Rename Parent alias parent.

parent 7f08cf59
......@@ -22,8 +22,8 @@ namespace HappyHeart
GlobalMatrix::GlobalMatrix(const GlobalMatrix& rhs)
: PetscParent(rhs),
NumberingSubsetParent(rhs)
: Petscparent(rhs),
NumberingSubsetparent(rhs)
{ }
......@@ -34,9 +34,9 @@ namespace HappyHeart
assert(A.GetColNumberingSubset() == B.GetColNumberingSubset());
assert(A.GetRowNumberingSubset() == B.GetRowNumberingSubset());
using Parent = GlobalMatrix::PetscParent;
using parent = GlobalMatrix::Petscparent;
Swap(static_cast<Parent&>(A), static_cast<Parent&>(B));
Swap(static_cast<parent&>(A), static_cast<parent&>(B));
}
......
......@@ -52,10 +52,10 @@ namespace HappyHeart
using vector_unique_ptr = std::vector<unique_ptr>;
//! Alias to parent.
using PetscParent = Wrappers::Petsc::Matrix;
using Petscparent = Wrappers::Petsc::Matrix;
//! Alias to other parent.
using NumberingSubsetParent = Crtp::NumberingSubsetForMatrix<GlobalMatrix>;
using NumberingSubsetparent = Crtp::NumberingSubsetForMatrix<GlobalMatrix>;
public:
......@@ -107,8 +107,8 @@ namespace HappyHeart
* \brief Declared but do not defined: we do not want to be able to do this but we also want to avoid the
* 'slicing effect' (i.e. attributes of child class ignored entirely).
*/
void Swap(GlobalMatrix& A, GlobalMatrix::PetscParent& B);
void Swap(GlobalMatrix::PetscParent& A, GlobalMatrix& B);
void Swap(GlobalMatrix& A, GlobalMatrix::Petscparent& B);
void Swap(GlobalMatrix::Petscparent& A, GlobalMatrix& B);
......
......@@ -21,7 +21,7 @@ namespace HappyHeart
GlobalVector::GlobalVector(const GlobalVector& rhs)
: Parent(rhs),
: parent(rhs),
numbering_subset_(rhs.numbering_subset_)
{ }
......@@ -31,9 +31,9 @@ namespace HappyHeart
{
assert(A.GetNumberingSubset() == B.GetNumberingSubset());
using Parent = GlobalVector::Parent;
using parent = GlobalVector::parent;
Swap(static_cast<Parent&>(A), static_cast<Parent&>(B));
Swap(static_cast<parent&>(A), static_cast<parent&>(B));
}
......
......@@ -48,7 +48,7 @@ namespace HappyHeart
using vector_unique_ptr = std::vector<unique_ptr>;
//! Alias to parent.
using Parent = Wrappers::Petsc::Vector;
using parent = Wrappers::Petsc::Vector;
public:
......@@ -103,8 +103,8 @@ namespace HappyHeart
* \brief Declared but do not defined: we do not want to be able to do this but we also want to avoid the
* 'slicing effect' (i.e. attributes of child class ignored entirely).
*/
void Swap(GlobalVector& A, GlobalVector::Parent& B);
void Swap(GlobalVector::Parent& A, GlobalVector& B);
void Swap(GlobalVector& A, GlobalVector::parent& B);
void Swap(GlobalVector::parent& A, GlobalVector& B);
/*!
......
......@@ -21,7 +21,7 @@ namespace HappyHeart
NumberingSubset::NumberingSubset(unsigned int id)
: UniqueIdParent(id)
: UniqueIdparent(id)
{ }
......
......@@ -49,7 +49,7 @@ namespace HappyHeart
using vector_const_shared_ptr = std::vector<const_shared_ptr>;
//! Alias for the parent.
using UniqueIdParent = Crtp::UniqueId<NumberingSubset, UniqueIdNS::AssignationMode::manual>;
using UniqueIdparent = Crtp::UniqueId<NumberingSubset, UniqueIdNS::AssignationMode::manual>;
//! Friendship!
friend class Private::NumberingSubsetManager;
......
......@@ -46,7 +46,7 @@ namespace HappyHeart
const unsigned int unique_id,
UnknownAndNumberingSubset::vector_const_shared_ptr&& unknown_list)
: Crtp::HappyHeartMpi<FEltSpace>(god_of_dof_ptr->MpiHappyHeart()),
UniqueIdParent(unique_id),
UniqueIdparent(unique_id),
finite_elt_storage_(nullptr),
dimension_(ExtractDimensionFromDomain(domain)),
god_of_dof_(god_of_dof_ptr),
......
......@@ -74,7 +74,7 @@ namespace HappyHeart
using vector_unique_ptr = std::vector<unique_ptr>;
//! Convenient alias to one of the parent.
using UniqueIdParent = Crtp::UniqueId<FEltSpace, UniqueIdNS::AssignationMode::manual>;
using UniqueIdparent = Crtp::UniqueId<FEltSpace, UniqueIdNS::AssignationMode::manual>;
/*!
* Friendship to a private class, which needs to use GetNonCstFiniteEltStorage().
......
......@@ -47,7 +47,7 @@ namespace HappyHeart
using vector_shared_ptr = std::vector<shared_ptr>;
//! Convenient alias to one of the parent.
using UniqueIdParent = Crtp::UniqueId<GodOfDof, UniqueIdNS::AssignationMode::manual>;
using UniqueIdparent = Crtp::UniqueId<GodOfDof, UniqueIdNS::AssignationMode::manual>;
//! Name of the class.
static const std::string& ClassName();
......
......@@ -19,7 +19,7 @@ namespace HappyHeart
const InputParameterDataT& input_parameter_data,
GeometricMeshRegion& mesh)
: Crtp::HappyHeartMpi<GodOfDof>(mpi),
UniqueIdParent(mesh.GetUniqueId()),
UniqueIdparent(mesh.GetUniqueId()),
mesh_(mesh)
{
ReadBoundaryConditionList(input_parameter_data);
......
......@@ -38,7 +38,7 @@ namespace HappyHeart
/*!
* \brief Parent class of all GlobalVariationalOperator.
* \brief parent class of all GlobalVariationalOperator.
*
* This kind of operator is closely related to a (bi)linear form and its matricial or vectorial representation;
* HappyHeart works mostly by 'iterating' (by recursion...) over a tuple of such beasts and calling functions upon them.
......@@ -57,7 +57,7 @@ namespace HappyHeart
private:
//! Alias over UnknownAndNumberingSubsetList parent.
using UnknownAndNumberingSubsetListParent =
using UnknownAndNumberingSubsetListparent =
Crtp::UnknownAndNumberingSubsetList<GlobalVariationalOperator<DerivedT, LocalVariationalOperatorT>>;
public:
......@@ -184,7 +184,7 @@ namespace HappyHeart
* double time,
* const Domain& domain) const
* {
* return Parent::AssembleImpl(std::move(global_vector_with_coeff_tuple),
* return parent::AssembleImpl(std::move(global_vector_with_coeff_tuple),
* domain,
* time); // notice the inversion: time must come last.
* }
......
......@@ -25,7 +25,7 @@ namespace HappyHeart
const unsigned int geom_mesh_region_dimension,
AllocateGradientFEltPhi do_allocate_gradient_felt_phi,
Args&&... args)
: UnknownAndNumberingSubsetListParent(unknown_storage),
: UnknownAndNumberingSubsetListparent(unknown_storage),
felt_space_(felt_space),
do_allocate_gradient_felt_phi_(do_allocate_gradient_felt_phi)
{
......
......@@ -24,7 +24,7 @@ namespace HappyHeart
const double young_modulus,
const double poisson_coefficient,
const ElasticityNS::KinematicParameter2D kinematic_parameter)
: Parent(felt_space,
: parent(felt_space,
vectorial_unknown,
geom_mesh_region_dimension,
AllocateGradientFEltPhi::yes,
......
......@@ -35,14 +35,14 @@ namespace HappyHeart
static const std::string& ClassName();
//! Convenient alias to pinpoint the GlobalVariationalOperator parent.
using Parent = GlobalVariationalOperator
using parent = GlobalVariationalOperator
<
GradOnGradientBasedElasticityTensor,
LocalVariationalOperator
>;
//! Friendship to the parent class so that the CRTP can reach private methods defined below.
friend Parent;
friend parent;
//! Unique ptr.
using unique_ptr = std::unique_ptr<GradOnGradientBasedElasticityTensor>;
......
......@@ -22,7 +22,7 @@ namespace HappyHeart
inline void GradOnGradientBasedElasticityTensor
::Assemble(LinearAlgebraTupleT&& linear_algebra_tuple, const Domain& domain) const
{
return Parent::AssembleImpl(std::move(linear_algebra_tuple), domain);
return parent::AssembleImpl(std::move(linear_algebra_tuple), domain);
}
......
......@@ -20,7 +20,7 @@ namespace HappyHeart
GradPhiGradPhi::GradPhiGradPhi(const FEltSpace& felt_space,
const Unknown& unknown,
const unsigned int geom_mesh_region_dimension)
: Parent(felt_space,
: parent(felt_space,
unknown,
geom_mesh_region_dimension,
AllocateGradientFEltPhi::yes
......
......@@ -41,14 +41,14 @@ namespace HappyHeart
static const std::string& ClassName();
//! Convenient alias to pinpoint the GlobalVariationalOperator parent.
using Parent = GlobalVariationalOperator
using parent = GlobalVariationalOperator
<
GradPhiGradPhi,
LocalVariationalOperatorNS::GradPhiGradPhi
>;
//! Friendship to the parent class so that the CRTP can reach private methods defined below.
friend Parent;
friend parent;
//! Unique ptr.
......
......@@ -21,7 +21,7 @@ namespace HappyHeart
template<class LinearAlgebraTupleT>
inline void GradPhiGradPhi::Assemble(LinearAlgebraTupleT&& linear_algebra_tuple, const Domain& domain) const
{
return Parent::AssembleImpl(std::move(linear_algebra_tuple), domain);
return parent::AssembleImpl(std::move(linear_algebra_tuple), domain);
}
......
......@@ -20,7 +20,7 @@ namespace HappyHeart
Mass::Mass(const FEltSpace& felt_space,
const Unknown& unknown,
const unsigned int geom_mesh_region_dimension)
: Parent(felt_space,
: parent(felt_space,
unknown,
geom_mesh_region_dimension,
AllocateGradientFEltPhi::no
......
......@@ -42,14 +42,14 @@ namespace HappyHeart
//! Convenient alias to pinpoint the GlobalVariationalOperator parent.
using Parent = GlobalVariationalOperator
using parent = GlobalVariationalOperator
<
Mass,
LocalVariationalOperatorNS::Mass
>;
//! Friendship to the parent class so that the CRTP can reach private methods defined below.
friend Parent;
friend parent;
//! Unique ptr.
using unique_ptr = std::unique_ptr<Mass>;
......
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