From d05d15e57ce21f1b75c76237a68a08c56ba1f14d Mon Sep 17 00:00:00 2001 From: EulalieCoevoet <> Date: Mon, 11 Jan 2021 15:33:40 -0500 Subject: [PATCH 1/2] [SofaGeneralAnimationLoop] MechanicalMatrixMapper: adds template --- .../MechanicalMatrixMapper.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/modules/SofaGeneralAnimationLoop/src/SofaGeneralAnimationLoop/MechanicalMatrixMapper.cpp b/modules/SofaGeneralAnimationLoop/src/SofaGeneralAnimationLoop/MechanicalMatrixMapper.cpp index a7b57c2822a..ef1522fde07 100644 --- a/modules/SofaGeneralAnimationLoop/src/SofaGeneralAnimationLoop/MechanicalMatrixMapper.cpp +++ b/modules/SofaGeneralAnimationLoop/src/SofaGeneralAnimationLoop/MechanicalMatrixMapper.cpp @@ -33,11 +33,12 @@ using namespace sofa::defaulttype; //////////////////////////////////////////// FACTORY ////////////////////////////////////////////// int MechanicalMatrixMapperClass = core::RegisterObject("This component allows to map the stiffness (and mass) matrix through a mapping.") - .add< MechanicalMatrixMapper >(true) - .add< MechanicalMatrixMapper >(true) - .add< MechanicalMatrixMapper >(true) - .add< MechanicalMatrixMapper >(true) - .add< MechanicalMatrixMapper >(true) + .add< MechanicalMatrixMapper >() + .add< MechanicalMatrixMapper >() + .add< MechanicalMatrixMapper >() + .add< MechanicalMatrixMapper >() + .add< MechanicalMatrixMapper >() + .add< MechanicalMatrixMapper >() .add< MechanicalMatrixMapper >(true) ; @@ -47,9 +48,10 @@ template class SOFA_SOFAGENERALANIMATIONLOOP_API MechanicalMatrixMapper; template class SOFA_SOFAGENERALANIMATIONLOOP_API MechanicalMatrixMapper; template class SOFA_SOFAGENERALANIMATIONLOOP_API MechanicalMatrixMapper; +template class SOFA_SOFAGENERALANIMATIONLOOP_API MechanicalMatrixMapper; template class SOFA_SOFAGENERALANIMATIONLOOP_API MechanicalMatrixMapper; template class SOFA_SOFAGENERALANIMATIONLOOP_API MechanicalMatrixMapper ; -} // namespace sofa::component::interactionforcefield \ No newline at end of file +} // namespace sofa::component::interactionforcefield From 22b0212f0e4df8dfafa7ce4761787e5e382961e0 Mon Sep 17 00:00:00 2001 From: EulalieCoevoet <> Date: Tue, 12 Jan 2021 09:43:23 -0500 Subject: [PATCH 2/2] [SofaGeneralAnimationLoop] forgotten extern template in MechanicalMatrixMapper.h --- .../src/SofaGeneralAnimationLoop/MechanicalMatrixMapper.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/SofaGeneralAnimationLoop/src/SofaGeneralAnimationLoop/MechanicalMatrixMapper.h b/modules/SofaGeneralAnimationLoop/src/SofaGeneralAnimationLoop/MechanicalMatrixMapper.h index 72a81c6722f..a292be2925d 100644 --- a/modules/SofaGeneralAnimationLoop/src/SofaGeneralAnimationLoop/MechanicalMatrixMapper.h +++ b/modules/SofaGeneralAnimationLoop/src/SofaGeneralAnimationLoop/MechanicalMatrixMapper.h @@ -272,10 +272,13 @@ class MechanicalMatrixMapper : public MixedInteractionForceField; extern template class SOFA_SOFAGENERALANIMATIONLOOP_API MechanicalMatrixMapper; extern template class SOFA_SOFAGENERALANIMATIONLOOP_API MechanicalMatrixMapper; extern template class SOFA_SOFAGENERALANIMATIONLOOP_API MechanicalMatrixMapper; +extern template class SOFA_SOFAGENERALANIMATIONLOOP_API MechanicalMatrixMapper; extern template class SOFA_SOFAGENERALANIMATIONLOOP_API MechanicalMatrixMapper; +extern template class SOFA_SOFAGENERALANIMATIONLOOP_API MechanicalMatrixMapper; #endif } // namespace sofa::component::interactionforcefield