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

#531 Fix heat.

parent 1a39700a
......@@ -112,11 +112,11 @@ namespace HappyHeart
const auto& system_matrix = GetSystemMatrix(numbering_subset, numbering_subset);
const auto& system_rhs = GetSystemRhs(numbering_subset);
GetNonCstVectorCurrentVolumicSource().CompleteCopy(system_rhs, __FILE__, __LINE__);
GetNonCstVectorCurrentNeumann().CompleteCopy(system_rhs, __FILE__, __LINE__);
GetNonCstVectorCurrentRobin().CompleteCopy(system_rhs, __FILE__, __LINE__);
vector_current_volumic_source_ = std::make_unique<GlobalVector>(system_rhs);
vector_current_neumann_ = std::make_unique<GlobalVector>(system_rhs);
vector_current_robin_ = std::make_unique<GlobalVector>(system_rhs);
matrix_conductivity_ = std::make_unique<GlobalMatrix>(system_matrix);
if (run_case_ == StaticOrDynamic::dynamic_case)
......@@ -135,8 +135,8 @@ namespace HappyHeart
auto& system_matrix = GetNonCstSystemMatrix(numbering_subset, numbering_subset);
GetNonCstRobinBilinearPartOperator().Assemble(transfer_coefficient, GetNonCstMatrixRobin());
GetNonCstConductivityOperator().Assemble(diffusion_tensor, system_matrix);
GetNonCstRobinBilinearPartOperator().Assemble(std::make_tuple(GlobalMatrixWithCoefficient(GetNonCstMatrixRobin(), transfer_coefficient)));
GetNonCstConductivityOperator().Assemble(std::make_tuple(GlobalMatrixWithCoefficient(system_matrix, diffusion_tensor)));
Wrappers::Petsc::AXPY(1., GetMatrixRobin(), system_matrix, __FILE__, __LINE__);
}
......@@ -151,9 +151,9 @@ namespace HappyHeart
GetNonCstVectorCurrentNeumann().ZeroEntries(__FILE__, __LINE__);
GetNonCstVectorCurrentRobin().ZeroEntries(__FILE__, __LINE__);
GetNonCstNeumannOperator().Assemble(1., GetNonCstVectorCurrentNeumann(), time);
GetNonCstRobinLinearPartOperator().Assemble(transfer_coefficient, GetNonCstVectorCurrentRobin(), time);
GetNonCstVolumicSourceOperator().Assemble(1., GetNonCstVectorCurrentVolumicSource(), time);
GetNonCstNeumannOperator().Assemble(std::make_tuple(GlobalVectorWithCoefficient(GetNonCstVectorCurrentNeumann(), 1.)), time);
GetNonCstRobinLinearPartOperator().Assemble(std::make_tuple(GlobalVectorWithCoefficient(GetNonCstVectorCurrentRobin(), transfer_coefficient)), time);
GetNonCstVolumicSourceOperator().Assemble(std::make_tuple(GlobalVectorWithCoefficient(GetNonCstVectorCurrentVolumicSource(), 1.)), time);
auto& rhs = this->GetNonCstSystemRhs(GetNumberingSubset());
......@@ -177,8 +177,8 @@ namespace HappyHeart
{
const double capacity_coefficient = GetDensity() / GetTransientParameters().GetTimeStep();
GetNonCstCapacityOperator().Assemble(capacity_coefficient,
GetNonCstMatrixCapacity());
GetNonCstCapacityOperator().Assemble(std::make_tuple(GlobalMatrixWithCoefficient(GetNonCstMatrixCapacity(),
capacity_coefficient)));
}
......
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