Merge branch 'master' of https://github.com/sofa-framework/sofa

Author: SperryBot

Sofa/framework/Core/src/sofa/core/behavior/MatrixAPICompatibility.h

@@ -112,6 +112,7 @@ class AddToMatrixCompatMatrix : public sofa::linearalgebra::BaseMatrix
 
         msg_error(component) << compatibilityMessage << "set is not a supported operation in the compatibility";
     }
+    using linearalgebra::BaseMatrix::add;
     void add(Index row, Index col, double v) override
     {
         if constexpr (c == matrixaccumulator::Contribution::MASS)
@@ -215,6 +216,7 @@ class ApplyConstraintCompat : public sofa::linearalgebra::BaseMatrix
         SOFA_UNUSED(j);
         SOFA_UNUSED(v);
     }
+    using linearalgebra::BaseMatrix::add;
     void add(Index row, Index col, double v) override
     {
         SOFA_UNUSED(row);

Sofa/framework/Helper/src/sofa/helper/system/FileSystem.cpp

@@ -198,21 +198,28 @@ bool FileSystem::createDirectory(const std::string& path)
             struct stat st_buf;
             if (stat(path.c_str(), &st_buf) == 0)
             {
-                if ((st_buf.st_mode & S_IFMT) != S_IFDIR) {
-                    msg_error(error) << path << ": File exists and is not a directoy";
+                if ((st_buf.st_mode & S_IFMT) != S_IFDIR)
+                {
+                    msg_error(error) << path << ": File exists and is not a directory";
                     return true;
                 }
                 else
                 {
+                    // 'path' was already created and is a folder
                     return false;
                 }
             }
-
+            else
+            {
+                msg_error(error) << path << ": Unknown error while trying to create this directory.";
+                return true;
+            }
         }
     }
 #endif
     else
     {
+        // 'path' has been created sucessfully
         return false;
     }
 }

Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/BTDMatrix.h

@@ -177,6 +177,7 @@ class BTDMatrix : public linearalgebra::BaseMatrix
 
     void set(Index i, Index j, double v) override;
 
+    using BaseMatrix::add;
     void add(Index i, Index j, double v) override;
 
     /**

Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/BlockFullMatrix.h

@@ -155,6 +155,7 @@ class BlockFullMatrix : public linearalgebra::BaseMatrix
 
     void set(Index i, Index j, double v) override;
 
+    using BaseMatrix::add;
     void add(Index i, Index j, double v) override;
 
     void clear(Index i, Index j) override;

Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/CompressedRowSparseMatrixMechanical.h

@@ -262,6 +262,8 @@ class CompressedRowSparseMatrixMechanical final // final is used to allow the co
         traits::vset(*this->wblock(i, j, true), bi, bj, static_cast<Real>(v) );
     }
 
+    using BaseMatrix::add;
+
     /**
     * \brief add scalar v at element i, j of matrix
     **/

Sofa/framework/LinearAlgebra/src/sofa/linearalgebra/EigenBaseSparseMatrix.h

@@ -112,6 +112,8 @@ class EigenBaseSparseMatrix : public linearalgebra::BaseMatrix
 
 
 
+    using BaseMatrix::add;
+
     /// Schedule the addition of the value at the given place. Scheduled additions must be finalized using function compress().
     void add( Index row, Index col, double value ) override{
         if( value!=0.0 ) incoming.push_back( Triplet(row,col,(Real)value) );