From 1df670142b6117a81988655f6e8803d3cae53aae Mon Sep 17 00:00:00 2001 From: Alex Bilger Date: Fri, 29 Mar 2024 01:24:12 +0100 Subject: [PATCH] [LinearSystem] Remove development artifact (#4620) --- .../linearsystem/MatrixLinearSystem.h | 7 ----- .../linearsystem/MatrixLinearSystem.inl | 30 ------------------- 2 files changed, 37 deletions(-) diff --git a/Sofa/Component/LinearSystem/src/sofa/component/linearsystem/MatrixLinearSystem.h b/Sofa/Component/LinearSystem/src/sofa/component/linearsystem/MatrixLinearSystem.h index a96a9268267..012546ebf2c 100644 --- a/Sofa/Component/LinearSystem/src/sofa/component/linearsystem/MatrixLinearSystem.h +++ b/Sofa/Component/LinearSystem/src/sofa/component/linearsystem/MatrixLinearSystem.h @@ -124,13 +124,6 @@ class MatrixLinearSystem : public TypedMatrixLinearSystem > > m_localMappedMatrices; - - /** - * Asks all the matrix accumulators to accumulate the contribution of a specific type of contribution - */ - template - void contribute(const core::MechanicalParams* mparams); - template void contribute(const core::MechanicalParams* mparams, IndependentContributors& contributors); diff --git a/Sofa/Component/LinearSystem/src/sofa/component/linearsystem/MatrixLinearSystem.inl b/Sofa/Component/LinearSystem/src/sofa/component/linearsystem/MatrixLinearSystem.inl index 7200df74ff7..ccb92e65c56 100644 --- a/Sofa/Component/LinearSystem/src/sofa/component/linearsystem/MatrixLinearSystem.inl +++ b/Sofa/Component/LinearSystem/src/sofa/component/linearsystem/MatrixLinearSystem.inl @@ -72,36 +72,6 @@ MatrixLinearSystem::MatrixLinearSystem() }, {&m_needClearLocalMatrices}); } -template -template -void MatrixLinearSystem::contribute(const core::MechanicalParams* mparams) -{ - sofa::helper::ScopedAdvancedTimer buildTimer("build" + std::string(core::matrixaccumulator::GetContributionName())); - - for (auto* contributor : getContributors()) - { - if (Inherit1::template getContributionFactor(mparams, contributor) != 0._sreal) - { - if constexpr (c == Contribution::STIFFNESS) - { - contributor->buildStiffnessMatrix(&m_stiffness[contributor]); - } - else if constexpr (c == Contribution::MASS) - { - contributor->buildMassMatrix(m_mass[contributor]); - } - else if constexpr (c == Contribution::DAMPING) - { - contributor->buildDampingMatrix(&m_damping[contributor]); - } - else if constexpr (c == Contribution::GEOMETRIC_STIFFNESS) - { - contributor->buildGeometricStiffnessMatrix(&m_geometricStiffness[contributor]); - } - } - } -} - template template void MatrixLinearSystem::contribute(