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

#745 FSI/Newton: missing Assembly() call was added.

parent 27d9db63
...@@ -226,7 +226,7 @@ namespace HappyHeart ...@@ -226,7 +226,7 @@ namespace HappyHeart
auto& fluid_varf = GetNonCstImplicitStepFluidVariationalFormulation(); auto& fluid_varf = GetNonCstImplicitStepFluidVariationalFormulation();
const auto& differential_fluid_residual = fluid_varf.ComputeResidual(-1.); // to comply with Freefem's script. const auto& differential_fluid_residual = fluid_varf.ComputeResidual(-1.); // to comply with Freefem's script.
std::cout << this->MpiHappyHeart().GetRankPreffix() << "dH 33"<< std::endl; std::cout << this->MpiHappyHeart().GetRankPreffix() << "dH 33"<< std::endl;
const auto& solid_varf = SolidVariationalFormulationPolicyT::GetVariationalFormulation(); const auto& solid_varf = SolidVariationalFormulationPolicyT::GetVariationalFormulation();
const auto& solid_numbering_subset = solid_varf.GetNumberingSubset(); const auto& solid_numbering_subset = solid_varf.GetNumberingSubset();
...@@ -248,6 +248,8 @@ namespace HappyHeart ...@@ -248,6 +248,8 @@ namespace HappyHeart
god_of_dof.ApplyBoundaryCondition(dirichlet_bc, solid_residual); god_of_dof.ApplyBoundaryCondition(dirichlet_bc, solid_residual);
solid_residual.Assembly(__FILE__, __LINE__);
GetNonCstDifferentialSolidSolver().SolveLinear(solid_tangent, solid_tangent, GetNonCstDifferentialSolidSolver().SolveLinear(solid_tangent, solid_tangent,
solid_residual, solid_residual,
solution, solution,
......
...@@ -81,10 +81,6 @@ int main(int argc, char ** argv) ...@@ -81,10 +81,6 @@ int main(int argc, char ** argv)
{ {
ExceptionNS::PrintAndAbort(mpi, e.What()); ExceptionNS::PrintAndAbort(mpi, e.What());
} }
catch(...)
{
std::cout << "Here?" << std::endl;
}
} }
catch(const std::exception& e) catch(const std::exception& e)
{ {
......
...@@ -26,7 +26,6 @@ namespace HappyHeart ...@@ -26,7 +26,6 @@ namespace HappyHeart
: parent(mpi_ptr, input_parameter_data), : parent(mpi_ptr, input_parameter_data),
output_directory_(Utilities::InputParameterListNS::Extract<InputParameter::Result::OutputDirectory>::Path(input_parameter_data)) output_directory_(Utilities::InputParameterListNS::Extract<InputParameter::Result::OutputDirectory>::Path(input_parameter_data))
{ } { }
namespace // anonymous namespace // anonymous
......
...@@ -25,7 +25,7 @@ namespace HappyHeart ...@@ -25,7 +25,7 @@ namespace HappyHeart
template<class MatrixT> template<class MatrixT>
std::enable_if_t<std::is_base_of<Private::BaseMatrix, MatrixT>::value, void> std::enable_if_t<std::is_base_of<Private::BaseMatrix, MatrixT>::value, void>
MatMultTranspose(const MatrixT& matrix, const Vector& v1, Vector& v2, MatMultTranspose(const MatrixT& matrix, const Vector& v1, Vector& v2,
const char* invoking_file, int invoking_line) const char* invoking_file, int invoking_line)
{ {
int error_code = ::MatMultTranspose(matrix.Internal(), v1.Internal(), v2.Internal()); int error_code = ::MatMultTranspose(matrix.Internal(), v1.Internal(), v2.Internal());
if (error_code) if (error_code)
......
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