Commit 7e5c2682 authored by GILLES Sebastien's avatar GILLES Sebastien
Browse files

#1022 Split TimeLabel into two enums to avoid ambiguities about whether former...

#1022 Split TimeLabel into two enums to avoid ambiguities about whether former is a valid choice or not.
parent 87fde1cc
......@@ -34,7 +34,9 @@ namespace HappyHeart
{
enum class TimeLabel
//! Useful tag for time label, in cases there are three possible values.
enum class TimeLabel3
{
new_value = 0,
current,
......@@ -42,6 +44,14 @@ namespace HappyHeart
};
//! Useful tag for time label, in cases there are two possible values.
enum class TimeLabel2
{
new_value = EnumUnderlyingType(TimeLabel3::new_value),
current = EnumUnderlyingType(TimeLabel3::current),
};
/*!
* \brief Class in charge of holding the various fluid mass vectors and parameters that might be used in
......@@ -256,7 +266,7 @@ namespace HappyHeart
* \brief Get the relevant difference given time label; mesh is alwasy solid one here.
*
*/
const ParameterAtDof<ParameterNS::Type::scalar>& GetDifferenceAsParam(DataNS::TimeLabel time_label) const noexcept;
const ParameterAtDof<ParameterNS::Type::scalar>& GetDifferenceAsParam(DataNS::TimeLabel2 time_label) const noexcept;
private:
......
......@@ -183,17 +183,14 @@ namespace HappyHeart
inline const ParameterAtDof<ParameterNS::Type::scalar>& Fluidmass
::GetDifferenceAsParam(const DataNS::TimeLabel time_label) const noexcept
::GetDifferenceAsParam(const DataNS::TimeLabel2 time_label) const noexcept
{
switch(time_label)
{
case DataNS::TimeLabel::new_value:
case DataNS::TimeLabel2::new_value:
return GetNewMinusCurrentOnSolidAsParam();
case DataNS::TimeLabel::current:
case DataNS::TimeLabel2::current:
return GetCurrentMinusFormerOnSolidAsParam();
case DataNS::TimeLabel::former:
assert(false && "Wouldn't make sense ('new_value' gives val{n+1} - val{n} and 'current'val{n} - val{n - 1}).");
exit(EXIT_FAILURE);
}
assert(false);
......
......@@ -42,7 +42,7 @@ namespace HappyHeart
//! Alias to pressure parameter operator.
template
<
TimeLabel TimeLabelT
TimeLabel2 TimeLabelT
>
using pressure_parameter_operator_type =
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, TimeLabelT>;
......@@ -87,28 +87,28 @@ namespace HappyHeart
public:
//! Operator which updates pressure parameter on solid mesh.
pressure_parameter_operator_type<TimeLabel::new_value>& GetNonCstUpdatePressureParamOnSolid() noexcept;
pressure_parameter_operator_type<TimeLabel2::new_value>& GetNonCstUpdatePressureParamOnSolid() noexcept;
//! Operator which updates pressure parameter on solid mesh.
pressure_parameter_operator_type<TimeLabel::new_value>& GetNonCstUpdatePressureParamOnFluid() noexcept;
pressure_parameter_operator_type<TimeLabel2::new_value>& GetNonCstUpdatePressureParamOnFluid() noexcept;
//! Hyperelastic law.
const HyperelasticLawT& GetHyperelasticLaw() const noexcept;
private:
//! Pressure parameter.
typename pressure_parameter_type::unique_ptr pressure_parameter_on_solid_ = nullptr;
//! Operator which updates pressure parameter.
typename pressure_parameter_operator_type<TimeLabel::new_value>::unique_ptr update_pressure_param_on_solid_ = nullptr;
typename pressure_parameter_operator_type<TimeLabel2::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<TimeLabel::new_value>::unique_ptr update_pressure_param_on_fluid_ = nullptr;
typename pressure_parameter_operator_type<TimeLabel2::new_value>::unique_ptr update_pressure_param_on_fluid_ = nullptr;
//! Hyperelastic law.
const HyperelasticLawT& hyperelastic_law_;
......
......@@ -66,12 +66,13 @@ namespace HappyHeart
decltype(auto) hyperelastic_law = GetHyperelasticLaw();
update_pressure_param_on_solid_ =
std::make_unique<pressure_parameter_operator_type<TimeLabel::new_value>>(solid_felt_space,
std::make_unique<pressure_parameter_operator_type<TimeLabel2::new_value>>(solid_felt_space,
solid_displacement_unknown,
*pressure_parameter_on_solid_,
hyperelastic_law,
this->GetCauchyGreenTensor());
decltype(auto) fluid_felt_space =
fluid_god_of_dof.GetFEltSpace(EnumUnderlyingType(FEltSpaceIndex::fluid));
......@@ -83,7 +84,7 @@ namespace HappyHeart
time_manager);
update_pressure_param_on_fluid_ =
std::make_unique<pressure_parameter_operator_type<TimeLabel::new_value>>(fluid_felt_space,
std::make_unique<pressure_parameter_operator_type<TimeLabel2::new_value>>(fluid_felt_space,
solid_displacement_unknown,
*pressure_parameter_on_fluid_,
hyperelastic_law,
......@@ -100,7 +101,7 @@ namespace HappyHeart
template<class HyperelasticLawT>
typename NewFluidPressure<HyperelasticLawT>::template pressure_parameter_operator_type<TimeLabel::new_value>&
typename NewFluidPressure<HyperelasticLawT>::template pressure_parameter_operator_type<TimeLabel2::new_value>&
NewFluidPressure<HyperelasticLawT>::GetNonCstUpdatePressureParamOnSolid() noexcept
{
assert(!(!update_pressure_param_on_solid_));
......@@ -109,7 +110,7 @@ namespace HappyHeart
template<class HyperelasticLawT>
typename NewFluidPressure<HyperelasticLawT>::template pressure_parameter_operator_type<TimeLabel::new_value>&
typename NewFluidPressure<HyperelasticLawT>::template pressure_parameter_operator_type<TimeLabel2::new_value>&
NewFluidPressure<HyperelasticLawT>::GetNonCstUpdatePressureParamOnFluid() noexcept
{
assert(!(!update_pressure_param_on_fluid_));
......
......@@ -119,39 +119,39 @@ namespace HappyHeart
double W(const InvariantHolder& invariant_holder,
const QuadraturePoint& quadrature_point,
const GeometricElt& geom_elt,
DataNS::TimeLabel time_label = DataNS::TimeLabel::new_value) const;
DataNS::TimeLabel3 time_label = DataNS::TimeLabel3::new_value) const;
//! Part of W not present in the 'classic' PoroHyperelasticLaw law.
double Wbulk(const InvariantHolder& invariant_holder,
const QuadraturePoint& quadrature_point,
const GeometricElt& geom_elt,
DataNS::TimeLabel time_label = DataNS::TimeLabel::new_value) const;
DataNS::TimeLabel3 time_label = DataNS::TimeLabel3::new_value) const;
//! Derivative of W with respect of third invariant (dWdI3).
double FirstDerivativeWThirdInvariant(const InvariantHolder& invariant_holder,
const QuadraturePoint& quadrature_point,
const GeometricElt& geom_elt,
DataNS::TimeLabel time_label = DataNS::TimeLabel::new_value) const;
DataNS::TimeLabel3 time_label = DataNS::TimeLabel3::new_value) const;
//! Second derivative of W with respect of third invariant (d2WdI3dI3).
double SecondDerivativeWThirdInvariant(const InvariantHolder& invariant_holder,
const QuadraturePoint& quadrature_point,
const GeometricElt& geom_elt,
DataNS::TimeLabel time_label = DataNS::TimeLabel::new_value) const;
DataNS::TimeLabel3 time_label = DataNS::TimeLabel3::new_value) const;
//! Derivative of W with respect of fluid mass.
double FirstDerivativeWFluidMass(const InvariantHolder& invariant_holder,
const QuadraturePoint& quadrature_point,
const GeometricElt& geom_elt,
DataNS::TimeLabel time_label = DataNS::TimeLabel::new_value) const;
DataNS::TimeLabel3 time_label = DataNS::TimeLabel3::new_value) const;
//! Second derivative of W with respect of fluid mass.
double SecondDerivativeWwrtFluidMass(const InvariantHolder& invariant_holder,
const QuadraturePoint& quadrature_point,
const GeometricElt& geom_elt,
DataNS::TimeLabel time_label = DataNS::TimeLabel::new_value) const;
DataNS::TimeLabel3 time_label = DataNS::TimeLabel3::new_value) const;
//! Second derivative of W with respect of fluid mass and first invariant.
static constexpr double SecondDerivativeWwrtFirstInvariantAndFluidMass(const InvariantHolder& invariant_holder,
......@@ -167,7 +167,7 @@ namespace HappyHeart
double SecondDerivativeWwrtThirdInvariantAndFluidMass(const InvariantHolder& invariant_holder,
const QuadraturePoint& quadrature_point,
const GeometricElt& geom_elt,
DataNS::TimeLabel time_label = DataNS::TimeLabel::new_value) const;
DataNS::TimeLabel3 time_label = DataNS::TimeLabel3::new_value) const;
//! Accessor to fluidmass data.
......@@ -179,7 +179,7 @@ namespace HappyHeart
const ScalarParameter<>& GetBulkSolid() const noexcept;
//! Fluid mass.
const ParameterAtDof<ParameterNS::Type::scalar>& GetFluidMass(DataNS::TimeLabel time_label) const noexcept;
const ParameterAtDof<ParameterNS::Type::scalar>& GetFluidMass(DataNS::TimeLabel3 time_label) const noexcept;
/*!
* \brief Initial porosity.
......
......@@ -50,7 +50,7 @@ namespace HappyHeart
double PoroHyperelasticLaw<HyperelasticLawT>::Wbulk(const InvariantHolder& invariant_holder,
const QuadraturePoint& quadrature_point,
const GeometricElt& geom_elt,
DataNS::TimeLabel time_label) const
DataNS::TimeLabel3 time_label) const
{
const double sqrt_I3 = std::sqrt(invariant_holder.GetInvariant<3>());
......@@ -84,7 +84,7 @@ namespace HappyHeart
double PoroHyperelasticLaw<HyperelasticLawT>::FirstDerivativeWThirdInvariant(const InvariantHolder& invariant_holder,
const QuadraturePoint& quadrature_point,
const GeometricElt& geom_elt,
DataNS::TimeLabel time_label) const
DataNS::TimeLabel3 time_label) const
{
double ret = GetOriginalLaw().FirstDerivativeWThirdInvariant(invariant_holder,
quadrature_point,
......@@ -116,7 +116,7 @@ namespace HappyHeart
double PoroHyperelasticLaw<HyperelasticLawT>::SecondDerivativeWThirdInvariant(const InvariantHolder& invariant_holder,
const QuadraturePoint& quadrature_point,
const GeometricElt& geom_elt,
DataNS::TimeLabel time_label) const
DataNS::TimeLabel3 time_label) const
{
double ret = GetOriginalLaw().SecondDerivativeWThirdInvariant(invariant_holder, quadrature_point, geom_elt);
......@@ -149,7 +149,7 @@ namespace HappyHeart
double PoroHyperelasticLaw<HyperelasticLawT>::FirstDerivativeWFluidMass(const InvariantHolder& invariant_holder,
const QuadraturePoint& quadrature_point,
const GeometricElt& geom_elt,
DataNS::TimeLabel time_label) const
DataNS::TimeLabel3 time_label) const
{
const double bulk_solid = GetBulkSolid().GetValue(quadrature_point, geom_elt);
......@@ -182,7 +182,7 @@ namespace HappyHeart
double PoroHyperelasticLaw<HyperelasticLawT>::SecondDerivativeWwrtFluidMass(const InvariantHolder& invariant_holder,
const QuadraturePoint& quadrature_point,
const GeometricElt& geom_elt,
DataNS::TimeLabel time_label) const
DataNS::TimeLabel3 time_label) const
{
const double bulk_solid = GetBulkSolid().GetValue(quadrature_point, geom_elt);
......@@ -210,7 +210,7 @@ namespace HappyHeart
::SecondDerivativeWwrtThirdInvariantAndFluidMass(const InvariantHolder& invariant_holder,
const QuadraturePoint& quadrature_point,
const GeometricElt& geom_elt,
DataNS::TimeLabel time_label) const
DataNS::TimeLabel3 time_label) const
{
const double bulk_solid = GetBulkSolid().GetValue(quadrature_point, geom_elt);
......@@ -231,15 +231,15 @@ namespace HappyHeart
template<class HyperelasticLawT>
const ParameterAtDof<ParameterNS::Type::scalar>& PoroHyperelasticLaw<HyperelasticLawT>
::GetFluidMass(DataNS::TimeLabel time_label) const noexcept
::GetFluidMass(DataNS::TimeLabel3 time_label) const noexcept
{
switch(time_label)
{
case DataNS::TimeLabel::new_value:
case DataNS::TimeLabel3::new_value:
return fluid_mass_data_.GetNewAsParam();
case DataNS::TimeLabel::current:
case DataNS::TimeLabel3::current:
return fluid_mass_data_.GetCurrentAsParam();
case DataNS::TimeLabel::former:
case DataNS::TimeLabel3::former:
return fluid_mass_data_.GetFormerAsParam();
}
......@@ -252,7 +252,7 @@ namespace HappyHeart
inline double PoroHyperelasticLaw<HyperelasticLawT>::W(const InvariantHolder& invariant_holder,
const QuadraturePoint& quadrature_point,
const GeometricElt& geom_elt,
DataNS::TimeLabel time_label) const
DataNS::TimeLabel3 time_label) const
{
double ret = GetOriginalLaw().W(invariant_holder, quadrature_point, geom_elt);
ret += Wbulk(invariant_holder, quadrature_point, geom_elt, time_label);
......
......@@ -99,7 +99,7 @@ namespace HappyHeart
double internal_friction,
const HyperelasticLawT& law,
const cauchy_green_tensor_type& cauchy_green_tensor,
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, DataNS::TimeLabel::new_value>& update_pressure_operator,
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, DataNS::TimeLabel2::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, DataNS::TimeLabel::new_value>& GetNonCstUpdatePressureOperator() const noexcept;
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, DataNS::TimeLabel2::new_value>& GetNonCstUpdatePressureOperator() const noexcept;
private:
//! Update pressure operator.
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, DataNS::TimeLabel::new_value>& update_pressure_operator_;
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, DataNS::TimeLabel2::new_value>& update_pressure_operator_;
};
......
......@@ -37,7 +37,7 @@ namespace HappyHeart
const double internal_friction,
const HyperelasticLawT& law,
const cauchy_green_tensor_type& cauchy_green_tensor,
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, DataNS::TimeLabel::new_value>& update_pressure_operator,
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, DataNS::TimeLabel2::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, DataNS::TimeLabel::new_value>&
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, DataNS::TimeLabel2::new_value>&
Darcy<HyperelasticLawT>
::GetNonCstUpdatePressureOperator() const noexcept
{
......
......@@ -93,7 +93,7 @@ namespace HappyHeart
const Unknown& pressure_unknown,
const GlobalVector& current_solid_displacement,
const ScalarParameter<>& fluid_density,
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, DataNS::TimeLabel::new_value>& update_pressure_operator,
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, DataNS::TimeLabel2::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, DataNS::TimeLabel::new_value>& GetNonCstUpdatePressureOperator() const noexcept;
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, DataNS::TimeLabel2::new_value>& GetNonCstUpdatePressureOperator() const noexcept;
private:
......@@ -152,7 +152,7 @@ namespace HappyHeart
const ExtendedUnknown& solid_displacement_unknown_;
//! Update pressure operator.
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, DataNS::TimeLabel::new_value>& update_pressure_operator_;
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, DataNS::TimeLabel2::new_value>& update_pressure_operator_;
};
......
......@@ -38,7 +38,7 @@ namespace HappyHeart
const Unknown& pressure_unknown,
const GlobalVector& current_solid_displacement,
const ScalarParameter<>& fluid_density,
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, DataNS::TimeLabel::new_value>& update_pressure_operator,
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, DataNS::TimeLabel2::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, DataNS::TimeLabel::new_value>&
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, DataNS::TimeLabel2::new_value>&
PressureContribToRhs<HyperelasticLawT>
::GetNonCstUpdatePressureOperator() const noexcept
{
......
......@@ -122,11 +122,11 @@ namespace HappyHeart
const double buf = (hyperelastic_law.Wbulk(invariant_holder,
quad_pt,
geom_elt,
DataNS::TimeLabel::new_value)
DataNS::TimeLabel3::new_value)
- hyperelastic_law.Wbulk(invariant_holder,
quad_pt,
geom_elt,
DataNS::TimeLabel::current)) / NumericNS::Square(diff_value);
DataNS::TimeLabel3::current)) / NumericNS::Square(diff_value);
hyperelastic_contrib -= buf;
};
......
......@@ -203,7 +203,7 @@ namespace HappyHeart
//! Alias to pressure parameter operator.
template
<
DataNS::TimeLabel TimeLabelT
DataNS::TimeLabel2 TimeLabelT
>
using pressure_parameter_operator_type =
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, TimeLabelT>;
......@@ -243,8 +243,8 @@ namespace HappyHeart
DataNS::Fluidmass& fluid_mass_data,
DataNS::SolidDisplacement& solid_displacement_data,
DataNS::SolidVelocity& solid_velocity_data,
pressure_parameter_operator_type<DataNS::TimeLabel::new_value>& pressure_on_solid_operator,
pressure_parameter_operator_type<DataNS::TimeLabel::new_value>& pressure_on_fluid_operator);
pressure_parameter_operator_type<DataNS::TimeLabel2::new_value>& pressure_on_solid_operator,
pressure_parameter_operator_type<DataNS::TimeLabel2::new_value>& pressure_on_fluid_operator);
//! Destructor.
......@@ -557,10 +557,10 @@ namespace HappyHeart
const HyperelasticLawT& GetHyperelasticLaw() const noexcept;
//! Operator which updates pressure parameter on solid mesh.
pressure_parameter_operator_type<DataNS::TimeLabel::new_value>& GetNonCstUpdatePressureParamOnSolid() noexcept;
pressure_parameter_operator_type<DataNS::TimeLabel2::new_value>& GetNonCstUpdatePressureParamOnSolid() noexcept;
//! Operator which updates pressure parameter on solid mesh.
pressure_parameter_operator_type<DataNS::TimeLabel::new_value>& GetNonCstUpdatePressureParamOnFluid() noexcept;
pressure_parameter_operator_type<DataNS::TimeLabel2::new_value>& GetNonCstUpdatePressureParamOnFluid() noexcept;
public:
......@@ -776,10 +776,10 @@ namespace HappyHeart
const NumberingSubset& numbering_subset_;
//! Operator which updates pressure parameter.
pressure_parameter_operator_type<DataNS::TimeLabel::new_value>& pressure_on_solid_operator_;
pressure_parameter_operator_type<DataNS::TimeLabel2::new_value>& pressure_on_solid_operator_;
//! Operator which updates pressure parameter.
pressure_parameter_operator_type<DataNS::TimeLabel::new_value>& pressure_on_fluid_operator_;
pressure_parameter_operator_type<DataNS::TimeLabel2::new_value>& pressure_on_fluid_operator_;
};
......
......@@ -373,7 +373,7 @@ namespace HappyHeart
template<class HyperelasticLawT>
inline typename VariationalFormulation<HyperelasticLawT>::template pressure_parameter_operator_type<DataNS::TimeLabel::new_value>&
inline typename VariationalFormulation<HyperelasticLawT>::template pressure_parameter_operator_type<DataNS::TimeLabel2::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<DataNS::TimeLabel::new_value>&
inline typename VariationalFormulation<HyperelasticLawT>::template pressure_parameter_operator_type<DataNS::TimeLabel2::new_value>&
VariationalFormulation<HyperelasticLawT>::GetNonCstUpdatePressureParamOnFluid() noexcept
{
return pressure_on_fluid_operator_;
......
......@@ -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<DataNS::TimeLabel::new_value>& pressure_on_solid_operator,
pressure_parameter_operator_type<DataNS::TimeLabel::new_value>& pressure_on_fluid_operator)
pressure_parameter_operator_type<DataNS::TimeLabel2::new_value>& pressure_on_solid_operator,
pressure_parameter_operator_type<DataNS::TimeLabel2::new_value>& pressure_on_fluid_operator)
: parent(mpi,
time_manager,
god_of_dof,
......
......@@ -170,7 +170,7 @@ namespace HappyHeart
//! Alias to pressure parameter operator.
template
<
DataNS::TimeLabel TimeLabelT
DataNS::TimeLabel2 TimeLabelT
>
using pressure_parameter_operator_type =
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, TimeLabelT>;
......@@ -213,7 +213,7 @@ namespace HappyHeart
DataNS::Monolithic& monolithic_data,
DataNS::Fluidmass& fluid_mass_data,
DataNS::FluidVelocity& fluid_velocity_data,
pressure_parameter_operator_type<DataNS::TimeLabel::new_value>& pressure_on_fluid_operator);
pressure_parameter_operator_type<DataNS::TimeLabel2::new_value>& pressure_on_fluid_operator);
//! Destructor.
~VariationalFormulation() = default;
......@@ -420,7 +420,7 @@ namespace HappyHeart
const GlobalVector& PerformImpl();
//! Operator which updates pressure parameter on solid mesh.
pressure_parameter_operator_type<DataNS::TimeLabel::new_value>& GetNonCstUpdatePressureParamOnFluid() noexcept;
pressure_parameter_operator_type<DataNS::TimeLabel2::new_value>& GetNonCstUpdatePressureParamOnFluid() noexcept;
private:
......@@ -537,7 +537,7 @@ namespace HappyHeart
///@}
//! Operator which updates pressure parameter.
pressure_parameter_operator_type<DataNS::TimeLabel::new_value>& pressure_on_fluid_operator_;
pressure_parameter_operator_type<DataNS::TimeLabel2::new_value>& pressure_on_fluid_operator_;
};
......
......@@ -285,7 +285,7 @@ namespace HappyHeart
template<class HyperelasticLawT>
inline typename VariationalFormulation<HyperelasticLawT>::template pressure_parameter_operator_type<DataNS::TimeLabel::new_value>&
inline typename VariationalFormulation<HyperelasticLawT>::template pressure_parameter_operator_type<DataNS::TimeLabel2::new_value>&
VariationalFormulation<HyperelasticLawT>::GetNonCstUpdatePressureParamOnFluid() noexcept
{
return pressure_on_fluid_operator_;
......
......@@ -49,7 +49,7 @@ namespace HappyHeart
DataNS::Monolithic& monolithic_data,
DataNS::Fluidmass& fluid_mass_data,
DataNS::FluidVelocity& fluid_velocity_data,
pressure_parameter_operator_type<DataNS::TimeLabel::new_value>& pressure_on_fluid_operator)
pressure_parameter_operator_type<DataNS::TimeLabel2::new_value>& pressure_on_fluid_operator)
: parent(mpi,
time_manager,
god_of_dof,
......
......@@ -36,7 +36,7 @@ namespace HappyHeart
template
<
class PoroHyperelasticLawT,
DataNS::TimeLabel TimeLabelT
DataNS::TimeLabel2 TimeLabelT
>
class UpdatePressureAtQuadPt final
: public Advanced::LocalParameterOperator<ParameterNS::Type::scalar>,
......
......@@ -25,7 +25,7 @@ namespace HappyHeart
template
<
class PoroHyperelasticLawT,
DataNS::TimeLabel TimeLabelT
DataNS::TimeLabel2 TimeLabelT
>
UpdatePressureAtQuadPt<PoroHyperelasticLawT, TimeLabelT>
::UpdatePressureAtQuadPt(const ExtendedUnknown::vector_const_shared_ptr& a_unknown_storage,
......@@ -50,7 +50,7 @@ namespace HappyHeart
template
<
class PoroHyperelasticLawT,