Commit 44c00182 authored by GILLES Sebastien's avatar GILLES Sebastien
Browse files

#820 Poromechanics: use the brand new ParameterAtDof from #875 to enable...

#820 Poromechanics: use the brand new ParameterAtDof from #875 to enable properly use of porosity in ImplicitFluid step.
parent 37569a73
......@@ -515,16 +515,16 @@ FiniteElementSpace11 = {
-- List of all unknowns defined in the finite element space. Unknowns here must be defined in this file as
-- an 'Unknown' block; expected name/identifier is the name given there.
-- Expected format: {"VALUE1", "VALUE2", ...}
unknown_list = { 'fluid_velocity'},
unknown_list = { 'fluid_velocity', 'porosity'},
-- List of the shape function to use for each unknown;
-- Expected format: {"VALUE1", "VALUE2", ...}
-- shape_function_list = { 'P2', 'P1' },
shape_function_list = { 'P1' },
shape_function_list = { 'P1', 'P1' },
-- List of the numbering subset to use for each unknown;
-- Expected format: {VALUE1, VALUE2, ...}
numbering_subset_list = { 10 }
numbering_subset_list = { 10, 13 }
}
......
......@@ -38,7 +38,7 @@ namespace HappyHeart
///@{
//! Constructor.
explicit Porosity(const ParameterAtDof<ParameterNS::Type::scalar>& porosity);
explicit Porosity(const ParameterAtDof<ParameterNS::Type::scalar, 2u>::type& porosity);
//! Destructor.
~Porosity() = default;
......@@ -60,12 +60,12 @@ namespace HappyHeart
protected:
//! Porosity.
const ParameterAtDof<ParameterNS::Type::scalar>& GetPorosity() const noexcept;
const ParameterAtDof<ParameterNS::Type::scalar, 2u>::type& GetPorosity() const noexcept;
private:
//! Porosity.
const ParameterAtDof<ParameterNS::Type::scalar>& porosity_;
const ParameterAtDof<ParameterNS::Type::scalar, 2u>::type& porosity_;
};
......
......@@ -26,13 +26,13 @@ namespace HappyHeart
template<class DerivedT>
Porosity<DerivedT>::Porosity(const ParameterAtDof<ParameterNS::Type::scalar>& porosity)
Porosity<DerivedT>::Porosity(const ParameterAtDof<ParameterNS::Type::scalar, 2u>::type& porosity)
: porosity_(porosity)
{ }
template<class DerivedT>
const ParameterAtDof<ParameterNS::Type::scalar>&
const ParameterAtDof<ParameterNS::Type::scalar, 2u>::type&
Porosity<DerivedT>::GetPorosity() const noexcept
{
return porosity_;
......
......@@ -27,8 +27,8 @@ namespace HappyHeart
const NumberingSubset& numbering_subset,
const TimeManager& time_manager,
const GodOfDof& god_of_dof,
const ParameterAtDof<ParameterNS::Type::scalar>& porosity,
const ParameterAtDof<ParameterNS::Type::scalar>& porosity_prev_time_it,
const ParameterAtDof<ParameterNS::Type::scalar, 2u>::type& porosity,
const ParameterAtDof<ParameterNS::Type::scalar, 2u>::type& porosity_prev_time_it,
const ScalarParameter& fluid_density,
const ScalarParameter& fluid_viscosity,
DirichletBoundaryCondition::vector_shared_ptr&& boundary_condition_list,
......
......@@ -101,8 +101,8 @@ namespace HappyHeart
const NumberingSubset& numbering_subset,
const TimeManager& time_manager,
const GodOfDof& god_of_dof,
const ParameterAtDof<ParameterNS::Type::scalar>& porosity,
const ParameterAtDof<ParameterNS::Type::scalar>& porosity_prev_time_it,
const ParameterAtDof<ParameterNS::Type::scalar, 2u>::type& porosity,
const ParameterAtDof<ParameterNS::Type::scalar, 2u>::type& porosity_prev_time_it,
const ScalarParameter& fluid_density,
const ScalarParameter& fluid_viscosity,
DirichletBoundaryCondition::vector_shared_ptr&& boundary_condition_list,
......@@ -231,7 +231,7 @@ namespace HappyHeart
const ScalarParameter& GetPseudoPoissonRatio() const noexcept;
//! Constant accessor to porosity from previous time iteration.
const ParameterAtDof<ParameterNS::Type::scalar>& GetPorosityPreviousTimeIteration() const noexcept;
const ParameterAtDof<ParameterNS::Type::scalar, 2u>::type& GetPorosityPreviousTimeIteration() const noexcept;
//! Constant accessor to the object which keeps track on solid displacement and velocity on fluid mesh.
const Private::SolidOnFluidMesh& GetSolidOnFluidMesh() const noexcept;
......@@ -291,7 +291,7 @@ namespace HappyHeart
//! Porosity from the previous time iteration.
const ParameterAtDof<ParameterNS::Type::scalar>& porosity_prev_time_it_;
const ParameterAtDof<ParameterNS::Type::scalar, 2u>::type& porosity_prev_time_it_;
//! Density of the fluid.
const ScalarParameter& fluid_density_;
......
......@@ -121,7 +121,7 @@ namespace HappyHeart
}
inline const ParameterAtDof<ParameterNS::Type::scalar>& ExplicitStepVariationalFormulation
inline const ParameterAtDof<ParameterNS::Type::scalar, 2u>::type& ExplicitStepVariationalFormulation
::GetPorosityPreviousTimeIteration() const noexcept
{
return porosity_prev_time_it_;
......
......@@ -27,7 +27,7 @@ namespace HappyHeart
const Unknown& velocity,
unsigned int geom_mesh_region_dimension,
const quadrature_rule_per_topology_type& quadrature_rule_per_topology,
const ParameterAtDof<ParameterNS::Type::scalar>& porosity,
const ParameterAtDof<ParameterNS::Type::scalar, 2u>::type& porosity,
const ScalarParameter& density)
: parent(felt_space,
velocity,
......
......@@ -70,7 +70,7 @@ namespace HappyHeart
const Unknown& velocity,
unsigned int geom_mesh_region_dimension,
const quadrature_rule_per_topology_type& quadrature_rule_per_topology,
const ParameterAtDof<ParameterNS::Type::scalar>& porosity,
const ParameterAtDof<ParameterNS::Type::scalar, 2u>::type& porosity,
const ScalarParameter& density);
......
......@@ -27,7 +27,7 @@ namespace HappyHeart
::GradOnGradientBasedElasticityTensor(const FEltSpace& felt_space,
const Unknown& vectorial_unknown,
const unsigned int geom_mesh_region_dimension,
const ParameterAtDof<ParameterNS::Type::scalar>& porosity,
const ParameterAtDof<ParameterNS::Type::scalar, 2u>::type& porosity,
const quadrature_rule_per_topology_type& quadrature_rule_per_topology,
DoComputeProcessorWiseLocal2Global do_consider_processor_wise_local_2_global,
const scalar_parameter& young_modulus,
......
......@@ -80,7 +80,7 @@ namespace HappyHeart
explicit GradOnGradientBasedElasticityTensor(const FEltSpace& felt_space,
const Unknown& vectorial_unknown,
unsigned int geom_mesh_region_dimension,
const ParameterAtDof<ParameterNS::Type::scalar>& porosity,
const ParameterAtDof<ParameterNS::Type::scalar, 2u>::type& porosity,
const quadrature_rule_per_topology_type& quadrature_rule_per_topology,
DoComputeProcessorWiseLocal2Global do_consider_processor_wise_local_2_global,
const scalar_parameter& young_modulus,
......
......@@ -27,7 +27,7 @@ namespace HappyHeart
const Unknown& unknown,
const unsigned int geom_mesh_region_dimension,
const quadrature_rule_per_topology_type& quadrature_rule_per_topology,
const ParameterAtDof<ParameterNS::Type::scalar>& porosity,
const ParameterAtDof<ParameterNS::Type::scalar, 2u>::type& porosity,
DoComputeProcessorWiseLocal2Global do_consider_processor_wise_local_2_global)
: parent(felt_space,
unknown,
......
......@@ -76,7 +76,7 @@ namespace HappyHeart
const Unknown& unknown,
unsigned int geom_mesh_region_dimension,
const quadrature_rule_per_topology_type& quadrature_rule_per_topology,
const ParameterAtDof<ParameterNS::Type::scalar>& porosity,
const ParameterAtDof<ParameterNS::Type::scalar, 2u>::type& porosity,
DoComputeProcessorWiseLocal2Global do_consider_processor_wise_local_2_global);
//! Destructor.
......
......@@ -30,7 +30,7 @@ namespace HappyHeart
const Unknown& solid_displacement,
unsigned int geom_mesh_region_dimension,
const quadrature_rule_per_topology_type& quadrature_rule_per_topology,
const ParameterAtDof<ParameterNS::Type::scalar>& fluid_mass,
const ParameterAtDof<ParameterNS::Type::scalar>::type& fluid_mass,
const ScalarParameter& fluid_density)
: parent(felt_space,
porosity_unknown,
......
......@@ -77,7 +77,7 @@ namespace HappyHeart
const Unknown& solid_displacement,
unsigned int geom_mesh_region_dimension,
const quadrature_rule_per_topology_type& quadrature_rule_per_topology,
const ParameterAtDof<ParameterNS::Type::scalar>& fluid_mass,
const ParameterAtDof<ParameterNS::Type::scalar>::type& fluid_mass,
const ScalarParameter& fluid_density);
//! Destructor.
......
......@@ -28,7 +28,7 @@ namespace HappyHeart
const Unknown& unknown,
const unsigned int geom_mesh_region_dimension,
const quadrature_rule_per_topology_type& quadrature_rule_per_topology,
const ParameterAtDof<ParameterNS::Type::scalar>& porosity,
const ParameterAtDof<ParameterNS::Type::scalar, 2u>::type& porosity,
DoComputeProcessorWiseLocal2Global do_consider_processor_wise_local_2_global,
const Parameter<ParameterNS::Type::vector>& source)
: parent(felt_space,
......
......@@ -83,7 +83,7 @@ namespace HappyHeart
const Unknown& unknown,
unsigned int geom_mesh_region_dimension,
const quadrature_rule_per_topology_type& quadrature_rule_per_topology,
const ParameterAtDof<ParameterNS::Type::scalar>& porosity,
const ParameterAtDof<ParameterNS::Type::scalar, 2u>::type& porosity,
DoComputeProcessorWiseLocal2Global do_consider_processor_wise_local_2_global,
const Parameter<ParameterNS::Type::vector>& source);
......
......@@ -27,7 +27,7 @@ namespace HappyHeart
::VariationalFormulation(const Wrappers::Mpi& mpi,
const TimeManager& time_manager,
const GodOfDof& god_of_dof,
const ParameterAtDof<ParameterNS::Type::scalar>& porosity,
const ParameterAtDof<ParameterNS::Type::scalar, 2u>::type& porosity,
const Parameter<ParameterNS::Type::vector>& inlet_pressure,
DirichletBoundaryCondition::vector_shared_ptr&& boundary_condition_list)
: parent(mpi,
......
......@@ -79,7 +79,7 @@ namespace HappyHeart
explicit VariationalFormulation(const Wrappers::Mpi& mpi,
const TimeManager& time_manager,
const GodOfDof& god_of_dof,
const ParameterAtDof<ParameterNS::Type::scalar>& porosity,
const ParameterAtDof<ParameterNS::Type::scalar, 2u>::type& porosity,
const Parameter<ParameterNS::Type::vector>& inlet_pressure,
DirichletBoundaryCondition::vector_shared_ptr&& boundary_condition_list);
......
......@@ -25,7 +25,7 @@ namespace HappyHeart
Ale::Ale(const ExtendedUnknown::vector_const_shared_ptr& a_unknown_storage,
elementary_data_type&& a_elementary_data,
const ParameterAtDof<ParameterNS::Type::scalar>& porosity,
const ParameterAtDof<ParameterNS::Type::scalar, 2u>::type& porosity,
const ScalarParameter& density)
: BilinearLocalVariationalOperator(a_unknown_storage, std::move(a_elementary_data)),
porosity_parent(porosity),
......
......@@ -68,7 +68,7 @@ namespace HappyHeart
*/
explicit Ale(const ExtendedUnknown::vector_const_shared_ptr& unknown_list,
elementary_data_type&& elementary_data,
const ParameterAtDof<ParameterNS::Type::scalar>& porosity,
const ParameterAtDof<ParameterNS::Type::scalar, 2u>::type& porosity,
const ScalarParameter& density);
//! Destructor.
......
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