diff --git a/src/ModelOrderReduction/component/mapping/MORContactMapping.h b/src/ModelOrderReduction/component/mapping/MORContactMapping.h index 5bd3bff..488e3da 100644 --- a/src/ModelOrderReduction/component/mapping/MORContactMapping.h +++ b/src/ModelOrderReduction/component/mapping/MORContactMapping.h @@ -125,7 +125,6 @@ class MORContactMapping : public core::Mapping void applyJT(const core::ConstraintParams *cparams, Data& out, const Data& in) override; - const sofa::linearalgebra::BaseMatrix* getJ() override; void handleTopologyChange() override; @@ -141,9 +140,8 @@ class MORContactMapping : public core::Mapping Eigen::MatrixXd m_matrix; Eigen::MatrixXi contactIndices; -public: - - const js_type* getJs() override; + const sofa::linearalgebra::BaseMatrix* doGetJ() override; + const js_type* doGetJs() override; }; diff --git a/src/ModelOrderReduction/component/mapping/MORContactMapping.inl b/src/ModelOrderReduction/component/mapping/MORContactMapping.inl index 1e9db03..02cbe69 100644 --- a/src/ModelOrderReduction/component/mapping/MORContactMapping.inl +++ b/src/ModelOrderReduction/component/mapping/MORContactMapping.inl @@ -174,13 +174,13 @@ void MORContactMapping::handleTopologyChange() } template -const sofa::linearalgebra::BaseMatrix* MORContactMapping::getJ() +const sofa::linearalgebra::BaseMatrix* MORContactMapping::doGetJ() { return &J; } template -const typename MORContactMapping::js_type* MORContactMapping::getJs() +const typename MORContactMapping::js_type* MORContactMapping::doGetJs() { return &Js; } diff --git a/src/ModelOrderReduction/component/mapping/ModelOrderReductionMapping.h b/src/ModelOrderReduction/component/mapping/ModelOrderReductionMapping.h index b9dfa34..529f1c1 100644 --- a/src/ModelOrderReduction/component/mapping/ModelOrderReductionMapping.h +++ b/src/ModelOrderReduction/component/mapping/ModelOrderReductionMapping.h @@ -141,11 +141,12 @@ class ModelOrderReductionMapping : public linear::LinearMapping void applyJT(const core::ConstraintParams *cparams, Data& out, const Data& in) override; - const sofa::linearalgebra::BaseMatrix* getJ() override; protected: + const sofa::linearalgebra::BaseMatrix* doGetJ() override; + const js_type* doGetJs() override; Eigen::MatrixXd m_modesEigen; Eigen::MatrixXi m_listActiveNodes; @@ -167,7 +168,6 @@ class ModelOrderReductionMapping : public linear::LinearMapping public: - const js_type* getJs() override; sofa::core::objectmodel::DataFileName d_modesPath; diff --git a/src/ModelOrderReduction/component/mapping/ModelOrderReductionMapping.inl b/src/ModelOrderReduction/component/mapping/ModelOrderReductionMapping.inl index bd13d35..24562b4 100644 --- a/src/ModelOrderReduction/component/mapping/ModelOrderReductionMapping.inl +++ b/src/ModelOrderReduction/component/mapping/ModelOrderReductionMapping.inl @@ -219,13 +219,13 @@ void ModelOrderReductionMapping::applyJT(const core::ConstraintParams template -const sofa::linearalgebra::BaseMatrix* ModelOrderReductionMapping::getJ() +const sofa::linearalgebra::BaseMatrix* ModelOrderReductionMapping::doGetJ() { return &m_J; } template -const typename ModelOrderReductionMapping::js_type* ModelOrderReductionMapping::getJs() +const typename ModelOrderReductionMapping::js_type* ModelOrderReductionMapping::doGetJs() { return &m_Js; }