Merge pull request #1392 from hugtalbot/fix_caduceus

[examples] Fix caduceus
sofa-framework · May 21, 2020 · cba138a · cba138a
2 parents fc3a033 + 1bbcd76
commit cba138a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/applications/plugins/SofaMiscCollision/TetrahedronModel.cpp b/applications/plugins/SofaMiscCollision/TetrahedronModel.cpp
@@ -53,9 +53,9 @@ int TetrahedronCollisionModelClass = core::RegisterObject("collision model using
 TetrahedronCollisionModel::TetrahedronCollisionModel()
     : tetra(nullptr)
     , mstate(nullptr)
-    , l_topology(initLink("topology", "link to the topology container"))
     , m_topology(nullptr)
     , m_topologyRevision(-1)
+    , l_topology(initLink("topology", "link to the topology container"))
 {
     enum_type = TETRAHEDRON_TYPE;
 }

diff --git a/examples/Demos/caduceus.scn b/examples/Demos/caduceus.scn
@@ -31,7 +31,7 @@
         <MechanicalObject name="dofs"  scale="1" dy="2" position="@grid.position"  tags="NoPicking" />
         <UniformMass totalMass="1.0" />
         <HexahedronFEMForceField name="FEM" youngModulus="30000.0" poissonRatio="0.3" method="large" updateStiffnessMatrix="false" printLog="0" />
-        <UncoupledConstraintCorrection />
+        <UncoupledConstraintCorrection useOdeSolverIntegrationFactors="0"/>
 
         <Node name="Collis">
             <MeshObjLoader name="loader" filename="mesh/meca_snake_900tri.obj" />

diff --git a/modules/SofaSparseSolver/src/SofaSparseSolver/PrecomputedLinearSolver.inl b/modules/SofaSparseSolver/src/SofaSparseSolver/PrecomputedLinearSolver.inl
@@ -105,6 +105,7 @@ void PrecomputedLinearSolver<TMatrix,TVector >::loadMatrix(TMatrix& M)
         loadMatrixWithCSparse(M);
         if (use_file.getValue()) internalData.writeFile(ss.str().c_str(),systemSize);
 #else
+        SOFA_UNUSED(M);
         msg_error()<< "CSPARSE support is required to invert the matrix";
 #endif
     }