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

#531 Fix NonMonolithicStokes compilation. Runtime fails, but that was...

#531 Fix NonMonolithicStokes compilation. Runtime fails, but that was expected: the 'reduction' of the matrix is not implemented yet in new framework.
parent daf5f70f
......@@ -32,24 +32,36 @@ namespace HappyHeart
auto& system_matrix = GetNonCstSystemMatrix(velocity_numbering_subset,
velocity_numbering_subset);
GetNonCstStiffnessOperator().Assemble(GetViscosity(), system_matrix);
GlobalMatrixWithCoefficient matrix_with_coeff(system_matrix, GetViscosity());
GetNonCstStiffnessOperator().Assemble(std::make_tuple(matrix_with_coeff));
}
auto time = GetTransientParameters().GetTime();
const auto time = GetTransientParameters().GetTime();
auto& force_vector = GetNonCstForceVector();
auto force_vector = GlobalVectorWithCoefficient(GetNonCstForceVector(), 1.);
auto force_tuple = std::make_tuple(force_vector);
// I assume here static only run... (otherwise assembling should occur at each time step).
if (IsOperatorActivated<ForceIndexList::volumic_force>())
GetNonCstForceOperator<ForceIndexList::volumic_force>().Assemble(1., force_vector, time);
{
GetNonCstForceOperator<ForceIndexList::volumic_force>().Assemble(force_tuple,
time);
}
if (IsOperatorActivated<ForceIndexList::surfacic_force>())
GetNonCstForceOperator<ForceIndexList::surfacic_force>().Assemble(1., force_vector, time);
{
GetNonCstForceOperator<ForceIndexList::surfacic_force>().Assemble(force_tuple,
time);
}
{
auto& system_matrix = GetNonCstSystemMatrix(velocity_numbering_subset,
pressure_numbering_subset);
GetNonCstPsiDivOperator().Assemble(-1., system_matrix);
GetNonCstPsiDivOperator().Assemble(std::make_tuple(GlobalMatrixWithCoefficient(system_matrix, -1.)));
}
}
......
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