Commit 2760d4b2 authored by GILLES Sebastien's avatar GILLES Sebastien
Browse files

#1408 More renaming for ActiveStress/InternalVariable.

parent 002d9f35
......@@ -122,7 +122,8 @@ namespace MoReFEM
using elementary_data_type = typename parent::elementary_data_type;
//! Alias to the type of the input of the active stress policy.
using input_internal_variable_policy_type = typename InternalVariablePolicyT::input_internal_variable_policy_type;
using input_internal_variable_policy_type =
typename InternalVariablePolicyT::input_internal_variable_policy_type;
public:
......
......@@ -244,7 +244,7 @@ namespace MoReFEM
private:
//! Contant accessor to the input of the policy.
const input_internal_variable_policy_type& GetInputInternalPolicy() const noexcept;
const input_internal_variable_policy_type& GetInputActiveStress() const noexcept;
private:
......
......@@ -134,7 +134,7 @@ namespace MoReFEM
double u0_at_quad = 0.;
double u1_at_quad = 0.;
const double sigma_0 = GetInputInternalPolicy().GetContractility().GetValue(quad_pt, geom_elt);
const double sigma_0 = GetInputActiveStress().GetContractility().GetValue(quad_pt, geom_elt);
const int Nnode = static_cast<int>(geom_elt.Nvertex());
......@@ -243,7 +243,7 @@ namespace MoReFEM
template <unsigned int FiberIndexT>
inline const typename AnalyticalPrestress<FiberIndexT>::input_internal_variable_policy_type&
AnalyticalPrestress<FiberIndexT>::GetInputInternalPolicy() const noexcept
AnalyticalPrestress<FiberIndexT>::GetInputActiveStress() const noexcept
{
return input_internal_variable_policy_;
}
......
......@@ -114,10 +114,10 @@ namespace MoReFEM
private:
//! Accessor.
const input_internal_variable_policy_type& GetInputInternalVariablePolicy() const noexcept;
const input_internal_variable_policy_type& GetInputActiveStress() const noexcept;
//! Accessor.
input_internal_variable_policy_type& GetNonCstInputInternalVariablePolicy() noexcept;
input_internal_variable_policy_type& GetNonCstInputActiveStress() noexcept;
private:
......
......@@ -48,7 +48,7 @@ namespace MoReFEM
sigma_c_ = std::make_unique<ParameterAtQuadraturePoint<ParameterNS::Type::scalar>>("SigmaC",
domain,
quadrature_rule_per_topology,
GetInputInternalPolicy().GetInitialValueInternalVariable(),
GetInputActiveStress().GetInitialValueInternalVariable(),
time_manager);
ParameterAtQuadraturePoint<ParameterNS::Type::scalar>* raw_sigma_c = sigma_c_.get();
......@@ -63,7 +63,7 @@ namespace MoReFEM
template <unsigned int FiberIndexT>
inline const typename AnalyticalPrestress<FiberIndexT>::input_internal_variable_policy_type&
AnalyticalPrestress<FiberIndexT>::GetInputInternalPolicy() const noexcept
AnalyticalPrestress<FiberIndexT>::GetInputActiveStress() const noexcept
{
assert(!(!input_internal_variable_policy_));
return *input_internal_variable_policy_;
......@@ -72,9 +72,9 @@ namespace MoReFEM
template <unsigned int FiberIndexT>
inline typename AnalyticalPrestress<FiberIndexT>::input_internal_variable_policy_type&
AnalyticalPrestress<FiberIndexT>::GetNonCstInputInternalVariablePolicy() noexcept
AnalyticalPrestress<FiberIndexT>::GetNonCstInputActiveStress() noexcept
{
return const_cast<input_internal_variable_policy_type&>(GetInputInternalPolicy());
return const_cast<input_internal_variable_policy_type&>(GetInputActiveStress());
}
......
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