Commit 89f88409 authored by GILLES Sebastien's avatar GILLES Sebastien
Browse files

#820 Renaming.

parent c41fa25c
......@@ -95,10 +95,10 @@ namespace HappyHeart
using vm_type = HyperelasticityNS::VectorsAndMatrices<TimeSchemeT>;
using ViscolasticityPolicy =
using no_viscoelasticity_policy =
::HappyHeart::GlobalVariationalOperatorNS::SecondPiolaKirchhoffStressTensorNS::ViscoelasticityPolicyNS::None;
using ActiveStressPolicy =
using no_active_stress_policy =
::HappyHeart::GlobalVariationalOperatorNS::SecondPiolaKirchhoffStressTensorNS::ActiveStressPolicyNS::None;
using variable_holder_parent = ::HappyHeart::PoromechanicsNS::Crtp::VariableHolder<self>;
......@@ -112,12 +112,12 @@ namespace HappyHeart
public:
using StiffnessOperatorType =
using stiffness_operator_type =
::HappyHeart::GlobalVariationalOperatorNS::SecondPiolaKirchhoffStressTensor
<
hyperelasticity_policy,
ViscolasticityPolicy,
ActiveStressPolicy
no_viscoelasticity_policy,
no_active_stress_policy
>;
......@@ -127,7 +127,7 @@ namespace HappyHeart
using unique_ptr = std::unique_ptr<self>;
// \todo #501 Add a safety to ensure time step is constant! (model relies on this assumption).
using time_manager_type = TimeManager;//::HappyHeart::Private::TimeManager<TimeManagerNS::Policy::ConstantTimeStep>;
using time_manager_type = TimeManager;
public:
......@@ -260,7 +260,7 @@ namespace HappyHeart
//! Get the hyperelastic stiffness operator.
const StiffnessOperatorType&
const stiffness_operator_type&
GetStiffnessOperator() const noexcept;
//! Get the mass per square time step operator.
......@@ -301,7 +301,7 @@ namespace HappyHeart
//! Stiffness operator.
typename StiffnessOperatorType::const_unique_ptr stiffness_operator_ = nullptr;
typename stiffness_operator_type::const_unique_ptr stiffness_operator_ = nullptr;
//! Mass operator.
::HappyHeart::GlobalVariationalOperatorNS::Mass::const_unique_ptr mass_operator_ = nullptr;
......
......@@ -155,13 +155,13 @@ namespace HappyHeart
const auto& displacement = GetSolidDisplacement();
stiffness_operator_ =
std::make_unique<StiffnessOperatorType>(felt_space_highest_dimension,
displacement,
mesh_dimension,
GetSolid(),
parent::GetTimeManager(),
GetHyperelasticLawPtr()
);
std::make_unique<stiffness_operator_type>(felt_space_highest_dimension,
displacement,
mesh_dimension,
GetSolid(),
parent::GetTimeManager(),
GetHyperelasticLawPtr()
);
mass_operator_ = std::make_unique<GVO::Mass>(felt_space_highest_dimension,
displacement,
......@@ -390,7 +390,8 @@ namespace HappyHeart
class HyperelasticLawT,
HyperelasticityNS::TimeScheme TimeSchemeT
>
inline const typename VariationalFormulationHyperElasticity<HyperelasticLawT, TimeSchemeT>::StiffnessOperatorType&
inline const typename VariationalFormulationHyperElasticity<HyperelasticLawT, TimeSchemeT>
::stiffness_operator_type&
VariationalFormulationHyperElasticity<HyperelasticLawT, TimeSchemeT>::GetStiffnessOperator() const noexcept
{
assert(!(!stiffness_operator_));
......
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