Skip to content
GitLab
Commit 87fde1cc authored by GILLES Sebastien's avatar GILLES Sebastien
Browse files

#1022 Remove MeshIndex template argument that is not necessary either.

parent fd1daac4
Hide whitespace changes
Inline Side-by-side
Sources/ModelInstances/UnderDevelopment/Poromechanics/Data/NewFluidPressure.hpp
View file @ 87fde1cc
......@@ -42,11 +42,10 @@ namespace HappyHeart
//! Alias to pressure parameter operator.
template
<
MeshIndex MeshIndexT,
TimeLabel TimeLabelT
>
using pressure_parameter_operator_type =
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, MeshIndexT, TimeLabelT>;
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, TimeLabelT>;
//! \copydoc doxygen_hide_alias_self
using self = NewFluidPressure<HyperelasticLawT>;
......@@ -88,10 +87,10 @@ namespace HappyHeart
public:
//! Operator which updates pressure parameter on solid mesh.
pressure_parameter_operator_type<MeshIndex::solid, TimeLabel::new_value>& GetNonCstUpdatePressureParamOnSolid() noexcept;
pressure_parameter_operator_type<TimeLabel::new_value>& GetNonCstUpdatePressureParamOnSolid() noexcept;
//! Operator which updates pressure parameter on solid mesh.
pressure_parameter_operator_type<MeshIndex::fluid, TimeLabel::new_value>& GetNonCstUpdatePressureParamOnFluid() noexcept;
pressure_parameter_operator_type<TimeLabel::new_value>& GetNonCstUpdatePressureParamOnFluid() noexcept;
//! Hyperelastic law.
const HyperelasticLawT& GetHyperelasticLaw() const noexcept;
......@@ -103,13 +102,13 @@ namespace HappyHeart
typename pressure_parameter_type::unique_ptr pressure_parameter_on_solid_ = nullptr;
//! Operator which updates pressure parameter.
typename pressure_parameter_operator_type<MeshIndex::solid, TimeLabel::new_value>::unique_ptr update_pressure_param_on_solid_ = nullptr;
typename pressure_parameter_operator_type<TimeLabel::new_value>::unique_ptr update_pressure_param_on_solid_ = nullptr;
//! Pressure parameter.
typename pressure_parameter_type::unique_ptr pressure_parameter_on_fluid_ = nullptr;
//! Operator which updates pressure parameter.
typename pressure_parameter_operator_type<MeshIndex::fluid, TimeLabel::new_value>::unique_ptr update_pressure_param_on_fluid_ = nullptr;
typename pressure_parameter_operator_type<TimeLabel::new_value>::unique_ptr update_pressure_param_on_fluid_ = nullptr;
//! Hyperelastic law.
const HyperelasticLawT& hyperelastic_law_;
......
Sources/ModelInstances/UnderDevelopment/Poromechanics/Data/NewFluidPressure.hxx
View file @ 87fde1cc
......@@ -66,7 +66,7 @@ namespace HappyHeart
decltype(auto) hyperelastic_law = GetHyperelasticLaw();
update_pressure_param_on_solid_ =
std::make_unique<pressure_parameter_operator_type<MeshIndex::solid, TimeLabel::new_value>>(solid_felt_space,
std::make_unique<pressure_parameter_operator_type<TimeLabel::new_value>>(solid_felt_space,
solid_displacement_unknown,
*pressure_parameter_on_solid_,
hyperelastic_law,
......@@ -83,7 +83,7 @@ namespace HappyHeart
time_manager);
update_pressure_param_on_fluid_ =
std::make_unique<pressure_parameter_operator_type<MeshIndex::fluid, TimeLabel::new_value>>(fluid_felt_space,
std::make_unique<pressure_parameter_operator_type<TimeLabel::new_value>>(fluid_felt_space,
solid_displacement_unknown,
*pressure_parameter_on_fluid_,
hyperelastic_law,
......@@ -100,7 +100,7 @@ namespace HappyHeart
template<class HyperelasticLawT>
typename NewFluidPressure<HyperelasticLawT>::template pressure_parameter_operator_type<MeshIndex::solid, TimeLabel::new_value>&
typename NewFluidPressure<HyperelasticLawT>::template pressure_parameter_operator_type<TimeLabel::new_value>&
NewFluidPressure<HyperelasticLawT>::GetNonCstUpdatePressureParamOnSolid() noexcept
{
assert(!(!update_pressure_param_on_solid_));
......@@ -109,7 +109,7 @@ namespace HappyHeart
template<class HyperelasticLawT>
typename NewFluidPressure<HyperelasticLawT>::template pressure_parameter_operator_type<MeshIndex::fluid, TimeLabel::new_value>&
typename NewFluidPressure<HyperelasticLawT>::template pressure_parameter_operator_type<TimeLabel::new_value>&
NewFluidPressure<HyperelasticLawT>::GetNonCstUpdatePressureParamOnFluid() noexcept
{
assert(!(!update_pressure_param_on_fluid_));
......
Sources/ModelInstances/UnderDevelopment/Poromechanics/ImplicitStep/ImplicitStepFluid/GlobalVariationalOperatorInstances/Darcy.hpp
View file @ 87fde1cc
......@@ -99,7 +99,7 @@ namespace HappyHeart
double internal_friction,
const HyperelasticLawT& law,
const cauchy_green_tensor_type& cauchy_green_tensor,
GlobalParameterOperatorNS:: UpdatePressureAtQuadPt<HyperelasticLawT, MeshIndex::fluid, DataNS::TimeLabel::new_value>& update_pressure_operator,
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, DataNS::TimeLabel::new_value>& update_pressure_operator,
const TimeManager& time_manager,
const QuadratureRulePerTopology* const quadrature_rule_per_topology = nullptr);
......@@ -161,12 +161,12 @@ namespace HappyHeart
//! Update pressure operator.
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, MeshIndex::fluid, DataNS::TimeLabel::new_value>& GetNonCstUpdatePressureOperator() const noexcept;
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, DataNS::TimeLabel::new_value>& GetNonCstUpdatePressureOperator() const noexcept;
private:
//! Update pressure operator.
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, MeshIndex::fluid, DataNS::TimeLabel::new_value>& update_pressure_operator_;
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, DataNS::TimeLabel::new_value>& update_pressure_operator_;
};
......
Sources/ModelInstances/UnderDevelopment/Poromechanics/ImplicitStep/ImplicitStepFluid/GlobalVariationalOperatorInstances/Darcy.hxx
View file @ 87fde1cc
......@@ -37,7 +37,7 @@ namespace HappyHeart
const double internal_friction,
const HyperelasticLawT& law,
const cauchy_green_tensor_type& cauchy_green_tensor,
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, MeshIndex::fluid, DataNS::TimeLabel::new_value>& update_pressure_operator,
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, DataNS::TimeLabel::new_value>& update_pressure_operator,
const TimeManager& time_manager,
const QuadratureRulePerTopology* const quadrature_rule_per_topology)
: parent(felt_space,
......@@ -105,7 +105,7 @@ namespace HappyHeart
template<class HyperelasticLawT>
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, MeshIndex::fluid, DataNS::TimeLabel::new_value>&
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, DataNS::TimeLabel::new_value>&
Darcy<HyperelasticLawT>
::GetNonCstUpdatePressureOperator() const noexcept
{
......
Sources/ModelInstances/UnderDevelopment/Poromechanics/ImplicitStep/ImplicitStepFluid/NewtonFixedPoint/GlobalVariationalOperatorInstances/PressureContribToRhs.hpp
View file @ 87fde1cc
......@@ -93,7 +93,7 @@ namespace HappyHeart
const Unknown& pressure_unknown,
const GlobalVector& current_solid_displacement,
const ScalarParameter<>& fluid_density,
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, MeshIndex::solid, DataNS::TimeLabel::new_value>& update_pressure_operator,
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, DataNS::TimeLabel::new_value>& update_pressure_operator,
const QuadratureRulePerTopology* const quadrature_rule_per_topology = nullptr);
//! Destructor.
......@@ -141,7 +141,7 @@ namespace HappyHeart
const GlobalVector& GetCurrentSolidDisplacement() const noexcept;
//! Update pressure operator.
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, MeshIndex::solid, DataNS::TimeLabel::new_value>& GetNonCstUpdatePressureOperator() const noexcept;
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, DataNS::TimeLabel::new_value>& GetNonCstUpdatePressureOperator() const noexcept;
private:
......@@ -152,7 +152,7 @@ namespace HappyHeart
const ExtendedUnknown& solid_displacement_unknown_;
//! Update pressure operator.
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, MeshIndex::solid, DataNS::TimeLabel::new_value>& update_pressure_operator_;
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, DataNS::TimeLabel::new_value>& update_pressure_operator_;
};
......
Sources/ModelInstances/UnderDevelopment/Poromechanics/ImplicitStep/ImplicitStepFluid/NewtonFixedPoint/GlobalVariationalOperatorInstances/PressureContribToRhs.hxx
View file @ 87fde1cc
......@@ -38,7 +38,7 @@ namespace HappyHeart
const Unknown& pressure_unknown,
const GlobalVector& current_solid_displacement,
const ScalarParameter<>& fluid_density,
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, MeshIndex::solid, DataNS::TimeLabel::new_value>& update_pressure_operator,
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, DataNS::TimeLabel::new_value>& update_pressure_operator,
const QuadratureRulePerTopology* const quadrature_rule_per_topology)
: parent(felt_space,
pressure_unknown,
......@@ -90,7 +90,7 @@ namespace HappyHeart
template<class HyperelasticLawT>
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, MeshIndex::solid, DataNS::TimeLabel::new_value>&
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, DataNS::TimeLabel::new_value>&
PressureContribToRhs<HyperelasticLawT>
::GetNonCstUpdatePressureOperator() const noexcept
{
......
Sources/ModelInstances/UnderDevelopment/Poromechanics/ImplicitStep/ImplicitStepFluid/NewtonFixedPoint/VariationalFormulation.hpp
View file @ 87fde1cc
......@@ -203,11 +203,10 @@ namespace HappyHeart
//! Alias to pressure parameter operator.
template
<
MeshIndex MeshIndexT,
DataNS::TimeLabel TimeLabelT
>
using pressure_parameter_operator_type =
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, MeshIndexT, TimeLabelT>;
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, TimeLabelT>;
public:
......@@ -244,8 +243,8 @@ namespace HappyHeart
DataNS::Fluidmass& fluid_mass_data,
DataNS::SolidDisplacement& solid_displacement_data,
DataNS::SolidVelocity& solid_velocity_data,
pressure_parameter_operator_type<MeshIndex::solid, DataNS::TimeLabel::new_value>& pressure_on_solid_operator,
pressure_parameter_operator_type<MeshIndex::fluid, DataNS::TimeLabel::new_value>& pressure_on_fluid_operator);
pressure_parameter_operator_type<DataNS::TimeLabel::new_value>& pressure_on_solid_operator,
pressure_parameter_operator_type<DataNS::TimeLabel::new_value>& pressure_on_fluid_operator);
//! Destructor.
......@@ -558,10 +557,10 @@ namespace HappyHeart
const HyperelasticLawT& GetHyperelasticLaw() const noexcept;
//! Operator which updates pressure parameter on solid mesh.
pressure_parameter_operator_type<MeshIndex::solid, DataNS::TimeLabel::new_value>& GetNonCstUpdatePressureParamOnSolid() noexcept;
pressure_parameter_operator_type<DataNS::TimeLabel::new_value>& GetNonCstUpdatePressureParamOnSolid() noexcept;
//! Operator which updates pressure parameter on solid mesh.
pressure_parameter_operator_type<MeshIndex::fluid, DataNS::TimeLabel::new_value>& GetNonCstUpdatePressureParamOnFluid() noexcept;
pressure_parameter_operator_type<DataNS::TimeLabel::new_value>& GetNonCstUpdatePressureParamOnFluid() noexcept;
public:
......@@ -777,10 +776,10 @@ namespace HappyHeart
const NumberingSubset& numbering_subset_;
//! Operator which updates pressure parameter.
pressure_parameter_operator_type<MeshIndex::solid, DataNS::TimeLabel::new_value>& pressure_on_solid_operator_;
pressure_parameter_operator_type<DataNS::TimeLabel::new_value>& pressure_on_solid_operator_;
//! Operator which updates pressure parameter.
pressure_parameter_operator_type<MeshIndex::fluid, DataNS::TimeLabel::new_value>& pressure_on_fluid_operator_;
pressure_parameter_operator_type<DataNS::TimeLabel::new_value>& pressure_on_fluid_operator_;
};
......
Sources/ModelInstances/UnderDevelopment/Poromechanics/ImplicitStep/ImplicitStepFluid/NewtonFixedPoint/VariationalFormulationAccessors.hxx
View file @ 87fde1cc
......@@ -373,7 +373,7 @@ namespace HappyHeart
template<class HyperelasticLawT>
inline typename VariationalFormulation<HyperelasticLawT>::template pressure_parameter_operator_type<MeshIndex::solid, DataNS::TimeLabel::new_value>&
inline typename VariationalFormulation<HyperelasticLawT>::template pressure_parameter_operator_type<DataNS::TimeLabel::new_value>&
VariationalFormulation<HyperelasticLawT>::GetNonCstUpdatePressureParamOnSolid() noexcept
{
return pressure_on_solid_operator_;
......@@ -381,7 +381,7 @@ namespace HappyHeart
template<class HyperelasticLawT>
inline typename VariationalFormulation<HyperelasticLawT>::template pressure_parameter_operator_type<MeshIndex::fluid, DataNS::TimeLabel::new_value>&
inline typename VariationalFormulation<HyperelasticLawT>::template pressure_parameter_operator_type<DataNS::TimeLabel::new_value>&
VariationalFormulation<HyperelasticLawT>::GetNonCstUpdatePressureParamOnFluid() noexcept
{
return pressure_on_fluid_operator_;
......
Sources/ModelInstances/UnderDevelopment/Poromechanics/ImplicitStep/ImplicitStepFluid/NewtonFixedPoint/VariationalFormulationInit.hxx
View file @ 87fde1cc
......@@ -54,8 +54,8 @@ namespace HappyHeart
DataNS::Fluidmass& fluid_mass_data,
DataNS::SolidDisplacement& solid_displacement_data,
DataNS::SolidVelocity& solid_velocity_data,
pressure_parameter_operator_type<MeshIndex::solid, DataNS::TimeLabel::new_value>& pressure_on_solid_operator,
pressure_parameter_operator_type<MeshIndex::fluid, DataNS::TimeLabel::new_value>& pressure_on_fluid_operator)
pressure_parameter_operator_type<DataNS::TimeLabel::new_value>& pressure_on_solid_operator,
pressure_parameter_operator_type<DataNS::TimeLabel::new_value>& pressure_on_fluid_operator)
: parent(mpi,
time_manager,
god_of_dof,
......
Sources/ModelInstances/UnderDevelopment/Poromechanics/ImplicitStep/ImplicitStepFluid/dH/VariationalFormulation.hpp
View file @ 87fde1cc
......@@ -170,11 +170,10 @@ namespace HappyHeart
//! Alias to pressure parameter operator.
template
<
MeshIndex MeshIndexT,
DataNS::TimeLabel TimeLabelT
>
using pressure_parameter_operator_type =
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, MeshIndexT, TimeLabelT>;
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, TimeLabelT>;
//! Alias to pressure parameter.
using pressure_parameter_type =
......@@ -214,7 +213,7 @@ namespace HappyHeart
DataNS::Monolithic& monolithic_data,
DataNS::Fluidmass& fluid_mass_data,
DataNS::FluidVelocity& fluid_velocity_data,
pressure_parameter_operator_type<MeshIndex::fluid, DataNS::TimeLabel::new_value>& pressure_on_fluid_operator);
pressure_parameter_operator_type<DataNS::TimeLabel::new_value>& pressure_on_fluid_operator);
//! Destructor.
~VariationalFormulation() = default;
......@@ -421,7 +420,7 @@ namespace HappyHeart
const GlobalVector& PerformImpl();
//! Operator which updates pressure parameter on solid mesh.
pressure_parameter_operator_type<MeshIndex::fluid, DataNS::TimeLabel::new_value>& GetNonCstUpdatePressureParamOnFluid() noexcept;
pressure_parameter_operator_type<DataNS::TimeLabel::new_value>& GetNonCstUpdatePressureParamOnFluid() noexcept;
private:
......@@ -538,7 +537,7 @@ namespace HappyHeart
///@}
//! Operator which updates pressure parameter.
pressure_parameter_operator_type<MeshIndex::fluid, DataNS::TimeLabel::new_value>& pressure_on_fluid_operator_;
pressure_parameter_operator_type<DataNS::TimeLabel::new_value>& pressure_on_fluid_operator_;
};
......
Sources/ModelInstances/UnderDevelopment/Poromechanics/ImplicitStep/ImplicitStepFluid/dH/VariationalFormulationAccessors.hxx
View file @ 87fde1cc
......@@ -285,7 +285,7 @@ namespace HappyHeart
template<class HyperelasticLawT>
inline typename VariationalFormulation<HyperelasticLawT>::template pressure_parameter_operator_type<MeshIndex::fluid, DataNS::TimeLabel::new_value>&
inline typename VariationalFormulation<HyperelasticLawT>::template pressure_parameter_operator_type<DataNS::TimeLabel::new_value>&
VariationalFormulation<HyperelasticLawT>::GetNonCstUpdatePressureParamOnFluid() noexcept
{
return pressure_on_fluid_operator_;
......
Sources/ModelInstances/UnderDevelopment/Poromechanics/ImplicitStep/ImplicitStepFluid/dH/VariationalFormulationInit.hxx
View file @ 87fde1cc
......@@ -49,7 +49,7 @@ namespace HappyHeart
DataNS::Monolithic& monolithic_data,
DataNS::Fluidmass& fluid_mass_data,
DataNS::FluidVelocity& fluid_velocity_data,
pressure_parameter_operator_type<MeshIndex::fluid, DataNS::TimeLabel::new_value>& pressure_on_fluid_operator)
pressure_parameter_operator_type<DataNS::TimeLabel::new_value>& pressure_on_fluid_operator)
: parent(mpi,
time_manager,
god_of_dof,
......
Sources/ModelInstances/UnderDevelopment/Poromechanics/Parameter/Local/UpdatePressureAtQuadPt.hpp
View file @ 87fde1cc
......@@ -36,18 +36,17 @@ namespace HappyHeart
template
<
class PoroHyperelasticLawT,
MeshIndex MeshIndexT,
DataNS::TimeLabel TimeLabelT
>
class UpdatePressureAtQuadPt final
: public Advanced::LocalParameterOperator<ParameterNS::Type::scalar>,
public Crtp::CauchyGreenAccess<UpdatePressureAtQuadPt<PoroHyperelasticLawT, MeshIndexT, TimeLabelT>>
public Crtp::CauchyGreenAccess<UpdatePressureAtQuadPt<PoroHyperelasticLawT, TimeLabelT>>
{
public:
//! \copydoc doxygen_hide_alias_self
using self = UpdatePressureAtQuadPt<PoroHyperelasticLawT, MeshIndexT, TimeLabelT>;
using self = UpdatePressureAtQuadPt<PoroHyperelasticLawT, TimeLabelT>;
//! Alias to unique pointer.
using unique_ptr = std::unique_ptr<self>;
......
Sources/ModelInstances/UnderDevelopment/Poromechanics/Parameter/Local/UpdatePressureAtQuadPt.hxx
View file @ 87fde1cc
......@@ -25,10 +25,9 @@ namespace HappyHeart
template
<
class PoroHyperelasticLawT,
MeshIndex MeshIndexT,
DataNS::TimeLabel TimeLabelT
>
UpdatePressureAtQuadPt<PoroHyperelasticLawT, MeshIndexT, TimeLabelT>
UpdatePressureAtQuadPt<PoroHyperelasticLawT, TimeLabelT>
::UpdatePressureAtQuadPt(const ExtendedUnknown::vector_const_shared_ptr& a_unknown_storage,
elementary_data_type&& a_elementary_data,
ParameterAtQuadraturePoint<ParameterNS::Type::scalar, ParameterNS::TimeDependencyNS::None>& pressure,
......@@ -51,10 +50,9 @@ namespace HappyHeart
template
<
class PoroHyperelasticLawT,
MeshIndex MeshIndexT,
DataNS::TimeLabel TimeLabelT
>
const std::string& UpdatePressureAtQuadPt<PoroHyperelasticLawT, MeshIndexT, TimeLabelT>::ClassName()
const std::string& UpdatePressureAtQuadPt<PoroHyperelasticLawT, TimeLabelT>::ClassName()
{
static std::string name("UpdatePressureAtQuadPt");
return name;
......@@ -64,10 +62,9 @@ namespace HappyHeart
template
<
class PoroHyperelasticLawT,
MeshIndex MeshIndexT,
DataNS::TimeLabel TimeLabelT
>
void UpdatePressureAtQuadPt<PoroHyperelasticLawT, MeshIndexT, TimeLabelT>::ComputeEltArray()
void UpdatePressureAtQuadPt<PoroHyperelasticLawT, TimeLabelT>::ComputeEltArray()
{
auto& elementary_data = GetNonCstElementaryData();
......@@ -156,10 +153,9 @@ namespace HappyHeart
template
<
class PoroHyperelasticLawT,
MeshIndex MeshIndexT,
DataNS::TimeLabel TimeLabelT
>
inline const PoroHyperelasticLawT& UpdatePressureAtQuadPt<PoroHyperelasticLawT, MeshIndexT, TimeLabelT>::GetHyperelasticLaw() const noexcept
inline const PoroHyperelasticLawT& UpdatePressureAtQuadPt<PoroHyperelasticLawT, TimeLabelT>::GetHyperelasticLaw() const noexcept
{
return hyperelastic_law_;
}
......@@ -168,10 +164,9 @@ namespace HappyHeart
template
<
class PoroHyperelasticLawT,
MeshIndex MeshIndexT,
DataNS::TimeLabel TimeLabelT
>
inline const InvariantHolder& UpdatePressureAtQuadPt<PoroHyperelasticLawT, MeshIndexT, TimeLabelT>::GetInvariantHolder() const noexcept
inline const InvariantHolder& UpdatePressureAtQuadPt<PoroHyperelasticLawT, TimeLabelT>::GetInvariantHolder() const noexcept
{
assert(!(!invariant_holder_));
return *invariant_holder_;
......@@ -181,15 +176,15 @@ namespace HappyHeart
template
<
class PoroHyperelasticLawT,
MeshIndex MeshIndexT,
DataNS::TimeLabel TimeLabelT
>
inline InvariantHolder& UpdatePressureAtQuadPt<PoroHyperelasticLawT, MeshIndexT, TimeLabelT>::GetNonCstInvariantHolder() noexcept
inline InvariantHolder& UpdatePressureAtQuadPt<PoroHyperelasticLawT, TimeLabelT>::GetNonCstInvariantHolder() noexcept
{
return const_cast<InvariantHolder&>(GetInvariantHolder());
}
} // namespace LocalParameterOperatorNS
......
Sources/ModelInstances/UnderDevelopment/Poromechanics/Parameter/UpdatePressureAtQuadPt.hpp
View file @ 87fde1cc
......@@ -39,14 +39,13 @@ namespace HappyHeart
template
<
class PoroHyperelasticLawT,
MeshIndex MeshIndexT,
DataNS::TimeLabel TimeLabelT
>
class UpdatePressureAtQuadPt final
: public GlobalParameterOperator
<
UpdatePressureAtQuadPt<PoroHyperelasticLawT, MeshIndexT, TimeLabelT>,
LocalParameterOperatorNS::UpdatePressureAtQuadPt<PoroHyperelasticLawT, MeshIndexT, TimeLabelT>,
UpdatePressureAtQuadPt<PoroHyperelasticLawT, TimeLabelT>,
LocalParameterOperatorNS::UpdatePressureAtQuadPt<PoroHyperelasticLawT, TimeLabelT>,
ParameterNS::Type::scalar
>
{
......@@ -58,14 +57,14 @@ namespace HappyHeart
static const std::string& ClassName();
//! Alias to self.
using self = UpdatePressureAtQuadPt<PoroHyperelasticLawT, MeshIndexT, TimeLabelT>;
using self = UpdatePressureAtQuadPt<PoroHyperelasticLawT, TimeLabelT>;
//! Alias to unique pointer.
using unique_ptr = std::unique_ptr<self>;
//! Alias to local operator.
using local_operator_type =
LocalParameterOperatorNS::UpdatePressureAtQuadPt<PoroHyperelasticLawT, MeshIndexT, TimeLabelT>;
LocalParameterOperatorNS::UpdatePressureAtQuadPt<PoroHyperelasticLawT, TimeLabelT>;
//! Convenient alias to pinpoint the GlobalParameterOperator parent.
using parent = GlobalParameterOperator
......
Sources/ModelInstances/UnderDevelopment/Poromechanics/Parameter/UpdatePressureAtQuadPt.hxx
View file @ 87fde1cc
......@@ -25,10 +25,9 @@ namespace HappyHeart
template
<
class PoroHyperelasticLawT,
MeshIndex MeshIndexT,
DataNS::TimeLabel TimeLabelT
>
UpdatePressureAtQuadPt<PoroHyperelasticLawT, MeshIndexT, TimeLabelT>
UpdatePressureAtQuadPt<PoroHyperelasticLawT, TimeLabelT>
::UpdatePressureAtQuadPt(const FEltSpace& felt_space,
const Unknown& unknown,
ParameterAtQuadraturePoint<ParameterNS::Type::scalar, ParameterNS::TimeDependencyNS::None>& pressure_at_quad_pt,
......@@ -53,10 +52,9 @@ namespace HappyHeart
template
<
class PoroHyperelasticLawT,
MeshIndex MeshIndexT,
DataNS::TimeLabel TimeLabelT
>
const std::string& UpdatePressureAtQuadPt<PoroHyperelasticLawT, MeshIndexT, TimeLabelT>::ClassName()
const std::string& UpdatePressureAtQuadPt<PoroHyperelasticLawT, TimeLabelT>::ClassName()
{
static std::string name("UpdatePressureAtQuadPt");
return name;
......@@ -66,10 +64,9 @@ namespace HappyHeart
template
<
class PoroHyperelasticLawT,
MeshIndex MeshIndexT,
DataNS::TimeLabel TimeLabelT
>
inline void UpdatePressureAtQuadPt<PoroHyperelasticLawT, MeshIndexT, TimeLabelT>
inline void UpdatePressureAtQuadPt<PoroHyperelasticLawT, TimeLabelT>
::Update(const GlobalVector& displacement_increment) const
{
return parent::UpdateImpl(displacement_increment);
......@@ -79,10 +76,9 @@ namespace HappyHeart
template
<
class PoroHyperelasticLawT,
MeshIndex MeshIndexT,
DataNS::TimeLabel TimeLabelT
>
inline void UpdatePressureAtQuadPt<PoroHyperelasticLawT, MeshIndexT, TimeLabelT>
inline void UpdatePressureAtQuadPt<PoroHyperelasticLawT, TimeLabelT>
::SetComputeEltArrayArguments(const LocalFEltSpace& local_felt_space,
local_operator_type& local_operator,
std::tuple<const GlobalVector&>&& additional_arguments) const
......@@ -97,11 +93,10 @@ namespace HappyHeart
template
<
class PoroHyperelasticLawT,
MeshIndex MeshIndexT,
DataNS::TimeLabel TimeLabelT
>
inline const ParameterAtQuadraturePoint<ParameterNS::Type::scalar, ParameterNS::TimeDependencyNS::None>&
UpdatePressureAtQuadPt<PoroHyperelasticLawT, MeshIndexT, TimeLabelT>::GetPressureAtQuadPt() const noexcept
UpdatePressureAtQuadPt<PoroHyperelasticLawT, TimeLabelT>::GetPressureAtQuadPt() const noexcept
{
return pressure_at_quad_pt_;
}
......
Supports Markdown
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