Commit 7fa9b428 authored by GILLES Sebastien's avatar GILLES Sebastien
Browse files

#820 Same in ImplicitStepFluid varf.

parent 49362466
......@@ -66,9 +66,7 @@ namespace HappyHeart
auto& inner_varf = GetNonCstInnerLoopVarf();
decltype(auto) god_of_dof = parent::GetGodOfDof();
decltype(auto) numbering_subset =
god_of_dof.GetNumberingSubset(EnumUnderlyingType(NumberingSubsetIndex::fluid_mass_velocity_pressure));
auto counter = 0u;
current_norm = inner_varf.Perform(counter++);
......@@ -79,6 +77,8 @@ 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.
{
decltype(auto) updated_matrix = inner_varf.ComputeMatrixWithUpdatedT21();
......@@ -86,14 +86,8 @@ namespace HappyHeart
// \todo #820 - #530 Use Swap when available!
GetNonCstMonolithicMatrixAfterInnerLoop().Copy(updated_matrix, __FILE__, __LINE__);
updated_matrix.View(parent::MpiHappyHeart(),
parent::GetOutputDirectory(numbering_subset)
+ "/"
+ DifferentialPreffix(differential::no)
+ "matrix_after_FP_mixt_with_dirichlet_time_"
+ std::to_string(parent::GetTimeManager().NtimeModified()) + ".m",
__FILE__, __LINE__,
PETSC_VIEWER_ASCII_MATLAB);
variable_holder.template DevPrint<DevPhase::none>(updated_matrix,
"matrix_after_FP_mixt_with_dirichlet");
}
{
......@@ -102,15 +96,9 @@ namespace HappyHeart
decltype(auto) updated_matrix = inner_varf.ComputeMatrixWithUpdatedT33WithoutDirichlet();
GetNonCstMonolithicMatrixAfterInnerLoopWithoutDirichlet().Copy(updated_matrix, __FILE__, __LINE__);
// \todo #820 Not exactly equal to Freefem; investigate if one term is missing!
updated_matrix.View(parent::MpiHappyHeart(),
parent::GetOutputDirectory(numbering_subset)
+ "/"
+ DifferentialPreffix(differential::no)
+ "matrix_after_FP_mixt_without_dirichlet_time_"
+ std::to_string(parent::GetTimeManager().NtimeModified()) + ".m",
__FILE__, __LINE__,
PETSC_VIEWER_ASCII_MATLAB);
variable_holder.template DevPrint<DevPhase::none>(updated_matrix,
"matrix_after_FP_mixt_without_dirichlet");
}
{
......@@ -118,14 +106,9 @@ namespace HappyHeart
inner_varf.ComputeDarcy(-1., IsFullDarcy::no, darcy_vector);
darcy_vector.View(parent::MpiHappyHeart(),
parent::GetOutputDirectory(numbering_subset)
+ "/"
+ DifferentialPreffix(differential::no)
+ "darcy_vector_after_FP_mixt_time_"
+ std::to_string(parent::GetTimeManager().NtimeModified()) + ".m",
__FILE__, __LINE__,
PETSC_VIEWER_ASCII_MATLAB);
variable_holder.template DevPrint<DevPhase::none>(darcy_vector,
"darcy_vector_after_FP_mixt");
}
}
......
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