Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge inf_dev_2021 into inf_dev_2024 #11

Open
wants to merge 156 commits into
base: inf_dev_2024
Choose a base branch
from
Open

Merge inf_dev_2021 into inf_dev_2024 #11

wants to merge 156 commits into from

Conversation

epernod
Copy link
Owner

@epernod epernod commented Mar 14, 2024 •
edited
Loading

By submitting this pull request, I acknowledge that
I have read, understand, and agree SOFA Developer Certificate of Origin (DCO).

Reviewers will merge this pull-request only if

  • it builds with SUCCESS for all platforms on the CI.
  • it does not generate new warnings.
  • it does not generate new unit test failures.
  • it does not generate new scene test failures.
  • it does not break API compatibility.
  • it is more than 1 week old (or has fast-merge label).

epernod and others added 30 commits February 2, 2021 23:55
@epernod
Add more information in some logs and remove some unecessary.
97f8d20
@epernod
Fix TrianglePressureFF force display
d2d7591
@epernod
Merge branch 'master' into inf_dev_2021
83ef71c
@epernod
[Geomagic] Fix GeomagicVisualModel compilation
85fa4e1
@epernod
[SofaMiscFem] remove deprecated getFracturableEdge option from Triang…
147f65a 
…ularFEMForceField. Not used and should not work.
@epernod
[SofaMiscFem] Fix TriangularFEMForceField default display to show str…
30ab0a1 
…ess value.
@epernod
[SofaCUDA] Fix CudaFixedConstraint when indices are not contiguous
a3d5911
@epernod
[SofaCUDA] Add more examples for liver scene and squareTissue
f2f4f02
@epernod
Fix removing element from triangleModel when an Hexa2TetraTopological…
f998d01 
…Mapping is in the scene.
@epernod
Merge branch 'master' into inf_dev_2021
7649bb9 
# Conflicts:
#	modules/SofaMiscFem/src/SofaMiscFem/TriangularFEMForceField.inl
@epernod
Merge branch 'master' into inf_dev_2021
23acf19
@epernod
[SofaGeneralDeformable] Clean TriangularBendingSpring class from comm…
42a1b47 
…ented code and minor various changes
@epernod
[SofaGeneralDeformable] Clean TriangularBendingSprings code. No major…
ae364d7 
… changes, just clean the loops, use accessors instead of beginEdit and use Real instead of double.
@epernod
[SofaGeneralDeformable] Add comments in TriangularBendingSpring header
dba291c
@epernod
[SofaGeneralDeformable] Add accessor to poentialEnergy accumulated value
6e50598
@epernod
[SofaGeneralDeformable] Rename TriangularBendingSpring stiffness and …
a9979f1 
…damping Data with d_ prefix. Add value check in setter to avoid negative values and test values at init stage
@epernod
[test] Add basic tests for TriangularBendingSpring component
6885e7a
@guparan
Update TriangularBendingSprings.h
e0d10aa
@epernod
[SofaBaseTopology] Fix TopologySubsetData call to creation/desctructi…
a65046d 
…on callback method was missing during add/remove process
@epernod
[SofaBaseTopology] Add method to register callback to tpologyHandler …
17e6e9c 
…directly from the topologyData
@epernod
[SofaBaseTopology] Various cleaning to use TopologyHandler instead of…
698c9e3 
… engine in variable names and comments
@epernod
[SofaBaseTopology] Ensure to add a topologyEnd event before propagati…
035a2a3 
…ng the queue of events to the handlers
@epernod
[SofaBaseMechanics] UpdateUniformMass to use TopologySubsetIndices fo…
900e053 
…r Data indices and remove handleTopologyChange method.
@epernod
[SofaBaseMechanics] Fix the gravity center display when using a subse…
037e15b 
…t of indices and also display the points involved
@epernod
[SofaBaseMechanics] Fix the topological changes handling when point a…
9c601b9 
…re removed. At the end of the events, recompute the current mass.
@epernod
Remove unused variable
7b56d6c
@epernod
Merge branch 'master' into inf_dev_2021
21967dc 
# Conflicts:
#	applications/plugins/SofaCUDA/examples/SquareTissue-cpu.scn
#	applications/plugins/SofaCUDA/examples/SquareTissue-cuda.scn
#	applications/plugins/SofaCUDA/examples/liver-CUDA.scn
@epernod
[SofaBaseTopology] Fix TopologySubsetData call to creation/desctructi…
e6d2ddf 
…on callback method was missing during add/remove process
@epernod
Fix gcc compilation
10e14d2
@epernod
[SofaBaseTopology] Add method to register callback to tpologyHandler …
2da9cbe 
…directly from the topologyData
epernod added 18 commits January 11, 2022 23:58
@epernod
[SofaCUDA] some basic cleaning in Point/Line/Triangle/Sphere Collisio…
8a22025 
…nModel
@epernod
[SofaCUDA] backup work on collision in GPU
8a689db
@epernod
Merge branch 'master' into inf_dev_2021
e01ce1c 
# Conflicts:
#	applications/plugins/SofaCUDA/CMakeLists.txt
#	applications/plugins/SofaCUDA/scenes/benchmarks/TriangularFEMForceFieldOptim_tissue100x100_cpu.scn
#	applications/plugins/SofaCUDA/scenes/benchmarks/TriangularFEMForceFieldOptim_tissue100x100_gpu.scn
#	applications/plugins/SofaCUDA/scenes/cpu-gpu_validation/CudaTriangularFEMForceFieldOptim_tissue100x100_implicit.scn
#	applications/plugins/SofaCUDA/scenes/cpu-gpu_validation/CudaTriangularFEMForceFieldOptim_tissue20x20_implicit.scn
@epernod
[SofaCUDA] update .scene-tests files
c01eb69
@epernod
[SofaCUDA] Some harmless cleaning in Cuda Identify and subsetMapping
cf6058b
@epernod
[SofaCUDA] Update CudaCollision element aliases
9941b75
@epernod
[SofaCUDA] Some harmless cleaning in CudaCollision and CudaContactMapper
70f1791
@epernod
[SofaObjectInteraction] move inner class contact out from PenalityCon…
e43e34c 
…tactFF
@epernod
[SofaCUDA] Update CudaPenalityContactForceField to match the cpu vers…
978f9b8 
…ion for the moment.
@epernod
[SofaCUDA] Add CudaMinProximityIntersection and fix sphere sphere col…
e304841 
…lision detection
@epernod
[SofaCUDA] Fix CudaSphereCollision radius setup in mapper
4770ccf
@epernod
[SofaCUDA] Add cpu/gpu scene for SphereCollisionModel
10b66d0
@epernod
change scene names
a30fc10
@epernod
[SofaCUDA] backup work on CudaTriangleModel
60074f6
@epernod
[SofaGuiQt] Add Penalitycontact Data display
3bb58c9
@epernod
Merge branch 'master' into inf_dev_2021
9fd62d3 
# Conflicts:
#	applications/plugins/SofaCUDA/examples/.scene-tests
#	applications/plugins/SofaCUDA/scenes/.scene-tests
#	modules/SofaMiscFem/src/SofaMiscFem/FastTetrahedralCorotationalForceField.h
@epernod
Merge branch 'master' into inf_dev_2021
f6be7f6 
# Conflicts:
#	Sofa/Component/SolidMechanics/FEM/HyperElastic/tests/FastTetrahedralCorotationalForceField_test.cpp
#	Sofa/Component/Visual/src/sofa/component/visual/VisualModelImpl.cpp
#	Sofa/GUI/Qt/src/sofa/gui/qt/StructDataWidget.h
#	SofaKernel/modules/Sofa.Geometry/src/sofa/geometry/Edge.h
#	SofaKernel/modules/Sofa.Geometry/src/sofa/geometry/Triangle.h
#	SofaKernel/modules/SofaBaseLinearSolver/src/SofaBaseLinearSolver/CGLinearSolver.inl
#	SofaKernel/modules/SofaBaseMechanics/src/SofaBaseMechanics/BarycentricMappers/BarycentricMapperTopologyContainer.inl
#	SofaKernel/modules/SofaBaseMechanics/src/SofaBaseMechanics/BarycentricMapping.inl
#	SofaKernel/modules/SofaBaseMechanics/src/SofaBaseMechanics/UniformMass.inl
#	SofaKernel/modules/SofaCore/src/sofa/core/topology/TopologyData.inl
#	SofaKernel/modules/SofaDeformable/src/SofaDeformable/RestShapeSpringsForceField.inl
#	SofaKernel/modules/SofaObjectInteraction/src/SofaObjectInteraction/PenalityContactForceField.h
#	applications/plugins/SofaCUDA/CMakeLists.txt
#	applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaCollision.cpp
#	applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaContactMapper.h
#	applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaFixedConstraint.h
#	applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaFixedConstraint.inl
#	applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaIdentityMapping.h
#	applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaIdentityMapping.inl
#	applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaLineModel.cpp
#	applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaLineModel.h
#	applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaMath.h
#	applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaPenalityContactForceField.cpp
#	applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaPenalityContactForceField.h
#	applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaPenalityContactForceField.inl
#	applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaPointModel.h
#	applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaSphereModel.cpp
#	applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaSphereModel.h
#	applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaSpringForceField.inl
#	applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaSubsetMapping.h
#	applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaSubsetMapping.inl
#	applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaTriangleModel.cpp
#	applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaTriangleModel.h
#	applications/plugins/SofaCUDA/src/SofaCUDA/component/collision/geometry/CudaPointModel.cpp
#	applications/plugins/SofaCUDA/src/SofaCUDA/component/mapping/linear/CudaIdentityMapping.cpp
#	applications/plugins/SofaCUDA/src/SofaCUDA/component/mapping/linear/CudaSubsetMapping.cpp
#	examples/Component/Topology/Container/Dynamic/HexahedronVsTetrahedronForceFieldTopology.scn
#	examples/Component/Topology/Container/Dynamic/RemovingGridTetraProcess.scn
#	examples/Components/topology/TopologicalModifiers/HexahedronForceFieldTopologyChangeHandling.scn
#	examples/Components/topology/TopologicalModifiers/TetrahedronForceFieldTopologyChangeHandling.scn
#	modules/SofaConstraint/src/SofaConstraint/PrecomputedConstraintCorrection.inl
#	modules/SofaMiscFem/SofaMiscFem_test/CMakeLists.txt
#	modules/SofaMiscFem/src/SofaMiscFem/FastTetrahedralCorotationalForceField.h
#	modules/SofaMiscFem/src/SofaMiscFem/StandardTetrahedralFEMForceField.inl
#	modules/SofaMiscFem/src/SofaMiscFem/TriangularFEMForceField.h
#	modules/SofaNonUniformFem/src/SofaNonUniformFem/NonUniformHexahedralFEMForceFieldAndMass.h
#	modules/SofaNonUniformFem/src/SofaNonUniformFem/NonUniformHexahedralFEMForceFieldAndMass.inl
@epernod
Merge branch 'master' into inf_dev_2021
83f5ab6 
# Conflicts:
#	Sofa/GUI/Qt/src/sofa/gui/qt/RealGUI.cpp
#	applications/plugins/SofaCUDA/src/SofaCUDA/component/constraint/projective/CudaFixedConstraint.cu
@epernod epernod force-pushed the inf_dev_2024 branch 2 times, most recently from 45afd0c to 164f9aa Compare May 17, 2024 12:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
pr: fix pr: new feature
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@epernod @guparan @alxbilger @fredroy