Commit 1b46213c authored by GILLES Sebastien's avatar GILLES Sebastien
Browse files

#718 FSI: remove one argument from CreateSolidFormulation() in policy, that...

#718 FSI: remove one argument from CreateSolidFormulation() in policy, that could be built directly within the variational formulation.
parent f6a7c7aa
......@@ -41,15 +41,12 @@ namespace HappyHeart
time_manager,
god_of_dof,
std::move(boundary_condition_list),
-1., // contribution of DofSource must be added to rhs in elastic case.
dof_source);
variational_formulation_->Init(input_parameter_data);
}
void Elasticity::Solve()
{
auto& variational_formulation = GetNonCstVariationalFormulation();
......
......@@ -29,14 +29,13 @@ namespace HappyHeart
const TimeManager& time_manager,
const GodOfDof& god_of_dof,
DirichletBoundaryCondition::vector_shared_ptr&& boundary_condition_list,
const double factor,
const GlobalVector& dof_source)
: parent(mpi,
time_manager,
god_of_dof,
std::move(boundary_condition_list)),
VariationalFormulationNS::DofSourcePolicyNS::DofSource(factor, dof_source),
VariationalFormulationNS::DofSourcePolicyNS::DofSource(-1., dof_source),
felt_space_(main_felt_space),
solid_displacement_(solid_displacement),
numbering_subset_(numbering_subset)
......
......@@ -74,7 +74,6 @@ namespace HappyHeart
const TimeManager& time_manager,
const GodOfDof& god_of_dof,
DirichletBoundaryCondition::vector_shared_ptr&& boundary_condition_list,
const double factor,
const GlobalVector& dof_source);
//! Destructor.
......
......@@ -46,7 +46,6 @@ namespace HappyHeart
time_manager,
god_of_dof,
std::move(boundary_condition_list),
1., // contribution of DofSource must be removed from rhs in elastic case.
dof_source);
variational_formulation_->Init(input_parameter_data);
......@@ -90,20 +89,6 @@ namespace HappyHeart
auto& variational_formulation = GetNonCstVariationalFormulation();
const auto& numbering_subset = variational_formulation.GetNumberingSubset();
// static bool first = true;
//
// if (first)
// {
// std::cout << "IMPLICIT SOLID MATRIX = " << std::endl;
// variational_formulation.GetSystemMatrix(numbering_subset, numbering_subset).View(variational_formulation.MpiHappyHeart(), "/Users/sebastien/Desktop/ImplicitSolid.m",
// __FILE__, __LINE__,
// PETSC_VIEWER_ASCII_MATLAB
// );
//
// first = false;
// }
//
variational_formulation.SolveNonLinear(numbering_subset, numbering_subset);
}
......
......@@ -118,7 +118,6 @@ namespace HappyHeart
const time_manager_type& time_manager,
const GodOfDof& god_of_dof,
DirichletBoundaryCondition::vector_shared_ptr&& boundary_condition_list,
double factor,
const GlobalVector& dof_source);
//! Destructor.
......
......@@ -35,14 +35,13 @@ namespace HappyHeart
const time_manager_type& time_manager,
const GodOfDof& god_of_dof,
DirichletBoundaryCondition::vector_shared_ptr&& boundary_condition_list,
const double factor,
const GlobalVector& dof_source)
: parent(mpi,
time_manager,
god_of_dof,
std::move(boundary_condition_list)),
VariationalFormulationNS::DofSourcePolicyNS::DofSource(factor, dof_source),
VariationalFormulationNS::DofSourcePolicyNS::DofSource(1., dof_source),
felt_space_(main_felt_space),
solid_displacement_(solid_displacement),
numbering_subset_(numbering_subset)
......
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