Refactoring
This commit is contained in:
parent
d02587c1b8
commit
c3802cfc87
|
@ -156,11 +156,23 @@ PUBLIC ${ENSMALLEN_SOURCE_DIR}/include)
|
||||||
add_compile_definitions(USE_ENSMALLEN)
|
add_compile_definitions(USE_ENSMALLEN)
|
||||||
#endif()
|
#endif()
|
||||||
|
|
||||||
set(Chrono_DIR "/home/iason/Coding/build/external dependencies/CHRONO-src/cmake")
|
#Chrono
|
||||||
find_package(Chrono
|
#set(Chrono_DIR "/home/iason/Coding/Libraries/chrono-7.0.3/build/cmake")
|
||||||
CONFIG REQUIRED)
|
set(Chrono_DIR "/home/iason/Coding/Libraries/chrono-7.0.3/build/cmake")
|
||||||
target_link_libraries(${PROJECT_NAME} PRIVATE "/home/iason/Coding/build/external dependencies/CHRONO-src/build/RelWithDebInfo/lib/libChronoEngine.so")
|
LIST(APPEND CMAKE_PREFIX_PATH "${CMAKE_INSTALL_PREFIX}/../Chrono/lib")
|
||||||
target_include_directories(${PROJECT_NAME} PRIVATE "/home/iason/Coding/build/external dependencies/CHRONO-src/src" PRIVATE "/home/iason/Coding/build/external dependencies/CHRONO-src/build/RelWithDebInfo/" )
|
#set(Chrono_DIR "/home/iason/Coding/build/external dependencies/CHRONO-src/cmake")
|
||||||
|
find_package(Chrono #[[COMPONENTS FEA]]
|
||||||
|
CONFIG)
|
||||||
|
if (NOT Chrono_FOUND)
|
||||||
|
message("Could not find Chrono or one of its required modules")
|
||||||
|
return()
|
||||||
|
endif()
|
||||||
|
set_target_properties(${PROJECT_NAME} PROPERTIES
|
||||||
|
COMPILE_FLAGS "${CHRONO_CXX_FLAGS} ${EXTRA_COMPILE_FLAGS}"
|
||||||
|
COMPILE_DEFINITIONS "CHRONO_DATA_DIR=\"${CHRONO_DATA_DIR}\""
|
||||||
|
LINK_FLAGS "${CHRONO_LINKER_FLAGS}")
|
||||||
|
target_link_libraries(${PROJECT_NAME} PRIVATE ${CHRONO_LIBRARIES})
|
||||||
|
target_include_directories(${PROJECT_NAME} PRIVATE ${CHRONO_INCLUDE_DIRS})
|
||||||
|
|
||||||
#find_package(OpenMP REQUIRED)
|
#find_package(OpenMP REQUIRED)
|
||||||
#target_link_libraries(${PROJECT_NAME} OpenMP::OpenMP_CXX)
|
#target_link_libraries(${PROJECT_NAME} OpenMP::OpenMP_CXX)
|
||||||
|
|
|
@ -148,7 +148,7 @@ SimulationResults ChronosEulerSimulationModel::executeSimulation(
|
||||||
simulationResults.displacements[vi][1] = posDisplacement[1];
|
simulationResults.displacements[vi][1] = posDisplacement[1];
|
||||||
simulationResults.displacements[vi][2] = posDisplacement[2];
|
simulationResults.displacements[vi][2] = posDisplacement[2];
|
||||||
//Rotations
|
//Rotations
|
||||||
const chrono::ChQuaternion<double> rotQuat = node_chronos->GetRot();
|
chrono::ChQuaternion<double> rotQuat = node_chronos->GetRot();
|
||||||
simulationResults.rotationalDisplacementQuaternion[vi]
|
simulationResults.rotationalDisplacementQuaternion[vi]
|
||||||
= Eigen::Quaternion<double>(rotQuat.e0(), rotQuat.e1(), rotQuat.e2(), rotQuat.e3());
|
= Eigen::Quaternion<double>(rotQuat.e0(), rotQuat.e1(), rotQuat.e2(), rotQuat.e3());
|
||||||
const ChVector<double> eulerAngles = rotQuat.Q_to_Euler123();
|
const ChVector<double> eulerAngles = rotQuat.Q_to_Euler123();
|
||||||
|
|
Loading…
Reference in New Issue