Commit 80d75111 authored by GILLES Sebastien's avatar GILLES Sebastien
Browse files

#1022 FluidPressure: remove accessors to parameters on fluid.

parent 86eec6ac
......@@ -62,31 +62,7 @@ namespace HappyHeart
decltype(auto) fluid_pressure_unknown =
unknown_manager.GetUnknown(EnumUnderlyingType(UnknownIndex::fluid_pressure));
{
using scalar_at_dof_type = ParameterAtDof<ParameterNS::Type::scalar>;
decltype(auto) mesh = fluid_god_of_dof.GetGeometricMeshRegion();
decltype(auto) monolithic_felt_space =
fluid_god_of_dof.GetFEltSpace(EnumUnderlyingType(FEltSpaceIndex::fluid_monolithic));
decltype(auto) felt_space =
fluid_god_of_dof.GetFEltSpace(EnumUnderlyingType(FEltSpaceIndex::fluid));
new_as_param_ = std::make_unique<scalar_at_dof_type>("New fluid pressure",
mesh,
monolithic_felt_space,
fluid_pressure_unknown,
monolithic_data.GetNew());
current_as_param_ = std::make_unique<scalar_at_dof_type>("Current fluid pressure",
mesh,
felt_space,
fluid_pressure_unknown,
GetCurrent());
}
{
decltype(auto) solid_god_of_dof =
god_of_dof_manager.GetGodOfDof(EnumUnderlyingType(MeshIndex::solid));
......
......@@ -176,23 +176,7 @@ namespace HappyHeart
public:
/*!
* \name Accessors to Parameters defined upon NumberingSubsetIndex::fluid_pressure. vectors.
*/
///@{
//! \todo #820 Document.
const ParameterAtDof<ParameterNS::Type::scalar>& GetNewAsParam() const noexcept;
//! Current as parameter.
const ParameterAtDof<ParameterNS::Type::scalar>& GetCurrentAsParam() const noexcept;
///@}
private:
......@@ -248,20 +232,6 @@ namespace HappyHeart
*/
///@{
/*!
* //! \todo #820 Document.
*
* \attention This one actually uses up the monolithic data as in current state the extracted pressure
* is not guaranteed to be up-to-date.
*/
ParameterAtDof<ParameterNS::Type::scalar>::const_unique_ptr new_as_param_ = nullptr;
/*!
* \brief Parameter over current value.
*
*/
ParameterAtDof<ParameterNS::Type::scalar>::const_unique_ptr current_as_param_ = nullptr;
/*!
......
......@@ -24,24 +24,7 @@ namespace HappyHeart
{
inline const ParameterAtDof<ParameterNS::Type::scalar>& FluidPressure
::GetNewAsParam() const noexcept
{
Reevaluate(); // lazy reevaluation may occur here.
assert(!(!new_as_param_));
return *new_as_param_;
}
inline const ParameterAtDof<ParameterNS::Type::scalar>& FluidPressure
::GetCurrentAsParam() const noexcept
{
assert(!(!current_as_param_));
return *current_as_param_;
}
inline const ParameterAtDof<ParameterNS::Type::scalar>& FluidPressure
::GetNewOnSolidAsParam() const noexcept
{
......
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