Commit e5c426d5 authored by GILLES Sebastien's avatar GILLES Sebastien
Browse files

#820 Use DevPrint in InnerLoopVarf.

parent e9068185
......@@ -177,7 +177,7 @@ namespace HappyHeart
*
* \return Norm obtained.
*/
double Perform(unsigned int iteration);
double Perform();
/*!
......@@ -481,9 +481,6 @@ namespace HappyHeart
//! Non constant accessor to the t21 on the non monolithic FEltSpace.
GlobalMatrix& GetNonCstT21OnFluidMesh() noexcept;
//! Index of the current inner loop (for outputs).
unsigned int GetIndexInnerLoop() const noexcept;
//! Constant accessor to the parameter that encapsulates velocity part of the current solution.
const ParameterAtDof<ParameterNS::Type::vector>::type& GetVelocitySolutionParam() const noexcept;
......@@ -598,18 +595,6 @@ namespace HappyHeart
///@}
/*!
* \brief Set the index of the current inner loop (for outputs).
*
* \warning Only Perform() should call this one!
*/
void SetIndexInnerLoop(unsigned int index) noexcept;
//! Returns the string that gives current time and current inner loop index.
template<differential is_differential>
std::string GetIterationTag() const noexcept;
public:
/*!
......@@ -1016,9 +1001,6 @@ namespace HappyHeart
//! Internal friction (Dporo in Freefem script).
double internal_friction_ = std::numeric_limits<double>::lowest();
//! Index of the current inner loop (for outputs). Differential indexes do not use this one directly.
unsigned int index_inner_loop_ = NumericNS::UninitializedIndex<unsigned int>();
//! Parameter that encapsulates velocity part of the current solution.
ParameterAtDof<ParameterNS::Type::vector>::type::const_unique_ptr velocity_solution_param_ = nullptr;
......
......@@ -479,13 +479,6 @@ namespace HappyHeart
}
template<class HyperelasticLawT>
unsigned int VariationalFormulation<HyperelasticLawT>::GetIndexInnerLoop() const noexcept
{
return index_inner_loop_;
}
template<class HyperelasticLawT>
inline const ParameterAtDof<ParameterNS::Type::vector>::type& VariationalFormulation<HyperelasticLawT>
::GetVelocitySolutionParam() const noexcept
......
......@@ -66,9 +66,12 @@ namespace HappyHeart
auto& inner_varf = GetNonCstInnerLoopVarf();
auto counter = 0u;
decltype(auto) variable_holder = this->GetNonCstVariableHolder();
current_norm = inner_varf.Perform(counter++);
auto& newton_fp_index = variable_holder.newton_fp_index;
newton_fp_index = 0u;
current_norm = inner_varf.Perform();
// Update fluidmass, velocity fluid and pressure.
Wrappers::Petsc::MatMult(inner_varf.GetMonolithic2Mass().GetInterpolationMatrix(),
......@@ -76,7 +79,7 @@ namespace HappyHeart
variable_holder_parent::GetNonCstVariableHolder().GetNonCstFluidMassVector(),
__FILE__, __LINE__);
decltype(auto) variable_holder = this->GetVariableHolder();
// Perform one more time to update T21, T33 and T33 without Dirichlet.
{
......
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