forgotten doAddMToMatrix

hugtalbot · hugtalbot · commit a11d0c437011 · 2025-05-12T22:55:41.000+02:00
diff --git a/src/BeamAdapter/component/forcefield/AdaptiveBeamForceFieldAndMass.h b/src/BeamAdapter/component/forcefield/AdaptiveBeamForceFieldAndMass.h
@@ -121,7 +121,7 @@ class AdaptiveBeamForceFieldAndMass : public core::behavior::Mass<DataTypes>
     /// Mass Interface
     /////////////////////////////////////
     void addMDx(const MechanicalParams* mparams, DataVecDeriv& f, const DataVecDeriv& dx, SReal factor) override;
-    void addMToMatrix(const MechanicalParams *mparams, const MultiMatrixAccessor* matrix) override;
+    void doAddMToMatrix(const MechanicalParams *mparams, const MultiMatrixAccessor* matrix) override;
     void addMBKToMatrix(const MechanicalParams* mparams, const MultiMatrixAccessor* matrix) override;
 
     void doBuildMassMatrix(sofa::core::behavior::MassMatrixAccumulator* matrices) override;
diff --git a/src/BeamAdapter/component/forcefield/AdaptiveBeamForceFieldAndMass.inl b/src/BeamAdapter/component/forcefield/AdaptiveBeamForceFieldAndMass.inl
@@ -341,7 +341,7 @@ void AdaptiveBeamForceFieldAndMass<DataTypes>::addMDx(const MechanicalParams* mp
 
 
 template<class DataTypes>
-void AdaptiveBeamForceFieldAndMass<DataTypes>::addMToMatrix(const MechanicalParams *mparams,
+void AdaptiveBeamForceFieldAndMass<DataTypes>::doAddMToMatrix(const MechanicalParams *mparams,
                                                             const MultiMatrixAccessor* matrix)
 {
     MultiMatrixAccessor::MatrixRef r = matrix->getMatrix(mstate);
diff --git a/src/BeamAdapter/component/forcefield/AdaptiveInflatableBeamForceField.h b/src/BeamAdapter/component/forcefield/AdaptiveInflatableBeamForceField.h
@@ -154,7 +154,7 @@ class AdaptiveInflatableBeamForceField : public Mass<DataTypes>
     /// Mass Interface
     /////////////////////////////////////
     virtual void addMDx(const MechanicalParams* mparams, DataVecDeriv& f, const DataVecDeriv& dx, SReal factor) override;
-    virtual void addMToMatrix(const MechanicalParams *mparams, const MultiMatrixAccessor* matrix) override;
+    virtual void doAddMToMatrix(const MechanicalParams *mparams, const MultiMatrixAccessor* matrix) override;
     virtual void addMBKToMatrix(const MechanicalParams* mparams, const MultiMatrixAccessor* matrix) override;
 
     //TODO(dmarchal 2017-05-17) So what do we do ? For who is this message intended for ? How can we make this code "more" manageable.
diff --git a/src/BeamAdapter/component/forcefield/AdaptiveInflatableBeamForceField.inl b/src/BeamAdapter/component/forcefield/AdaptiveInflatableBeamForceField.inl
@@ -370,7 +370,7 @@ void AdaptiveInflatableBeamForceField<DataTypes>::addMDx(const MechanicalParams*
 
 
 template<class DataTypes>
-void AdaptiveInflatableBeamForceField<DataTypes>::addMToMatrix(const MechanicalParams *mparams,
+void AdaptiveInflatableBeamForceField<DataTypes>::doAddMToMatrix(const MechanicalParams *mparams,
                                                             const MultiMatrixAccessor* matrix)
 {
     MultiMatrixAccessor::MatrixRef r = matrix->getMatrix(this->mstate);

Original file line number	Diff line number	Diff line change
`@@ -341,7 +341,7 @@ void AdaptiveBeamForceFieldAndMass<DataTypes>::addMDx(const MechanicalParams* mp`
`341`	`341`
`342`	`342`
`343`	`343`	`template<class DataTypes>`
`344`		`-void AdaptiveBeamForceFieldAndMass<DataTypes>::addMToMatrix(const MechanicalParams *mparams,`
	`344`	`+void AdaptiveBeamForceFieldAndMass<DataTypes>::doAddMToMatrix(const MechanicalParams *mparams,`
`345`	`345`	`const MultiMatrixAccessor* matrix)`
`346`	`346`	`{`
`347`	`347`	`MultiMatrixAccessor::MatrixRef r = matrix->getMatrix(mstate);`
Original file line number	Diff line number	Diff line change
`@@ -370,7 +370,7 @@ void AdaptiveInflatableBeamForceField<DataTypes>::addMDx(const MechanicalParams*`
`370`	`370`
`371`	`371`
`372`	`372`	`template<class DataTypes>`
`373`		`-void AdaptiveInflatableBeamForceField<DataTypes>::addMToMatrix(const MechanicalParams *mparams,`
	`373`	`+void AdaptiveInflatableBeamForceField<DataTypes>::doAddMToMatrix(const MechanicalParams *mparams,`
`374`	`374`	`const MultiMatrixAccessor* matrix)`
`375`	`375`	`{`
`376`	`376`	`MultiMatrixAccessor::MatrixRef r = matrix->getMatrix(this->mstate);`