Merge pull request #2 from hugtalbot/fix_compatibility_with_NG

Update to be compatible with SOFA NG
sofa-framework · Aug 12, 2022 · a6336c8 · a6336c8
2 parents 1e7d7bf + b254b1d
commit a6336c8
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 17 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-20.04, macos-10.15, windows-2019]
-        sofa_branch: [master, v21.12]
+        sofa_branch: [master, v22.06]
 
     steps:
       - name: Setup SOFA and environment

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,9 +1,8 @@
 cmake_minimum_required(VERSION 3.12)
-project(SofaMJEDFEM VERSION 21.12 LANGUAGES CXX)
+project(SofaMJEDFEM VERSION 22.06 LANGUAGES CXX)
 
-find_package(SofaFramework REQUIRED)
-find_package(SofaBaseTopology REQUIRED)
-find_package(SofaBaseMechanics REQUIRED)
+find_package(Sofa.Framework REQUIRED)
+find_package(Sofa.Component REQUIRED)
 find_package(Sofa.GL REQUIRED)
 
 set(SOFAMJEDFEM_SRC_DIR src/SofaMJEDFEM)
@@ -40,7 +39,7 @@ add_library(${PROJECT_NAME} SHARED ${HEADER_FILES} ${SOURCE_FILES} ${README_FILE
 
 
 # Link the plugin library to its dependency
-target_link_libraries(${PROJECT_NAME} SofaBaseTopology SofaBaseMechanics Sofa.GL)
+target_link_libraries(${PROJECT_NAME} Sofa.Core Sofa.Type Sofa.DefaultType Sofa.Component.Topology Sofa.Component.StateContainer Sofa.Component.SolidMechanics.FEM.HyperElastic Sofa.GL)
 
 
 # Create package Config, Version & Target files

diff --git a/SofaMJEDFEMConfig.cmake.in b/SofaMJEDFEMConfig.cmake.in
@@ -3,9 +3,8 @@
 @PACKAGE_GUARD@
 @PACKAGE_INIT@
 
-find_package(SofaFramework REQUIRED)
-find_package(SofaBaseTopology REQUIRED)
-find_package(SofaBaseMechanics REQUIRED)
+find_package(Sofa.Framework REQUIRED)
+find_package(Sofa.Component REQUIRED)
 find_package(Sofa.GL REQUIRED)
 
 if(NOT TARGET @PROJECT_NAME@)

diff --git a/src/SofaMJEDFEM/MJEDTetrahedralForceField.inl b/src/SofaMJEDFEM/MJEDTetrahedralForceField.inl
@@ -1116,7 +1116,9 @@ type::Mat<3,3,double> MJEDTetrahedralForceField<DataTypes>::getForce(int Tetrahe
 	tetInfo=&tetrahedronInf[TetrahedronIndex];
         type::Mat<3,3,double> force,inverseDeformationGradient;
 	force.clear();
-	inverseDeformationGradient.invert(tetInfo->deformationGradient);
+    const bool canInvert = inverseDeformationGradient.invert(tetInfo->deformationGradient);
+    assert(canInvert);
+    SOFA_UNUSED(canInvert);
 	for(unsigned int w=0;w<isExponential.size();++w){
 		if(!isExponential[w]){
 			force+=(tetInfo->sumfS[w].MatSymMultiply(tetInfo->deformationGradient)+inverseDeformationGradient.transposed()*tetInfo->sumDfg[w]*tetInfo->J)*tetInfo->coeff[w];

diff --git a/src/SofaMJEDFEM/fem/material/NeoHookeanIsotropicMJED.h b/src/SofaMJEDFEM/fem/material/NeoHookeanIsotropicMJED.h
@@ -21,7 +21,7 @@
 ******************************************************************************/
 #pragma once
 
-#include <SofaMiscFem/HyperelasticMaterial.h>
+#include <sofa/component/solidmechanics/fem/hyperelastic/material/HyperelasticMaterial.h>
 #include <sofa/type/Vec.h>
 #include <sofa/type/Mat.h>
 #include <string>

diff --git a/src/SofaMJEDFEM/fem/material/material.cpp b/src/SofaMJEDFEM/fem/material/material.cpp
@@ -21,12 +21,6 @@
 ******************************************************************************/
 //used only to test compilation and dependencies in SOFA. (TODO: see if it has to be removed, or to be removed as soon as another .cpp include them)
 
-#include <SofaMiscFem/BoyceAndArruda.h>
-#include <SofaMiscFem/MooneyRivlin.h>
-#include <SofaMiscFem/STVenantKirchhoff.h>
-#include <SofaMiscFem/HyperelasticMaterial.h>
-#include <SofaMiscFem/VerondaWestman.h>
-#include <SofaMiscFem/Costa.h>
 #include <SofaMJEDFEM/fem/material/NeoHookean.h>
 #include <SofaMJEDFEM/fem/material/NeoHookeanIsotropicMJED.h>
 #include <SofaMJEDFEM/fem/material/Ogden.h>