[Mass,MechanicalLoad] Use enumeration to clarify the code

Sofa/Component/Constraint/Projective/tests/FixedPlaneProjectiveConstraint_test.cpp

@@ -42,7 +42,9 @@ using namespace core::objectmodel;
 template<typename DataTypes>
 void createUniformMass(simulation::Node::SPtr node, component::statecontainer::MechanicalObject<DataTypes>& /*dofs*/)
 {
-    node->addObject(New<component::mass::UniformMass<DataTypes> >());
+    typename component::mass::UniformMass<DataTypes>::SPtr uniformMass = New<component::mass::UniformMass<DataTypes> >();
+    uniformMass->d_totalMass.setValue(1.0);
+    node->addObject(uniformMass);
 }
 
 template <typename _DataTypes>

Sofa/Component/Constraint/Projective/tests/FixedProjectiveConstraint_test.cpp

@@ -45,7 +45,9 @@ using core::objectmodel::New;
 template<typename DataTypes>
 void createUniformMass(simulation::Node::SPtr node, component::statecontainer::MechanicalObject<DataTypes>& /*dofs*/)
 {
-    node->addObject(New<component::mass::UniformMass<DataTypes> >());
+    typename component::mass::UniformMass<DataTypes>::SPtr uniformMass = New<component::mass::UniformMass<DataTypes> >();
+    uniformMass->d_totalMass.setValue(1.0);
+    node->addObject(uniformMass);
 }
 
 template <typename _DataTypes>

Sofa/Component/Constraint/Projective/tests/PartialFixedProjectiveConstraint_test.cpp

@@ -41,7 +41,9 @@ using namespace core::objectmodel;
 template<typename DataTypes>
 void createUniformMass(simulation::Node::SPtr node, component::statecontainer::MechanicalObject<DataTypes>& /*dofs*/)
 {
-    node->addObject(New<component::mass::UniformMass<DataTypes> >());
+    typename component::mass::UniformMass<DataTypes>::SPtr uniformMass = New<component::mass::UniformMass<DataTypes> >();
+    uniformMass->d_totalMass.setValue(1.0);
+    node->addObject(uniformMass);
 }
 
 template <typename _DataTypes>

Sofa/Component/LinearSolver/Direct/tests/SparseLDLSolver_test.cpp

@@ -98,7 +98,7 @@ TEST(SparseLDLSolver, TopologyChangeEmptyMState)
     sofa::simpleapi::createObject(root, "PointSetTopologyContainer", {{"position", "0 0 0"}});
     sofa::simpleapi::createObject(root, "PointSetTopologyModifier");
     sofa::simpleapi::createObject(root, "MechanicalObject", {{"template", "Vec3"}});
-    sofa::simpleapi::createObject(root, "UniformMass");
+    sofa::simpleapi::createObject(root, "UniformMass", {{"totalMass", "1.0"}});
     sofa::simpleapi::createObject(root, "TopologicalChangeProcessor",
                                   {{"useDataInputs", "true"}, {"timeToRemove", "0.05"},
                                    {"pointsToRemove", "0"}});

Sofa/Component/Mass/src/sofa/component/mass/UniformMass.h

@@ -63,12 +63,11 @@ class UniformMass : public core::behavior::Mass<DataTypes>
     Data<SReal> d_totalMass;    ///< if >0 : total mass of this body
     sofa::core::objectmodel::DataFileName d_filenameMass; ///< a .rigid file to automatically load the inertia matrix and other parameters
 
+    /// Visualization-related data
     Data<bool>  d_showCenterOfGravity; ///< display the center of gravity of the system
     Data<float> d_showAxisSize; ///< factor length of the axis displayed (only used for rigids)
-
     Data<bool>  d_computeMappingInertia; ///< to be used if the mass is placed under a mapping
     Data<bool>  d_showInitialCenterOfGravity; ///< display the initial center of gravity of the system
-
     Data<bool>  d_showX0; ///< display the rest positions
 
     /// optional range of local DOF indices. Any computation involving only
@@ -78,6 +77,14 @@ class UniformMass : public core::behavior::Mass<DataTypes>
     DataSetIndex     d_indices; ///< optional local DOF indices. Any computation involving only indices outside of this list are discarded
     Data<bool> d_preserveTotalMass; ///< Prevent totalMass from decreasing when removing particles.
 
+    /// Enumeration specifying which data was used for initialization
+    enum class InitMethod
+    {
+        TOTALMASS,
+        VERTEXMASS
+    };
+    InitMethod m_initMethod = InitMethod::TOTALMASS;
+
     ////////////////////////// Inherited attributes ////////////////////////////
     /// https://gcc.gnu.org/onlinedocs/gcc/Name-lookup.html
     /// Bring inherited attributes and function in the current lookup context.
@@ -87,6 +94,7 @@ class UniformMass : public core::behavior::Mass<DataTypes>
     using core::objectmodel::BaseObject::getContext;
     ////////////////////////////////////////////////////////////////////////////
 
+
     /// Link to be set to the topology container in the component graph.
     SingleLink <UniformMass<DataTypes>, sofa::core::topology::BaseMeshTopology, BaseLink::FLAG_STOREPATH | BaseLink::FLAG_STRONGLINK> l_topology;
 
@@ -115,21 +123,22 @@ class UniformMass : public core::behavior::Mass<DataTypes>
 
     void loadRigidMass(const std::string& filename);
 
-    void reinit() override;
     void init() override;
     void initDefaultImpl() ;
-    void doUpdateInternal() override;
 
     /// @name Check and standard initialization functions from mass information
     /// @{
     virtual bool checkVertexMass();
     virtual void initFromVertexMass();
 
     virtual bool checkTotalMass();
-    virtual void checkTotalMassInit();
     virtual void initFromTotalMass();
     /// @}
 
+    /// Functions updating data
+    sofa::core::objectmodel::ComponentState updateFromTotalMass();
+    sofa::core::objectmodel::ComponentState updateFromVertexMass();
+
     void addMDx(const core::MechanicalParams* mparams, DataVecDeriv& f, const DataVecDeriv& dx, SReal factor) override;
     void accFromF(const core::MechanicalParams* mparams, DataVecDeriv& a, const DataVecDeriv& f) override;
     void addForce(const core::MechanicalParams* mparams, DataVecDeriv& f, const DataVecCoord& x, const DataVecDeriv& v) override;