Merge branch 'feature/vehicle_tests'

projectchrono · Feb 3, 2025 · cc8a7ff · cc8a7ff
2 parents 6c57c7e + 3769d59
commit cc8a7ff
Show file tree

Hide file tree

Showing 10 changed files with 1,804 additions and 177 deletions.
diff --git a/archive/README.md b/archive/README.md
@@ -43,3 +43,5 @@ Support for GPU (CUDA) implementation of MPM in the Chrono::Multicore module.
 Implementation of BiCGStab and GMRES for ISPH
 
 - Retired on 29 January 2025
+
+
diff --git a/configuration_tests/fsi/CMakeLists.txt b/configuration_tests/fsi/CMakeLists.txt
@@ -21,7 +21,7 @@ set(DEMOS
 # Invoke find_package in CONFIG mode
 find_package(Chrono QUIET
              COMPONENTS FSI Multicore
-             OPTIONAL_COMPONENTS OpenGL
+             OPTIONAL_COMPONENTS OpenGL VSG
              CONFIG
 )
 

diff --git a/configuration_tests/fsi/demo_FSI_cylinderDrop.cpp b/configuration_tests/fsi/demo_FSI_cylinderDrop.cpp
diff --git a/projects/vehicle_tests/CMakeLists.txt b/projects/vehicle_tests/CMakeLists.txt
@@ -62,6 +62,8 @@ set(ALL_DEPENDENCY_DLLS "${ALL_DEPENDENCY_DLLS}" PARENT_SCOPE)
 message(STATUS "Programs...")
 add_subdirectory(test_steeringControl)
 add_subdirectory(test_FEDA)
+add_subdirectory(test_BMW_E90)
+add_subdirectory(test_Cherokee)
 
 if (CHRONO_IRRLICHT_FOUND)
   message(STATUS "Programs using Chrono::Irrlicht...")

diff --git a/projects/vehicle_tests/test_BMW_E90/CMakeLists.txt b/projects/vehicle_tests/test_BMW_E90/CMakeLists.txt
@@ -0,0 +1,25 @@
+#--------------------------------------------------------------
+# List of all executables
+#--------------------------------------------------------------
+
+SET(DEMOS
+    test_VEH_BMW_E90_wall2wall
+)
+
+#--------------------------------------------------------------
+# Loop over all demo programs and build them
+#--------------------------------------------------------------
+
+FOREACH(PROGRAM ${DEMOS})
+    MESSAGE(STATUS "...add ${PROGRAM}")
+
+    ADD_EXECUTABLE(${PROGRAM}  "${PROGRAM}.cpp")
+    SOURCE_GROUP(""  FILES "${PROGRAM}.cpp")
+
+    target_compile_definitions(${PROGRAM} PUBLIC "CHRONO_DATA_DIR=\"${CHRONO_DATA_DIR}\"") 
+    target_compile_definitions(${PROGRAM} PUBLIC "CHRONO_VEHICLE_DATA_DIR=\"${CHRONO_VEHICLE_DATA_DIR}\"") 
+    target_compile_options(${PROGRAM} PUBLIC ${CHRONO_CXX_FLAGS})
+    target_link_options(${PROGRAM} PUBLIC ${CHRONO_LINKER_FLAGS})
+    target_link_libraries(${PROGRAM} ${CHRONO_LIBRARIES})
+
+ENDFOREACH()
Original file line number	Diff line number	Diff line change
Expand Up		@@ -43,3 +43,5 @@ Support for GPU (CUDA) implementation of MPM in the Chrono::Multicore module.
		Implementation of BiCGStab and GMRES for ISPH

		- Retired on 29 January 2025