Fix compilation of the plugin with current SOFA version

SofaDefrost · Sep 28, 2023 · 6388ef8 · 6388ef8
1 parent 2ee9b9c
commit 6388ef8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -37,8 +37,8 @@ set(HEADER_FILES
     ${MOR_SRC}/component/forcefield/HyperReducedTetrahedronHyperelasticityFEMForceField.inl
     ${MOR_SRC}/component/forcefield/HyperReducedTriangleFEMForceField.h
     ${MOR_SRC}/component/forcefield/HyperReducedTriangleFEMForceField.inl
-    ${MOR_SRC}/component/forcefield/MechanicalMatrixMapperMOR.h
-    ${MOR_SRC}/component/forcefield/MechanicalMatrixMapperMOR.inl
+#    ${MOR_SRC}/component/forcefield/MechanicalMatrixMapperMOR.h
+#    ${MOR_SRC}/component/forcefield/MechanicalMatrixMapperMOR.inl
 
     ${MOR_SRC}/component/loader/MatrixLoader.h
     ${MOR_SRC}/component/loader/MatrixLoader.inl
@@ -65,7 +65,7 @@ set(SOURCE_FILES
     ${MOR_SRC}/component/forcefield/HyperReducedTetrahedronFEMForceField.cpp
     ${MOR_SRC}/component/forcefield/HyperReducedTetrahedronHyperelasticityFEMForceField.cpp
     ${MOR_SRC}/component/forcefield/HyperReducedTriangleFEMForceField.cpp
-    ${MOR_SRC}/component/forcefield/MechanicalMatrixMapperMOR.cpp
+#    ${MOR_SRC}/component/forcefield/MechanicalMatrixMapperMOR.cpp
 
     ${MOR_SRC}/component/loader/MatrixLoader.cpp
 

diff --git a/src/ModelOrderReduction/component/contact/MORpointModel.inl b/src/ModelOrderReduction/component/contact/MORpointModel.inl
@@ -24,7 +24,7 @@
 #define MOR_POINTMODEL_INL
 
 #include <sofa/helper/config.h>
-#include <sofa/helper/proximity.h>
+#include <sofa/geometry/proximity/PointTriangle.h>
 #include <sofa/type/Mat.h>
 #include <sofa/type/Vec.h>
 #include <iostream>

diff --git a/src/ModelOrderReduction/component/forcefield/HyperReducedHexahedronFEMForceField.h b/src/ModelOrderReduction/component/forcefield/HyperReducedHexahedronFEMForceField.h
@@ -101,7 +101,6 @@ class HyperReducedHexahedronFEMForceField : public virtual HexahedronFEMForceFie
     using HexahedronFEMForceField<DataTypes>::f_poissonRatio;
     using HexahedronFEMForceField<DataTypes>::f_youngModulus;
     using HexahedronFEMForceField<DataTypes>::f_updateStiffnessMatrix;
-    using HexahedronFEMForceField<DataTypes>::f_assembling;
     using HexahedronFEMForceField<DataTypes>::_gatherPt; ///< use in GPU version
     using HexahedronFEMForceField<DataTypes>::_gatherBsize; ///< use in GPU version
     using HexahedronFEMForceField<DataTypes>::f_drawing; ///<  draw the forcefield if true

diff --git a/src/ModelOrderReduction/component/mapping/ModelOrderReductionMapping.h b/src/ModelOrderReduction/component/mapping/ModelOrderReductionMapping.h
@@ -85,7 +85,7 @@ class ModelOrderReductionMapping : public core::Mapping<TIn, TOut>
 
     typedef type::Vec3 Vector3;
 
-    typedef core::topology::BaseMeshTopology::index_type Index;
+    typedef sofa::Index Index;
     typedef core::topology::BaseMeshTopology::Tetra Element;
     typedef core::topology::BaseMeshTopology::SeqTetrahedra VecElement;