Commit 0033766d authored by GILLES Sebastien's avatar GILLES Sebastien
Browse files

#531 Remove temporary attributes from hyperelastic model.

parent 45be234e
......@@ -64,8 +64,8 @@ namespace HappyHeart
*
* \param[in] local_felt_space Local finite element space being assembled. Remind a local finite element
* space is the object linked to a geometric element that hold finite elements information.
* \param[in,out] local_operator Local variational operator in charge of the computation of the local
* linear algebra. It also holds the results of these computations, hence its presence here.
* \param[in,out] local_variational_operator Local variational operator in charge of the computation of
* the local linear algebra. It also holds the results of these computations, hence its presence here.
*/
template<class LocalVariationalOperatorT>
static void InjectInGlobalLinearAlgebra(const LinearAlgebraTupleT& linear_algebra_tuple,
......
......@@ -90,8 +90,6 @@ namespace HappyHeart
row_numbering_subset,
col_numbering_subset);
// \todo #531 We might need here to reduce the local matrix!
const double coefficient = global_matrix_with_coefficient.second;
assert(!Utilities::IsZero(previous_coefficient));
......
......@@ -214,13 +214,12 @@ namespace HappyHeart
*
*/
VectorsAndMatrices<TimeSchemeT>& GetNonCstVectorsAndMatrices() noexcept;
///@}
public:
GlobalMatrix::unique_ptr foo = nullptr; // \todo #531 Remove this once ticket is done!
GlobalMatrix::unique_ptr bar = nullptr;
GlobalVector::unique_ptr baz = nullptr;
///@}
public:
//! Set the volumic mass.
void SetVolumicMass(double value) noexcept;
......
......@@ -142,9 +142,6 @@ namespace HappyHeart
const auto& system_solution = this->GetSystemSolution(numbering_subset);
const auto& system_matrix = this->GetSystemMatrix(numbering_subset, numbering_subset);
foo = std::make_unique<GlobalMatrix>(system_matrix);
bar = std::make_unique<GlobalMatrix>(system_matrix);
baz = std::make_unique<GlobalVector>(system_solution);
{
std::lock_guard<std::mutex> lock(this->GetMutex());
......@@ -235,25 +232,9 @@ namespace HappyHeart
auto&& matrix1 = GlobalMatrixWithCoefficient(vm.GetNonCstMassPerSquareTime(),
mass_coefficient);
auto&& matrix2 = GlobalMatrixWithCoefficient(*foo,
mass_coefficient * 2);
auto&& matrix3 = GlobalMatrixWithCoefficient(*bar,
mass_coefficient * 20);
this->GetNonCstMassPerSquareTimeStepOperator().
Assemble(std::make_tuple(std::move(matrix1), std::move(matrix2), std::move(matrix3)));
// vm.GetNonCstMassPerSquareTime().View(this->MpiHappyHeart(),
// "/Users/sebastien/Desktop/original.txt", __FILE__, __LINE__);
//
// foo->View(this->MpiHappyHeart(),
// "/Users/sebastien/Desktop/foo.txt", __FILE__, __LINE__);
//
//
// bar->View(this->MpiHappyHeart(),
// "/Users/sebastien/Desktop/bar.txt", __FILE__, __LINE__);
Assemble(std::make_tuple(std::move(matrix1)));
}
}
......
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