Commit 5b78981b authored by GILLES Sebastien's avatar GILLES Sebastien
Browse files

#820 DevPrint progressively introduced in InnerLoopVarf.

parent 7fa9b428
......@@ -693,7 +693,6 @@ namespace HappyHeart
//! Compute rhs.
template<differential is_differential>
void ComputeRhs();
//! Compute T11.
......
......@@ -96,7 +96,7 @@ namespace HappyHeart
+ "full_matrix_" + GetIterationTag<differential::no>() + ".binary.hhdata",
__FILE__, __LINE__);
ComputeRhs<differential::no>(); // must occur after T11, as it needs the t11 matrix.
ComputeRhs(); // must occur after T11, as it needs the t11 matrix.
parent::template SolveLinear<IsFactorized::no>(numbering_subset, numbering_subset);
......@@ -611,7 +611,6 @@ namespace HappyHeart
template<class HyperelasticLawT>
template<differential is_differential>
void VariationalFormulation<HyperelasticLawT>::ComputeRhs()
{
decltype(auto) god_of_dof = parent::GetGodOfDof();
......@@ -622,30 +621,23 @@ namespace HappyHeart
auto& rhs = parent::GetNonCstSystemRhs(numbering_subset);
rhs.ZeroEntries(__FILE__, __LINE__);
decltype(auto) variable_holder = this->GetVariableHolder();
ComputeDarcy(1., IsFullDarcy::yes, rhs);
// \todo #820 I assume here Darcy is the first thing assembled into rhs. Anyway this line will
// disappear once model is validated.
rhs.View(parent::MpiHappyHeart(),
parent::GetOutputDirectory(numbering_subset)
+ "/"
+ DifferentialPreffix(is_differential)
+ "darcy_" + GetIterationTag<is_differential>() + ".m",
__FILE__, __LINE__,
PETSC_VIEWER_ASCII_MATLAB);
variable_holder.template DevPrint<DevPhase::none>(rhs,
"darcy");
// \todo #820 Add the contribution from pressure to the rhs.
{
auto& contribution = GetNonCstWorkRhsLike(); // \todo #820 Intermediate step for dev purpose only.
contribution.View(parent::MpiHappyHeart(),
parent::GetOutputDirectory(numbering_subset)
+ "/"
+ DifferentialPreffix(is_differential)
+ "pressure_contrib_to_rhs_" + GetIterationTag<is_differential>() + ".m",
__FILE__, __LINE__,
PETSC_VIEWER_ASCII_MATLAB);
variable_holder.template DevPrint<DevPhase::none>(contribution,
"pressure_contrib_to_rhs");
}
{
......@@ -692,14 +684,9 @@ namespace HappyHeart
GetCorrectedValues());
}
contribution.View(parent::MpiHappyHeart(),
parent::GetOutputDirectory(numbering_subset)
+ "/"
+ DifferentialPreffix(is_differential)
+ "fluid_mass_contrib_to_rhs_" + GetIterationTag<is_differential>() + ".m",
__FILE__, __LINE__,
PETSC_VIEWER_ASCII_MATLAB);
variable_holder.template DevPrint<DevPhase::none>(contribution,
"fluid_mass_contrib_to_rhs");
Wrappers::Petsc::AXPY(1.,
contribution,
......@@ -716,13 +703,9 @@ namespace HappyHeart
rhs.UpdateGhosts(__FILE__, __LINE__);
rhs.View(parent::MpiHappyHeart(),
parent::GetOutputDirectory(numbering_subset)
+ "/"
+ DifferentialPreffix(is_differential)
+ "rhs_" + GetIterationTag<is_differential>() + ".m",
__FILE__, __LINE__,
PETSC_VIEWER_ASCII_MATLAB);
variable_holder.template DevPrint<DevPhase::none>(rhs,
"rhs");
}
......
......@@ -65,7 +65,6 @@ namespace HappyHeart
double current_norm = 1.e20;
auto& inner_varf = GetNonCstInnerLoopVarf();
decltype(auto) god_of_dof = parent::GetGodOfDof();
auto counter = 0u;
......
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