Skip to content

Commit 1958684

Browse files
committed
Squashed commit of the following:
commit 1a67763 Author: Hugo <[email protected]> Date: Wed Feb 26 09:17:18 2025 +0100 Fix compilation further to lifecycle v25.06 (SofaDefrost#154) commit 5b83e73 Author: Paul Baksic <[email protected]> Date: Fri Jan 31 15:20:52 2025 +0100 Remove debug files and filter them in gitignore (SofaDefrost#153) * Remove all debug files * Add rule for filtering debug files * Revert changes regarding discussions commit f42f835 Merge: 8b4514f 32ab0f4 Author: Hugo <[email protected]> Date: Wed Jan 22 10:06:13 2025 +0100 Merge pull request SofaDefrost#150 from alxbilger/test Fix tests compilation with respect to SOFA commit 8b4514f Merge: b482378 09d07e3 Author: Olivier Roussel <[email protected]> Date: Mon Jan 20 17:08:57 2025 +0100 Merge pull request SofaDefrost#151 from olivier-roussel/remove-python2 Remove deprecated python2.7 support commit 09d07e3 Author: Olivier Roussel <[email protected]> Date: Mon Jan 20 15:34:00 2025 +0100 Remove deprecated python2.7 support commit 32ab0f4 Author: Alex Bilger <[email protected]> Date: Thu Jan 16 09:34:18 2025 +0100 Fix tests compilation with respect to SOFA commit b482378 Merge: 6902943 f27d45d Author: Hugo <[email protected]> Date: Fri Dec 13 15:49:29 2024 +0100 Merge pull request SofaDefrost#142 from bakpaul/0924_fix_morinteractionconstraint Fix parameters usage and some deleted attributes regarding SOFA PR 5003 commit f27d45d Author: Paul Baksic <[email protected]> Date: Wed Sep 18 17:33:16 2024 +0200 Remove getConstraintViolaiton from class declaration commit 30ddac7 Author: Paul Baksic <[email protected]> Date: Wed Sep 18 16:42:46 2024 +0200 Fix parameters usage and some deleted attributes
1 parent b8fb227 commit 1958684

33 files changed

+46
-2817
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,3 +127,5 @@ dmypy.json
127127

128128
# Pyre type checker
129129
.pyre/
130+
131+
*/debug/

CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,6 @@ if (CollisionOBBCapsule_FOUND)
9797
endif()
9898

9999
# Config files and install rules for pythons scripts
100-
sofa_install_pythonscripts(PLUGIN_NAME ${PROJECT_NAME} PYTHONSCRIPTS_SOURCE_DIR "python")
101-
102100
find_file(SofaPython3Tools NAMES "SofaPython3/lib/cmake/SofaPython3/SofaPython3Tools.cmake")
103101
if(SofaPython3Tools)
104102
message("-- Found SofaPython3Tools.")

ModelOrderReduction_test/ModelOrderReduction_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace sofa {
2424
simulation::Simulation* simulation;
2525

2626
/// Create the context for the scene
27-
void SetUp()
27+
void doSetUp() override
2828
{
2929
root = simulation::getSimulation()->createNewGraph("root");
3030
}
@@ -37,7 +37,7 @@ namespace sofa {
3737
}
3838

3939
/// Unload the scene
40-
void TearDown()
40+
void doTearDown() override
4141
{
4242
if (root != nullptr)
4343
{

examples/organs/liver/reduced/liver/debug/debug_scene.py

Lines changed: 0 additions & 36 deletions
This file was deleted.

examples/organs/liver/reduced/liver/debug/stateFile.state

Lines changed: 0 additions & 85 deletions
This file was deleted.

examples/organs/liver/reduced/liver/debug/step2_stateFile.state

Lines changed: 0 additions & 85 deletions
This file was deleted.

examples/organs/liver/reduced/liver_hyperElastic/debug/debug_scene.py

Lines changed: 0 additions & 36 deletions
This file was deleted.

examples/organs/liver/reduced/liver_hyperElastic/debug/stateFile.state

Lines changed: 0 additions & 85 deletions
This file was deleted.

examples/organs/liver/reduced/liver_hyperElastic/debug/step2_stateFile.state

Lines changed: 0 additions & 85 deletions
This file was deleted.

examples/softRobots/diamond/reduced/diamond/debug/debug_scene.py

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)