Commit 18ea1c79 authored by GILLES Sebastien's avatar GILLES Sebastien
Browse files

#1022 Remove now unused arguments.

parent 278d7843
......@@ -96,7 +96,6 @@ namespace HappyHeart
const ParameterAtDof<ParameterNS::Type::vector>& velSHalfVhfr,
const ParameterAtDof<ParameterNS::Type::vector>& velFtr,
double internal_friction,
const HyperelasticLawT& law,
const cauchy_green_tensor_type& cauchy_green_tensor,
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, DataNS::TimeLabel2::new_value>& update_pressure_operator,
const TimeManager& time_manager,
......
......@@ -34,7 +34,6 @@ namespace HappyHeart
const ParameterAtDof<ParameterNS::Type::vector>& velSHalfVhfr,
const ParameterAtDof<ParameterNS::Type::vector>& velFtr,
const double internal_friction,
const HyperelasticLawT& law,
const cauchy_green_tensor_type& cauchy_green_tensor,
GlobalParameterOperatorNS::UpdatePressureAtQuadPt<HyperelasticLawT, DataNS::TimeLabel2::new_value>& update_pressure_operator,
const TimeManager& time_manager,
......@@ -44,7 +43,6 @@ namespace HappyHeart
std::move(quadrature_rule_per_topology),
AllocateGradientFEltPhi::yes,
DoComputeProcessorWiseLocal2Global::no,
felt_space.GetGodOfDofFromWeakPtr()->GetGeometricMeshRegion(),
time_manager,
density,
porosity,
......@@ -52,7 +50,6 @@ namespace HappyHeart
velSHalfVhfr,
velFtr,
internal_friction,
law,
cauchy_green_tensor,
update_pressure_operator.GetPressureAtQuadPt()),
velocity_solution_(velocity_solution),
......
......@@ -96,7 +96,6 @@ namespace HappyHeart
*/
explicit Darcy(const ExtendedUnknown::vector_const_shared_ptr& unknown_list,
typename parent::elementary_data_type&& elementary_data,
const GeometricMeshRegion& mesh,
const TimeManager& time_manager,
const ScalarParameter<>& density,
const ParameterAtDof<ParameterNS::Type::scalar, ParameterNS::TimeDependencyNS::None, 2u>& porosity,
......@@ -104,7 +103,6 @@ namespace HappyHeart
const ParameterAtDof<ParameterNS::Type::vector>& velSHalfVhf,
const ParameterAtDof<ParameterNS::Type::vector>& velFtr,
double internal_friction,
const HyperelasticLawT& law,
const cauchy_green_tensor_type& cauchy_green_tensor,
const ParameterAtQuadraturePoint<::HappyHeart::ParameterNS::Type::scalar>& pressure_at_quad_pt);
......
......@@ -28,7 +28,6 @@ namespace HappyHeart
template<class HyperelasticLawT>
Darcy<HyperelasticLawT>::Darcy(const ExtendedUnknown::vector_const_shared_ptr& unknown_list,
typename parent::elementary_data_type&& a_elementary_data,
const GeometricMeshRegion& mesh,
const TimeManager& time_manager,
const ScalarParameter<>& density,
const ParameterAtDof<ParameterNS::Type::scalar, ParameterNS::TimeDependencyNS::None, 2u>& porosity,
......@@ -36,7 +35,6 @@ namespace HappyHeart
const ParameterAtDof<ParameterNS::Type::vector>& velSHalfVhfr,
const ParameterAtDof<ParameterNS::Type::vector>& velFtr,
const double internal_friction,
const HyperelasticLawT& law,
const cauchy_green_tensor_type& cauchy_green_tensor,
const ParameterAtQuadraturePoint<::HappyHeart::ParameterNS::Type::scalar>& pressure_at_quad_pt)
: parent(unknown_list, std::move(a_elementary_data)),
......
......@@ -282,6 +282,7 @@ namespace HappyHeart
t21_on_fluid_mesh.ZeroEntries(__FILE__, __LINE__);
{
// T21 SHOULD BE ON SOLID MESH!
GlobalMatrixWithCoefficient matrix_with_coeff(t21_on_fluid_mesh, 1.);
GetT21Operator().Assemble(std::make_tuple(std::ref(matrix_with_coeff)));
}
......
......@@ -236,7 +236,6 @@ namespace HappyHeart
solid_velocity_data.GetHalfSumOnFluidAsParam(),
fluid_velocity_data.GetVelFtrAsParam(),
GetInternalFriction(),
GetHyperelasticLaw(),
this->GetCauchyGreenTensor(),
this->GetNonCstNewFluidPressureData().GetNonCstUpdatePressureParamOnFluidNew(),
parent::GetTimeManager());
......
......@@ -174,16 +174,15 @@ namespace HappyHeart
// a one computed on fluid should be used (the latter seems more logical).
delta_darcy_operator_ =
std::make_unique<darcy_operator_type>(monolithic_felt_space,
fluid_velocity,
variable_holder.template GetFluidDensity<MeshIndex::fluid>(),
porosity,
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!
GetInternalFriction(),
GetHyperelasticLaw(),
this->GetCauchyGreenTensor(),
this->GetNonCstNewFluidPressureData().GetNonCstUpdatePressureParamOnFluidNew(), parent::GetTimeManager());
fluid_velocity,
variable_holder.template GetFluidDensity<MeshIndex::fluid>(),
porosity,
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!
GetInternalFriction(),
this->GetCauchyGreenTensor(),
this->GetNonCstNewFluidPressureData().GetNonCstUpdatePressureParamOnFluidNew(), parent::GetTimeManager());
differential_darcy_operator_ =
std::make_unique<differential_darcy_operator_type>(monolithic_felt_space,
......
......@@ -111,7 +111,7 @@ namespace HappyHeart
{
using type = InputParameter::PoromechanicsNS::PenalizationPorosity;
penalization_porosity_ = InitScalarParameterFromInputData<type>("Penalization porosity",
fluid_domain,
solid_domain,
input_parameter_data);
}
......
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