diff --git a/Base/Constraint/CMakeLists.txt b/Base/Constraint/CMakeLists.txt index 2d6071fe72a1239ff1da794f084af06fad99dcd8..ef688956fc9d535a1bf35871043619db5629a517 100644 --- a/Base/Constraint/CMakeLists.txt +++ b/Base/Constraint/CMakeLists.txt @@ -7,6 +7,7 @@ imstk_add_library( Constraint Core Geometry SceneElements + DynamicalModels ) #----------------------------------------------------------------------------- diff --git a/Base/DynamicalModels/CMakeLists.txt b/Base/DynamicalModels/CMakeLists.txt new file mode 100644 index 0000000000000000000000000000000000000000..3ccfcc4535d2ef53403e4fed3a9ffe4dfb73b77e --- /dev/null +++ b/Base/DynamicalModels/CMakeLists.txt @@ -0,0 +1,26 @@ +#----------------------------------------------------------------------------- +# Create target +#----------------------------------------------------------------------------- +include(imstkAddLibrary) +imstk_add_library( DynamicalModels + DEPENDS + Core + Geometry + Constraint + TimeIntegrators + Solvers + VegaFEM::massSpringSystem + VegaFEM::corotationalLinearFEM + VegaFEM::isotropicHyperelasticFEM + VegaFEM::forceModel + VegaFEM::stvk + VegaFEM::graph + VegaFEM::volumetricMesh + ) + +#----------------------------------------------------------------------------- +# Testing +#----------------------------------------------------------------------------- +if( iMSTK_BUILD_TESTING ) + add_subdirectory( Testing ) +endif() diff --git a/Base/ForceModel/CMakeLists.txt b/Base/DynamicalModels/InternalForceModel/CMakeLists--.txt similarity index 100% rename from Base/ForceModel/CMakeLists.txt rename to Base/DynamicalModels/InternalForceModel/CMakeLists--.txt diff --git a/Base/ForceModel/imstkCorotationalFEMForceModel.cpp b/Base/DynamicalModels/InternalForceModel/imstkCorotationalFEMForceModel.cpp similarity index 100% rename from Base/ForceModel/imstkCorotationalFEMForceModel.cpp rename to Base/DynamicalModels/InternalForceModel/imstkCorotationalFEMForceModel.cpp diff --git a/Base/ForceModel/imstkCorotationalFEMForceModel.h b/Base/DynamicalModels/InternalForceModel/imstkCorotationalFEMForceModel.h similarity index 100% rename from Base/ForceModel/imstkCorotationalFEMForceModel.h rename to Base/DynamicalModels/InternalForceModel/imstkCorotationalFEMForceModel.h diff --git a/Base/ForceModel/imstkFEElasticityForceModel.h b/Base/DynamicalModels/InternalForceModel/imstkFEElasticityForceModel.h similarity index 100% rename from Base/ForceModel/imstkFEElasticityForceModel.h rename to Base/DynamicalModels/InternalForceModel/imstkFEElasticityForceModel.h diff --git a/Base/ForceModel/imstkForceModelConfig.cpp b/Base/DynamicalModels/InternalForceModel/imstkForceModelConfig.cpp similarity index 100% rename from Base/ForceModel/imstkForceModelConfig.cpp rename to Base/DynamicalModels/InternalForceModel/imstkForceModelConfig.cpp diff --git a/Base/ForceModel/imstkForceModelConfig.h b/Base/DynamicalModels/InternalForceModel/imstkForceModelConfig.h similarity index 100% rename from Base/ForceModel/imstkForceModelConfig.h rename to Base/DynamicalModels/InternalForceModel/imstkForceModelConfig.h diff --git a/Base/ForceModel/imstkInternalForceModel.cpp b/Base/DynamicalModels/InternalForceModel/imstkInternalForceModel.cpp similarity index 100% rename from Base/ForceModel/imstkInternalForceModel.cpp rename to Base/DynamicalModels/InternalForceModel/imstkInternalForceModel.cpp diff --git a/Base/ForceModel/imstkInternalForceModel.h b/Base/DynamicalModels/InternalForceModel/imstkInternalForceModel.h similarity index 100% rename from Base/ForceModel/imstkInternalForceModel.h rename to Base/DynamicalModels/InternalForceModel/imstkInternalForceModel.h diff --git a/Base/ForceModel/imstkIsotropicHyperelasticFEMForceModel.h b/Base/DynamicalModels/InternalForceModel/imstkIsotropicHyperelasticFEMForceModel.h similarity index 100% rename from Base/ForceModel/imstkIsotropicHyperelasticFEMForceModel.h rename to Base/DynamicalModels/InternalForceModel/imstkIsotropicHyperelasticFEMForceModel.h diff --git a/Base/ForceModel/imstkLinearFEMForceModel.h b/Base/DynamicalModels/InternalForceModel/imstkLinearFEMForceModel.h similarity index 100% rename from Base/ForceModel/imstkLinearFEMForceModel.h rename to Base/DynamicalModels/InternalForceModel/imstkLinearFEMForceModel.h diff --git a/Base/ForceModel/imstkMassSpringForceModel.cpp b/Base/DynamicalModels/InternalForceModel/imstkMassSpringForceModel.cpp similarity index 100% rename from Base/ForceModel/imstkMassSpringForceModel.cpp rename to Base/DynamicalModels/InternalForceModel/imstkMassSpringForceModel.cpp diff --git a/Base/ForceModel/imstkMassSpringForceModel.h b/Base/DynamicalModels/InternalForceModel/imstkMassSpringForceModel.h similarity index 100% rename from Base/ForceModel/imstkMassSpringForceModel.h rename to Base/DynamicalModels/InternalForceModel/imstkMassSpringForceModel.h diff --git a/Base/ForceModel/imstkStVKForceModel.h b/Base/DynamicalModels/InternalForceModel/imstkStVKForceModel.h similarity index 100% rename from Base/ForceModel/imstkStVKForceModel.h rename to Base/DynamicalModels/InternalForceModel/imstkStVKForceModel.h diff --git a/Base/SceneElements/Objects/imstkDeformableBodyModel.cpp b/Base/DynamicalModels/ObjectModels/imstkDeformableBodyModel.cpp similarity index 100% rename from Base/SceneElements/Objects/imstkDeformableBodyModel.cpp rename to Base/DynamicalModels/ObjectModels/imstkDeformableBodyModel.cpp diff --git a/Base/SceneElements/Objects/imstkDeformableBodyModel.h b/Base/DynamicalModels/ObjectModels/imstkDeformableBodyModel.h similarity index 100% rename from Base/SceneElements/Objects/imstkDeformableBodyModel.h rename to Base/DynamicalModels/ObjectModels/imstkDeformableBodyModel.h diff --git a/Base/SceneElements/Objects/imstkDynamicalModel.h b/Base/DynamicalModels/ObjectModels/imstkDynamicalModel.h similarity index 100% rename from Base/SceneElements/Objects/imstkDynamicalModel.h rename to Base/DynamicalModels/ObjectModels/imstkDynamicalModel.h diff --git a/Base/SceneElements/Objects/imstkPbdModel.cpp b/Base/DynamicalModels/ObjectModels/imstkPbdModel.cpp similarity index 100% rename from Base/SceneElements/Objects/imstkPbdModel.cpp rename to Base/DynamicalModels/ObjectModels/imstkPbdModel.cpp diff --git a/Base/SceneElements/Objects/imstkPbdModel.h b/Base/DynamicalModels/ObjectModels/imstkPbdModel.h similarity index 100% rename from Base/SceneElements/Objects/imstkPbdModel.h rename to Base/DynamicalModels/ObjectModels/imstkPbdModel.h diff --git a/Base/SceneElements/Objects/imstkPbdState.cpp b/Base/DynamicalModels/ObjectStates/imstkPbdState.cpp similarity index 100% rename from Base/SceneElements/Objects/imstkPbdState.cpp rename to Base/DynamicalModels/ObjectStates/imstkPbdState.cpp diff --git a/Base/SceneElements/Objects/imstkPbdState.h b/Base/DynamicalModels/ObjectStates/imstkPbdState.h similarity index 100% rename from Base/SceneElements/Objects/imstkPbdState.h rename to Base/DynamicalModels/ObjectStates/imstkPbdState.h diff --git a/Base/SceneElements/Objects/imstkProblemState.h b/Base/DynamicalModels/ObjectStates/imstkProblemState.h similarity index 100% rename from Base/SceneElements/Objects/imstkProblemState.h rename to Base/DynamicalModels/ObjectStates/imstkProblemState.h diff --git a/Base/SceneElements/Objects/imstkVectorizedState.cpp b/Base/DynamicalModels/ObjectStates/imstkVectorizedState.cpp similarity index 100% rename from Base/SceneElements/Objects/imstkVectorizedState.cpp rename to Base/DynamicalModels/ObjectStates/imstkVectorizedState.cpp diff --git a/Base/SceneElements/Objects/imstkVectorizedState.h b/Base/DynamicalModels/ObjectStates/imstkVectorizedState.h similarity index 100% rename from Base/SceneElements/Objects/imstkVectorizedState.h rename to Base/DynamicalModels/ObjectStates/imstkVectorizedState.h diff --git a/Base/Scene/CMakeLists.txt b/Base/Scene/CMakeLists.txt index 5ecca9d58a2285634b9ec8bcba8902ed3990b4fc..6b55774cae0eb84dd159703c6b0e99fd62336f29 100644 --- a/Base/Scene/CMakeLists.txt +++ b/Base/Scene/CMakeLists.txt @@ -6,6 +6,7 @@ imstk_add_library( Scene DEPENDS Core SceneElements + DynamicalModels Collision ) diff --git a/Base/SceneElements/CMakeLists.txt b/Base/SceneElements/CMakeLists.txt index db8a11530404240eb1075e5d99e571ccab6eca54..be280f2624502b355bebb4039fa8d5bac15ebc6a 100644 --- a/Base/SceneElements/CMakeLists.txt +++ b/Base/SceneElements/CMakeLists.txt @@ -8,9 +8,9 @@ imstk_add_library( SceneElements Geometry Constraint Devices - TimeIntegrators - ForceModel - Solvers + TimeIntegrators + DynamicalModels + Solvers ) #----------------------------------------------------------------------------- diff --git a/Base/TimeIntegrators/CMakeLists.txt b/Base/TimeIntegrators/CMakeLists.txt index 21d27c53bed5fc8513f1e76dfb2901b18cec9860..8bdfa47aadfd64b33f1974327560bb07a35c243e 100644 --- a/Base/TimeIntegrators/CMakeLists.txt +++ b/Base/TimeIntegrators/CMakeLists.txt @@ -4,8 +4,8 @@ include(imstkAddLibrary) imstk_add_library( TimeIntegrators DEPENDS - Core - SceneElements + Core + DynamicalModels ) #----------------------------------------------------------------------------- diff --git a/CMakeLists.txt b/CMakeLists.txt index ec04aa67da86b2c263686a8cec7691bad2cca5d4..039b1525686802dae1976377405ae4f9f974090a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -153,8 +153,8 @@ add_subdirectory(Base/Geometry) add_subdirectory(Base/Devices) add_subdirectory(Base/Rendering) add_subdirectory(Base/Solvers) +add_subdirectory(Base/DynamicalModels) add_subdirectory(Base/TimeIntegrators) -add_subdirectory(Base/ForceModel) add_subdirectory(Base/SceneElements) add_subdirectory(Base/Collision) add_subdirectory(Base/Scene)