diff --git a/CMakeLists.txt b/CMakeLists.txt index 962c594d..7890710c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,7 +23,7 @@ else() set(Kokkos_Source_DIR $ENV{HOME}/Kokkos/kokkos) endif() message(STATUS "Kokkos source directory is ${Kokkos_Source_DIR}") -add_subdirectory(${Kokkos_Source_DIR} ${phasicFlow_BINARY_DIR}/kokkos) +add_subdirectory(${Kokkos_Source_DIR} ./kokkos) Kokkos_cmake_settings() diff --git a/src/Interaction/grainInteraction/grainInteractionsLinearModels.cpp b/src/Interaction/grainInteraction/grainInteractionsLinearModels.cpp index 6fa77730..d047df09 100755 --- a/src/Interaction/grainInteraction/grainInteractionsLinearModels.cpp +++ b/src/Interaction/grainInteraction/grainInteractionsLinearModels.cpp @@ -59,4 +59,10 @@ createInteraction(pFlow::cfModels::grainRolling>, pFlow::vibratingMotionGeometry); createInteraction(pFlow::cfModels::grainRolling>, pFlow::vibratingMotionGeometry); -createInteraction(pFlow::cfModels::grainRolling>, pFlow::vibratingMotionGeometry); \ No newline at end of file +createInteraction(pFlow::cfModels::grainRolling>, pFlow::vibratingMotionGeometry); + +createInteraction(pFlow::cfModels::grainRolling>, pFlow::conveyorBeltMotionGeometry); +createInteraction(pFlow::cfModels::grainRolling>, pFlow::conveyorBeltMotionGeometry); + +createInteraction(pFlow::cfModels::grainRolling>, pFlow::conveyorBeltMotionGeometry); +createInteraction(pFlow::cfModels::grainRolling>, pFlow::conveyorBeltMotionGeometry); \ No newline at end of file diff --git a/src/Interaction/sphereInteraction/sphereInteractionsLinearModels.cpp b/src/Interaction/sphereInteraction/sphereInteractionsLinearModels.cpp index 8c30776f..1c45936b 100644 --- a/src/Interaction/sphereInteraction/sphereInteractionsLinearModels.cpp +++ b/src/Interaction/sphereInteraction/sphereInteractionsLinearModels.cpp @@ -53,6 +53,10 @@ createInteraction(pFlow::cfModels::nonLimitedLinearNormalRolling,pFlow::rotation createInteraction(pFlow::cfModels::limitedLinearNormalRolling, pFlow::vibratingMotionGeometry); createInteraction(pFlow::cfModels::nonLimitedLinearNormalRolling,pFlow::vibratingMotionGeometry); +// conveyorBeltGeometry +createInteraction(pFlow::cfModels::limitedLinearNormalRolling, pFlow::conveyorBeltMotionGeometry); +createInteraction(pFlow::cfModels::nonLimitedLinearNormalRolling,pFlow::conveyorBeltMotionGeometry); + // multiRotationAxisMotionGeometry //createInteraction(pFlow::cfModels::limitedLinearNormalRolling, pFlow::multiRotationAxisMotionGeometry); //createInteraction(pFlow::cfModels::nonLimitedLinearNormalRolling,pFlow::multiRotationAxisMotionGeometry); diff --git a/src/Interaction/sphereInteraction/sphereInteractionsNonLinearModModels.cpp b/src/Interaction/sphereInteraction/sphereInteractionsNonLinearModModels.cpp index b96e5d98..d7f79ff7 100644 --- a/src/Interaction/sphereInteraction/sphereInteractionsNonLinearModModels.cpp +++ b/src/Interaction/sphereInteraction/sphereInteractionsNonLinearModModels.cpp @@ -53,6 +53,10 @@ createInteraction(pFlow::cfModels::nonLimitedNonLinearModNormalRolling,pFlow::ro createInteraction(pFlow::cfModels::limitedNonLinearModNormalRolling, pFlow::vibratingMotionGeometry); createInteraction(pFlow::cfModels::nonLimitedNonLinearModNormalRolling,pFlow::vibratingMotionGeometry); +// conveyorBeltMotionGeometry +createInteraction(pFlow::cfModels::limitedNonLinearModNormalRolling, pFlow::conveyorBeltMotionGeometry); +createInteraction(pFlow::cfModels::nonLimitedNonLinearModNormalRolling,pFlow::conveyorBeltMotionGeometry); + // multiRotationAxisMotionGeometry //createInteraction(pFlow::cfModels::limitedNonLinearModNormalRolling, pFlow::multiRotationAxisMotionGeometry); //createInteraction(pFlow::cfModels::nonLimitedNonLinearModNormalRolling,pFlow::multiRotationAxisMotionGeometry); diff --git a/src/Interaction/sphereInteraction/sphereInteractionsNonLinearModels.cpp b/src/Interaction/sphereInteraction/sphereInteractionsNonLinearModels.cpp index 3e8e2707..c13ec77e 100644 --- a/src/Interaction/sphereInteraction/sphereInteractionsNonLinearModels.cpp +++ b/src/Interaction/sphereInteraction/sphereInteractionsNonLinearModels.cpp @@ -53,6 +53,10 @@ createInteraction(pFlow::cfModels::nonLimitedNonLinearNormalRolling,pFlow::rotat createInteraction(pFlow::cfModels::limitedNonLinearNormalRolling, pFlow::vibratingMotionGeometry); createInteraction(pFlow::cfModels::nonLimitedNonLinearNormalRolling,pFlow::vibratingMotionGeometry); +// conveyorBeltMotionGeometry +createInteraction(pFlow::cfModels::limitedNonLinearNormalRolling, pFlow::conveyorBeltMotionGeometry); +createInteraction(pFlow::cfModels::nonLimitedNonLinearNormalRolling,pFlow::conveyorBeltMotionGeometry); + // multiRotationAxisMotionGeometry //createInteraction(pFlow::cfModels::limitedNonLinearNormalRolling, pFlow::multiRotationAxisMotionGeometry); //createInteraction(pFlow::cfModels::nonLimitedNonLinearNormalRolling,pFlow::multiRotationAxisMotionGeometry); diff --git a/tutorials/sphereGranFlow/conveyorBelt/settings/geometryDict b/tutorials/sphereGranFlow/conveyorBelt/settings/geometryDict index b04edea2..a4c75819 100755 --- a/tutorials/sphereGranFlow/conveyorBelt/settings/geometryDict +++ b/tutorials/sphereGranFlow/conveyorBelt/settings/geometryDict @@ -8,11 +8,11 @@ fileFormat ASCII; /*---------------------------------------------------------------------------*/ motionModel conveyorBelt; // motion model can be rotatingAxis or stationary or vibrating -conveyorBeltMotionInfo +conveyorBeltInfo { conveyorBelt1 { - velocity (1, 0, 0); + velocity (1 0 0); } }