Merge inf_dev_2022 into inf_dev_2024 #12

epernod · 2024-03-14T16:13:31Z

Compute tInfo.area in TriangularFEMForceField
Container access to avoid unecessary check: [SolidMechanics.FEM] Small update on container access to avoid unecessary check sofa-framework/sofa#4639
[Topology] Add function in BaseMeshTopology to compute all topology containers: [Topology] Add function in BaseMeshTopology to compute all topology containers sofa-framework/sofa#3368
TopologyChangeType framework changes
Edge2QuadTopologyMapping clean
Quick fix in Geomagic?
Some SofaCuda Benchmarks
SofaPhysicsAPI bindings

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).

…er is not dynamic to make it more clear. Also activate it only if owner component is not muted.

…3D FixedConstraint

# Conflicts: # Sofa/Component/Constraint/Projective/src/sofa/component/constraint/projective/FixedConstraint.cpp # applications/plugins/SofaCUDA/CMakeLists.txt # applications/plugins/SofaCUDA/SofaCUDAConfig.cmake.in # applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaExtraMonitor.cpp # applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaSpringForceField.cpp

…coupledConstraintCorrection, LinearSolverConstraintCorrection and PrecomputedConstraintCorrection

…pecialisation

…nstraintCorrection.cpp Co-authored-by: Alex Bilger <alxbilger@users.noreply.github.com>

…ound in higher element topology

…er Data

…pologyHandler stored by TopologyContainer

…ner if TopologyData is deleted.

…ent is found in higher element topology" This reverts commit 15f409a.

…l changes

# Conflicts: # applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaCollision.cpp

…or id

…utput parameters

… corresponding bindings

…cess

…s dispatcher

…del found

…uesting topology elements

# Conflicts: # Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/BilateralInteractionConstraint.cpp # Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/BilateralInteractionConstraint.h # Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/BilateralInteractionConstraint.inl # Sofa/Component/Mapping/Linear/src/sofa/component/mapping/linear/SimpleTesselatedHexaTopologicalMapping.cpp # Sofa/Component/SolidMechanics/FEM/Elastic/src/sofa/component/solidmechanics/fem/elastic/TriangularFEMForceField.inl # Sofa/Component/Topology/Container/Constant/src/sofa/component/topology/container/constant/MeshTopology.cpp # Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Edge2QuadTopologicalMapping.cpp # Sofa/framework/Core/src/sofa/core/topology/BaseMeshTopology.cpp # Sofa/framework/Core/src/sofa/core/topology/BaseMeshTopology.h # Sofa/framework/Core/src/sofa/core/topology/BaseTopology.cpp # Sofa/framework/Core/src/sofa/core/topology/TopologicalMapping.cpp # Sofa/framework/Core/src/sofa/core/topology/TopologicalMapping.h # Sofa/framework/Core/src/sofa/core/topology/TopologyChange.h # applications/plugins/SofaCUDA/CMakeLists.txt # applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaBarycentricMapping.inl # applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaCollision.cpp # applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaTriangleModel.h # applications/projects/SofaPhysicsAPI/src/SofaPhysicsAPI/SofaPhysicsAPI.h # applications/projects/SofaPhysicsAPI/src/SofaPhysicsAPI/SofaPhysicsBindings.cpp # applications/projects/SofaPhysicsAPI/src/SofaPhysicsAPI/SofaPhysicsBindings.h # applications/projects/SofaPhysicsAPI/src/SofaPhysicsAPI/SofaPhysicsOutputMesh.cpp # applications/projects/SofaPhysicsAPI/src/SofaPhysicsAPI/SofaPhysicsOutputMesh_impl.h # applications/projects/SofaPhysicsAPI/src/SofaPhysicsAPI/SofaPhysicsSimulation.cpp # applications/projects/SofaPhysicsAPI/src/SofaPhysicsAPI/SofaPhysicsSimulation.h # examples/Component/Constraint/Projective/ProjectToPlaneConstraint.scn # examples/Component/LinearSolver/Direct/FEMBAR_SVDLinearSolver.scn # examples/Component/Topology/Container/Dynamic/RemovingBilateralInteractionConstraint.scn # examples/Component/Topology/Container/Dynamic/RemovingConstraint.txt # examples/Component/Topology/Mapping/Edge2QuadTopologicalMapping.scn # examples/Components/linearsolver/FEMBAR-common.xml # examples/Components/topology/RegularGridTopology_dimension.scn

