Commit 86eec6ac authored by GILLES Sebastien's avatar GILLES Sebastien
Browse files

#1022 HybridVector and Darcy: remove former fluid pressure data.

parent f700b505
......@@ -95,7 +95,6 @@ namespace HappyHeart
const ParameterAtDof<ParameterNS::Type::vector>& velocity_solution,
const ParameterAtDof<ParameterNS::Type::vector>& velSHalfVhfr,
const ParameterAtDof<ParameterNS::Type::vector>& velFtr,
const ParameterAtDof<ParameterNS::Type::scalar>& pressure_solution,
double internal_friction,
const HyperelasticLawT& law,
const cauchy_green_tensor_type& cauchy_green_tensor,
......
......@@ -33,7 +33,6 @@ namespace HappyHeart
const ParameterAtDof<ParameterNS::Type::vector>& velocity_solution,
const ParameterAtDof<ParameterNS::Type::vector>& velSHalfVhfr,
const ParameterAtDof<ParameterNS::Type::vector>& velFtr,
const ParameterAtDof<ParameterNS::Type::scalar>& pressure_solution,
const double internal_friction,
const HyperelasticLawT& law,
const cauchy_green_tensor_type& cauchy_green_tensor,
......@@ -52,7 +51,6 @@ namespace HappyHeart
velocity_solution,
velSHalfVhfr,
velFtr,
pressure_solution,
internal_friction,
law,
cauchy_green_tensor,
......
......@@ -103,7 +103,6 @@ namespace HappyHeart
const ParameterAtDof<ParameterNS::Type::vector>& velocity_solution,
const ParameterAtDof<ParameterNS::Type::vector>& velSHalfVhf,
const ParameterAtDof<ParameterNS::Type::vector>& velFtr,
const ParameterAtDof<ParameterNS::Type::scalar>& pressure_solution,
double internal_friction,
const HyperelasticLawT& law,
const cauchy_green_tensor_type& cauchy_green_tensor,
......@@ -153,9 +152,6 @@ namespace HappyHeart
//! \todo #820 Change name...
const ParameterAtDof<ParameterNS::Type::vector>& GetVelSHalfVhf() const noexcept;
//! \todo #820 Document...
const ParameterAtDof<ParameterNS::Type::scalar>& GetPressureSolution() const noexcept;
//! Time manager.
const TimeManager& GetTimeManager() const noexcept;
......@@ -185,9 +181,6 @@ namespace HappyHeart
const ParameterAtDof<ParameterNS::Type::vector>& velFtr_;
//! \todo #820 Document...
const ParameterAtDof<ParameterNS::Type::scalar>& pressure_solution_;
//! Time manager.
const TimeManager& time_manager_;
......
......@@ -35,7 +35,6 @@ namespace HappyHeart
const ParameterAtDof<ParameterNS::Type::vector>& velocity_solution,
const ParameterAtDof<ParameterNS::Type::vector>& velSHalfVhfr,
const ParameterAtDof<ParameterNS::Type::vector>& velFtr,
const ParameterAtDof<ParameterNS::Type::scalar>& pressure_solution,
const double internal_friction,
const HyperelasticLawT& law,
const cauchy_green_tensor_type& cauchy_green_tensor,
......@@ -47,7 +46,6 @@ namespace HappyHeart
velocity_solution_(velocity_solution),
velSHalfVhf_(velSHalfVhfr),
velFtr_(velFtr),
pressure_solution_(pressure_solution),
time_manager_(time_manager),
density_(density),
pressure_at_quad_pt_(pressure_at_quad_pt)
......@@ -85,7 +83,6 @@ namespace HappyHeart
decltype(auto) velocity_solution = GetVelocitySolution();
decltype(auto) velSHalfVhf = GetVelSHalfVhf();
decltype(auto) pressure_solution = GetPressureSolution();
decltype(auto) velFtr = velFtr_;
const auto time_step = GetTimeManager().GetTimeStep();
......@@ -114,13 +111,9 @@ namespace HappyHeart
decltype(auto) new_velocity = velocity_solution.GetValue(quad_pt, geom_elt);
decltype(auto) velSHalfVhf_value = velSHalfVhf.GetValue(quad_pt, geom_elt);
const auto new_pressure = pressure_solution.GetValue(quad_pt, geom_elt);
const auto density_value = density.GetValue(quad_pt, geom_elt);
// std::cout << "PRESSURE IN DARCY -> " << new_pressure << "\t"
// << pressure_at_quad_pt.GetValue(quad_pt, geom_elt) * density_value << std::endl;
const auto pressure_value = pressure_at_quad_pt.GetValue(quad_pt, geom_elt);
decltype(auto) velFtr_value = velFtr.GetValue(quad_pt, geom_elt);
......@@ -197,14 +190,7 @@ namespace HappyHeart
return velocity_solution_;
}
template<class HyperelasticLawT>
inline const ParameterAtDof<ParameterNS::Type::scalar>& Darcy<HyperelasticLawT>::GetPressureSolution() const noexcept
{
return pressure_solution_;
}
template<class HyperelasticLawT>
inline const TimeManager& Darcy<HyperelasticLawT>::GetTimeManager() const noexcept
{
......
......@@ -101,7 +101,6 @@ namespace HappyHeart
const ScalarParameter<>& density,
const ParameterAtDof<ParameterNS::Type::scalar, ParameterNS::TimeDependencyNS::None, 2u>& porosity,
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, DataNS::TimeLabel2::current>& update_current_pressure_operator,
const ParameterAtDof<ParameterNS::Type::scalar>& current_fluid_pressure,
double fluid_source_term,
const QuadratureRulePerTopology* const quadrature_rule_per_topology = nullptr);
......
......@@ -40,7 +40,6 @@ namespace HappyHeart
const ScalarParameter<>& density,
const ParameterAtDof<ParameterNS::Type::scalar, ParameterNS::TimeDependencyNS::None, 2u>& porosity,
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, DataNS::TimeLabel2::current>& update_current_pressure_operator,
const ParameterAtDof<ParameterNS::Type::scalar>& current_fluid_pressure,
double fluid_source_term,
const QuadratureRulePerTopology* const quadrature_rule_per_topology)
: parent(felt_space,
......@@ -52,7 +51,6 @@ namespace HappyHeart
density,
porosity,
update_current_pressure_operator.GetPressureAtQuadPt(),
current_fluid_pressure,
fluid_source_term),
update_current_pressure_operator_(update_current_pressure_operator)
{
......
......@@ -96,7 +96,6 @@ namespace HappyHeart
const ScalarParameter<>& density,
const ParameterAtDof<ParameterNS::Type::scalar, ParameterNS::TimeDependencyNS::None, 2u>& porosity,
const ParameterAtQuadraturePoint<::HappyHeart::ParameterNS::Type::scalar>& pressure_at_quad_pt,
const ParameterAtDof<ParameterNS::Type::scalar>& current_fluid_pressure,
double fluid_source_term);
//! Destructor.
......@@ -137,9 +136,6 @@ namespace HappyHeart
//! Fluid source term ('beta' in Freefem).
double GetFluidSourceTerm() const noexcept;
//! Current fluid pressure.
const ParameterAtDof<ParameterNS::Type::scalar>& GetCurrentFluidPressure() const noexcept;
//! Pressure at quadrature point.
const ParameterAtQuadraturePoint<::HappyHeart::ParameterNS::Type::scalar>& GetPressureAtQuadPt() const noexcept;
......@@ -159,9 +155,6 @@ namespace HappyHeart
//!
std::vector<double> current_local_velocity_;
//! Current fluid pressure.
const ParameterAtDof<ParameterNS::Type::scalar>& current_fluid_pressure_;
//! Fluid source term ('beta' in Freefem).
const double fluid_source_term_;
......
......@@ -38,12 +38,10 @@ namespace HappyHeart
const ScalarParameter<>& density,
const ParameterAtDof<ParameterNS::Type::scalar, ParameterNS::TimeDependencyNS::None, 2u>& porosity,
const ParameterAtQuadraturePoint<::HappyHeart::ParameterNS::Type::scalar>& pressure_at_quad_pt,
const ParameterAtDof<ParameterNS::Type::scalar>& current_fluid_pressure,
double fluid_source_term)
: parent(unknown_list, std::move(a_elementary_data)),
porosity_parent(porosity),
density_(density),
current_fluid_pressure_(current_fluid_pressure),
fluid_source_term_(fluid_source_term),
pressure_at_quad_pt_(pressure_at_quad_pt)
{
......@@ -85,7 +83,6 @@ namespace HappyHeart
decltype(auto) local_velocity = GetCurrentLocalVelocity();
const auto fluid_source_term = GetFluidSourceTerm();
decltype(auto) current_fluid_pressure = GetCurrentFluidPressure();
decltype(auto) pressure_at_quad_pt = GetPressureAtQuadPt();
......@@ -176,14 +173,6 @@ namespace HappyHeart
return fluid_source_term_;
}
template<class HyperelasticLawT>
inline const ParameterAtDof<ParameterNS::Type::scalar>& HybridVector<HyperelasticLawT>
::GetCurrentFluidPressure() const noexcept
{
return current_fluid_pressure_;
}
template<class HyperelasticLawT>
inline const ParameterAtQuadraturePoint<::HappyHeart::ParameterNS::Type::scalar>&
......
......@@ -261,7 +261,6 @@ namespace HappyHeart
fluid_velocity_data.GetNewAsParam(),
solid_velocity_data.GetHalfSumOnFluidAsParam(),
fluid_velocity_data.GetVelFtrAsParam(),
fluid_pressure_data.GetNewAsParam(),
GetInternalFriction(),
GetHyperelasticLaw(),
this->GetCauchyGreenTensor(),
......@@ -280,7 +279,6 @@ namespace HappyHeart
variable_holder.GetFluidDensity(),
porosity,
new_fluid_pressure_data.GetNonCstUpdatePressureParamOnFluidCurrent(),
fluid_pressure_data.GetCurrentAsParam(),
fluid_source_term);
......
......@@ -182,7 +182,6 @@ namespace HappyHeart
fluid_velocity_data.GetDeltaAsParam(),
solid_velocity_data.GetHalfSumOnFluidAsParam(), // \todo #820 not elegant: it is not used as IsFullDarcy should be no... but if the user is wrong it might appear nonetheless! The IsFullDarcy option should be in constructor, even if that means creating more darcy objects.
fluid_velocity_data.GetVelFtrAsParam(), // \todo #820 Likewise!
fluid_pressure_data.GetNewAsParam(),
GetInternalFriction(),
GetHyperelasticLaw(),
this->GetCauchyGreenTensor(),
......
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