# Conflicts: # Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/BilateralInteractionConstraint.h # Sofa/Component/Constraint/Lagrangian/Model/src/sofa/component/constraint/lagrangian/model/BilateralInteractionConstraint.inl # Sofa/Component/Topology/Mapping/src/sofa/component/topology/mapping/Edge2QuadTopologicalMapping.cpp # Sofa/framework/Core/src/sofa/core/topology/BaseMeshTopology.h # Sofa/framework/Core/src/sofa/core/topology/TopologicalMapping.h # Sofa/framework/Core/src/sofa/core/topology/TopologyDataHandler.h # Sofa/framework/Core/src/sofa/core/topology/TopologyDataHandler.inl # applications/plugins/SofaCUDA/CMakeLists.txt # applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaCollision.cpp # applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaTypes.h # applications/plugins/SofaCarving/examples/SimpleCarving.py # examples/Component/LinearSolver/Direct/FEMBAR_SVDLinearSolver.scn # examples/Component/Topology/Container/Dynamic/RemovingBilateralInteractionConstraint.scn # examples/Component/Topology/Mapping/Edge2QuadTopologicalMapping.scn

# Conflicts: # Sofa/Component/SolidMechanics/TensorMass/src/sofa/component/solidmechanics/tensormass/TetrahedralTensorMassForceField.inl

epernod and others added 30 commits July 18, 2022 23:29

[SofaCUDA] Add cpu/gpu scene for SphereCollisionModel

b71443c

[src] Fix VisualModelImpl texture update whit topological changes

b95d8e5

[SofaCUDA] backup some work

0891940

[SofaCuda] Fix CMake and remove includes from legacy header

df831f9

[SofaCUDA] Fix cmake.in libs

f28104a

[Core.Topology] Fix info message when Topology given to topologyHandl…

d1b2564

…er is not dynamic to make it more clear. Also activate it only if owner component is not muted.

[Constraint.Projective] Fix restoreLastState in draw method for Rigid…

ae04573

…3D FixedConstraint

[Topology.Container] Fix restoreLastState in draw method

a23af7b

[SofaSphFluid] remove old getTemplateName api

29b9d26

[SofaCuda] remove old getTemplateName api

331c365

[SofaCUDA] Add cudaVec3f and CudaVec3f1 template compatibility for Un…

6cb153f

…coupledConstraintCorrection, LinearSolverConstraintCorrection and PrecomputedConstraintCorrection

[SofaCUDA] split the Cuda Constraint correction into 3 files.

ee28641

[SofaCUDA] Update namespace in CUDA constraint correction component s…

cd6ad22

…pecialisation

Update applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaLinearSolverCo…

d40d647

…nstraintCorrection.cpp Co-authored-by: Alex Bilger <alxbilger@users.noreply.github.com>

Update CudaLinearSolverConstraintCorrection.cpp

7219467

[Topology.c.dynamic] Fix initTopology call chains if not element is f…

15f409a

…ound in higher element topology

[Type] Add NoInit constructor for quat class

655cb25

[Topology] Add method to remove child TopolodyData from Topology buff…

33bafcb

…er Data

[Topology] Add method to remove a TopologyHandler from the list of To…

ca870ba

…pologyHandler stored by TopologyContainer

[Topology] Remove old Disabled and Deprecated method

536dfda

[Topology] Add mecanism to remove TopologyHandler from TopologyContai…

4b8086a

…ner if TopologyData is deleted.

Revert "[Topology.c.dynamic] Fix initTopology call chains if not elem…

98c644e

…ent is found in higher element topology" This reverts commit 15f409a.

[Topology_test] Remove some warnings in scenes

e2702a7

[Topology_test] Factorize some code in EdgeSetTopology_test

5542fde

[Topology_test] Some cleaning in EdgeSetTopology_test

9f4c0bb

[Topology_test] Add tests in EdgeSetTopology_test to check topologica…

5a5070b

…l changes

[Topology_test] Some cleaning in EdgeSetTopology_test

11a79a7

[Topology] Fix init of points in case of empty mesh with only points

9f06b30

Merge branch 'master' into inf_dev_2022

892de31

# Conflicts: # applications/plugins/SofaCUDA/sofa/gpu/cuda/CudaCollision.cpp

epernod added 18 commits November 17, 2022 14:58

[SofaPhysicsAPI] Add getGravity method taking output parameters

33238f4

[SofaPhysicsAPI] Add methods to get Access to outputMesh* using name …

d296d55

…or id

[SofaPhysicsAPI] Add SofaPhysicsBinding

aba01bd

[SofaPhysicsAPI] Add methods and bindings to access mesh data using o…

0d17c24

…utput parameters

[SofaPhysicsAPI] Add methods load Sofa.ini file and unload of scene +…

b61dd17

… corresponding bindings

[SofaPhysicsAPI] Fix some return code in scene loading and gravity ac…

8380d9e

…cess

[SofaPhysicsAPI] Add api method and bindings to retrieve SOFA message…

0aadab6

…s dispatcher

[SofaPhysicsAPI] Backup logs on scene loading and number of visual mo…

9e7af08

…del found

[SofaPhysicsAPI] Add bindings to load plugin

df75884

[SofaPhysicsAPI] Fix SofaPhysicsOutputMesh creation

49cbbbd

[SofaPhysicsAPI] Fix possible segfault if mesh is null in methods req…

2193297

…uesting topology elements

[SofaPhysicsAPI] Fix method get SofaPhysicsOutputMesh using mesh name

18821f2

[SofaPhysicsAPI] Fix method getSimulationStep

e86596f

[src] Fix getVPositions if vertices2 is present

91b40fe

[Geomagic] Check component status before killing it

4e5cd80

Backup some changes from demo

c47e01c

epernod added pr: fix pr: new feature labels Mar 14, 2024

Merge branch 'master' into inf_dev_2022

58a3673

# Conflicts: # Sofa/Component/SolidMechanics/TensorMass/src/sofa/component/solidmechanics/tensormass/TetrahedralTensorMassForceField.inl

epernod force-pushed the inf_dev_2024 branch 2 times, most recently from 45afd0c to 164f9aa Compare May 17, 2024 12:17

epernod force-pushed the inf_dev_2024 branch from c2f56b5 to e41554c Compare June 14, 2024 00:41

epernod force-pushed the inf_dev_2024 branch from 1d9cdf3 to 1d845f2 Compare July 15, 2024 12:23

epernod force-pushed the inf_dev_2024 branch from 4ec92aa to 4aa12ba Compare August 12, 2024 16:28

epernod force-pushed the inf_dev_2024 branch from 83f7358 to 92a6f5f Compare August 28, 2024 22:47

epernod force-pushed the inf_dev_2024 branch from 92a6f5f to 48d05b5 Compare October 26, 2024 20:08

epernod force-pushed the inf_dev_2024 branch from 48d05b5 to f9273f2 Compare December 11, 2024 14:22

epernod force-pushed the inf_dev_2024 branch from 0d9f946 to 600748b Compare December 22, 2024 16:02

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge inf_dev_2022 into inf_dev_2024 #12

Merge inf_dev_2022 into inf_dev_2024 #12

epernod commented Mar 14, 2024 •

edited

Loading

Merge inf_dev_2022 into inf_dev_2024 #12

Are you sure you want to change the base?

Merge inf_dev_2022 into inf_dev_2024 #12

Conversation

epernod commented Mar 14, 2024 • edited Loading

epernod commented Mar 14, 2024 •

edited

Loading