From d2c75f47ff895677fd38947251b66eb7f21006c0 Mon Sep 17 00:00:00 2001
From: Xiangyu Hu <xiangyu.hu@tum.de>
Date: Sat, 29 Jun 2024 18:04:30 +0000
Subject: [PATCH] add ctest dependence on cases need particle relaxation

---
 tests/2d_examples/test_2d_collision/CMakeLists.txt            | 4 ++++
 tests/2d_examples/test_2d_flow_around_cylinder/CMakeLists.txt | 1 +
 .../test_2d_flow_stream_around_fish/CMakeLists.txt            | 1 +
 .../test_2d_free_stream_around_cylinder/CMakeLists.txt        | 2 +-
 .../test_2d_free_stream_around_cylinder_mr/CMakeLists.txt     | 2 +-
 tests/2d_examples/test_2d_fsi2/CMakeLists.txt                 | 1 +
 tests/2d_examples/test_2d_shell_beam_collision/CMakeLists.txt | 2 ++
 tests/2d_examples/test_2d_sliding/CMakeLists.txt              | 1 +
 tests/2d_examples/test_2d_viscous_cream_drop/CMakeLists.txt   | 1 +
 tests/2d_examples/test_2d_water_entry_exit/CMakeLists.txt     | 1 +
 .../CMakeLists.txt                                            | 2 +-
 .../3d_examples/test_3d_heart_electromechanics/CMakeLists.txt | 2 +-
 .../test_3d_muscle_soft_body_contact/CMakeLists.txt           | 3 ++-
 tests/3d_examples/test_3d_muscle_solid_contact/CMakeLists.txt | 2 +-
 tests/3d_examples/test_3d_repose_angle/CMakeLists.txt         | 1 +
 .../test_3d_shell_stability_half_sphere/CMakeLists.txt        | 2 +-
 16 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/tests/2d_examples/test_2d_collision/CMakeLists.txt b/tests/2d_examples/test_2d_collision/CMakeLists.txt
index 5fe3648448..80a6cc142f 100644
--- a/tests/2d_examples/test_2d_collision/CMakeLists.txt
+++ b/tests/2d_examples/test_2d_collision/CMakeLists.txt
@@ -21,5 +21,9 @@ target_link_libraries(${PROJECT_NAME} sphinxsys_2d)
 
 add_test(NAME ${PROJECT_NAME}_particle_relaxation COMMAND ${PROJECT_NAME} --relax=true --state_recording=${TEST_STATE_RECORDING}
         WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
+
 add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME}  --reload=true --state_recording=${TEST_STATE_RECORDING}
         WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
+set_tests_properties(${PROJECT_NAME} PROPERTIES LABELS "solid_dynamics; contact")
+set_tests_properties(${PROJECT_NAME} PROPERTIES DEPENDS "${PROJECT_NAME}_particle_relaxation")
+
diff --git a/tests/2d_examples/test_2d_flow_around_cylinder/CMakeLists.txt b/tests/2d_examples/test_2d_flow_around_cylinder/CMakeLists.txt
index 6c2bf61a33..95f6d7539c 100644
--- a/tests/2d_examples/test_2d_flow_around_cylinder/CMakeLists.txt
+++ b/tests/2d_examples/test_2d_flow_around_cylinder/CMakeLists.txt
@@ -25,3 +25,4 @@ add_test(NAME ${PROJECT_NAME}_particle_relaxation COMMAND ${PROJECT_NAME} --rela
 add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME} --reload=true --state_recording=${TEST_STATE_RECORDING}
     WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 set_tests_properties(${PROJECT_NAME} PROPERTIES LABELS "periodic boundary")
+set_tests_properties(${PROJECT_NAME} PROPERTIES DEPENDS "${PROJECT_NAME}_particle_relaxation")
diff --git a/tests/2d_examples/test_2d_flow_stream_around_fish/CMakeLists.txt b/tests/2d_examples/test_2d_flow_stream_around_fish/CMakeLists.txt
index ae7b17ccd7..17120beb94 100644
--- a/tests/2d_examples/test_2d_flow_stream_around_fish/CMakeLists.txt
+++ b/tests/2d_examples/test_2d_flow_stream_around_fish/CMakeLists.txt
@@ -18,5 +18,6 @@ add_test(NAME ${PROJECT_NAME}_particle_relaxation COMMAND ${PROJECT_NAME} --rela
 add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME} --reload=true --state_recording=${TEST_STATE_RECORDING}
         WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 set_tests_properties(${PROJECT_NAME} PROPERTIES LABELS "emitter, free stream")
+set_tests_properties(${PROJECT_NAME} PROPERTIES DEPENDS "${PROJECT_NAME}_particle_relaxation")
 set_target_properties(${PROJECT_NAME} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${EXECUTABLE_OUTPUT_PATH}")
 target_link_libraries(${PROJECT_NAME} sphinxsys_2d)
diff --git a/tests/2d_examples/test_2d_free_stream_around_cylinder/CMakeLists.txt b/tests/2d_examples/test_2d_free_stream_around_cylinder/CMakeLists.txt
index 75d7ec132f..95a842ac3f 100644
--- a/tests/2d_examples/test_2d_free_stream_around_cylinder/CMakeLists.txt
+++ b/tests/2d_examples/test_2d_free_stream_around_cylinder/CMakeLists.txt
@@ -23,6 +23,6 @@ add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME} --reload=true --state_reco
     WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
 set_tests_properties(${PROJECT_NAME} PROPERTIES LABELS "emitter, free stream")
-
+set_tests_properties(${PROJECT_NAME} PROPERTIES DEPENDS "${PROJECT_NAME}_particle_relaxation")
 set_target_properties(${PROJECT_NAME} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${EXECUTABLE_OUTPUT_PATH}")
 target_link_libraries(${PROJECT_NAME} sphinxsys_2d)
diff --git a/tests/2d_examples/test_2d_free_stream_around_cylinder_mr/CMakeLists.txt b/tests/2d_examples/test_2d_free_stream_around_cylinder_mr/CMakeLists.txt
index 75d7ec132f..95a842ac3f 100644
--- a/tests/2d_examples/test_2d_free_stream_around_cylinder_mr/CMakeLists.txt
+++ b/tests/2d_examples/test_2d_free_stream_around_cylinder_mr/CMakeLists.txt
@@ -23,6 +23,6 @@ add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME} --reload=true --state_reco
     WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
 set_tests_properties(${PROJECT_NAME} PROPERTIES LABELS "emitter, free stream")
-
+set_tests_properties(${PROJECT_NAME} PROPERTIES DEPENDS "${PROJECT_NAME}_particle_relaxation")
 set_target_properties(${PROJECT_NAME} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${EXECUTABLE_OUTPUT_PATH}")
 target_link_libraries(${PROJECT_NAME} sphinxsys_2d)
diff --git a/tests/2d_examples/test_2d_fsi2/CMakeLists.txt b/tests/2d_examples/test_2d_fsi2/CMakeLists.txt
index 8c3ec3ab56..e64d5f5392 100644
--- a/tests/2d_examples/test_2d_fsi2/CMakeLists.txt
+++ b/tests/2d_examples/test_2d_fsi2/CMakeLists.txt
@@ -22,6 +22,7 @@ add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME}  --reload=true --state_rec
     WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
 set_tests_properties(${PROJECT_NAME} PROPERTIES LABELS "periodic boundary")
+set_tests_properties(${PROJECT_NAME} PROPERTIES DEPENDS "${PROJECT_NAME}_particle_relaxation")
 
 set_target_properties(${PROJECT_NAME} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${EXECUTABLE_OUTPUT_PATH}")
 target_link_libraries(${PROJECT_NAME} sphinxsys_2d)
diff --git a/tests/2d_examples/test_2d_shell_beam_collision/CMakeLists.txt b/tests/2d_examples/test_2d_shell_beam_collision/CMakeLists.txt
index 30c677ff7d..e8498fb6fa 100644
--- a/tests/2d_examples/test_2d_shell_beam_collision/CMakeLists.txt
+++ b/tests/2d_examples/test_2d_shell_beam_collision/CMakeLists.txt
@@ -23,3 +23,5 @@ add_test(NAME ${PROJECT_NAME}_particle_relaxation COMMAND ${PROJECT_NAME} --rela
     WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME} --reload=true --state_recording=${TEST_STATE_RECORDING}
     WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
+set_tests_properties(${PROJECT_NAME} PROPERTIES LABELS "solid_dynamics; contact")
+set_tests_properties(${PROJECT_NAME} PROPERTIES DEPENDS "${PROJECT_NAME}_particle_relaxation")
diff --git a/tests/2d_examples/test_2d_sliding/CMakeLists.txt b/tests/2d_examples/test_2d_sliding/CMakeLists.txt
index dd37c79d04..b84bd4bd9c 100644
--- a/tests/2d_examples/test_2d_sliding/CMakeLists.txt
+++ b/tests/2d_examples/test_2d_sliding/CMakeLists.txt
@@ -19,6 +19,7 @@ ADD_EXECUTABLE(${PROJECT_NAME} ${DIR_SRCS})
 
 add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME} --state_recording=${TEST_STATE_RECORDING}
     WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
+set_tests_properties(${PROJECT_NAME} PROPERTIES LABELS "solid_dynamics; contact")
 
 set_target_properties(${PROJECT_NAME} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${EXECUTABLE_OUTPUT_PATH}")
 target_link_libraries(${PROJECT_NAME} sphinxsys_2d)
diff --git a/tests/2d_examples/test_2d_viscous_cream_drop/CMakeLists.txt b/tests/2d_examples/test_2d_viscous_cream_drop/CMakeLists.txt
index 10038b57dc..10896f4708 100644
--- a/tests/2d_examples/test_2d_viscous_cream_drop/CMakeLists.txt
+++ b/tests/2d_examples/test_2d_viscous_cream_drop/CMakeLists.txt
@@ -20,6 +20,7 @@ add_test(NAME ${PROJECT_NAME}_particle_relaxation COMMAND ${PROJECT_NAME} --rela
     WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME}  --reload=true --state_recording=${TEST_STATE_RECORDING}
     WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
+set_tests_properties(${PROJECT_NAME} PROPERTIES DEPENDS "${PROJECT_NAME}_particle_relaxation")   
 
 set_target_properties(${PROJECT_NAME} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${EXECUTABLE_OUTPUT_PATH}")
 target_link_libraries(${PROJECT_NAME} sphinxsys_2d)
diff --git a/tests/2d_examples/test_2d_water_entry_exit/CMakeLists.txt b/tests/2d_examples/test_2d_water_entry_exit/CMakeLists.txt
index b16e720398..3366e2308e 100644
--- a/tests/2d_examples/test_2d_water_entry_exit/CMakeLists.txt
+++ b/tests/2d_examples/test_2d_water_entry_exit/CMakeLists.txt
@@ -25,3 +25,4 @@ add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME} --reload=true --state_reco
     WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
 set_tests_properties(${PROJECT_NAME} PROPERTIES LABELS "spatial_temporal_identification diffusion reaction")
+set_tests_properties(${PROJECT_NAME} PROPERTIES DEPENDS "${PROJECT_NAME}_particle_relaxation")
diff --git a/tests/3d_examples/test_3d_bending_circular_plate_parametric_cvt/CMakeLists.txt b/tests/3d_examples/test_3d_bending_circular_plate_parametric_cvt/CMakeLists.txt
index 24f247ad40..1480b96b7b 100644
--- a/tests/3d_examples/test_3d_bending_circular_plate_parametric_cvt/CMakeLists.txt
+++ b/tests/3d_examples/test_3d_bending_circular_plate_parametric_cvt/CMakeLists.txt
@@ -20,6 +20,6 @@ add_test(NAME ${PROJECT_NAME}
 	COMMAND ${PROJECT_NAME}
 	WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
-set_tests_properties(${PROJECT_NAME} PROPERTIES LABELS "particle relaxation, shell")
+set_tests_properties(${PROJECT_NAME} PROPERTIES LABELS "shell")
 
 gtest_discover_tests(${PROJECT_NAME} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
\ No newline at end of file
diff --git a/tests/3d_examples/test_3d_heart_electromechanics/CMakeLists.txt b/tests/3d_examples/test_3d_heart_electromechanics/CMakeLists.txt
index 89fa89df32..2be0699687 100644
--- a/tests/3d_examples/test_3d_heart_electromechanics/CMakeLists.txt
+++ b/tests/3d_examples/test_3d_heart_electromechanics/CMakeLists.txt
@@ -23,5 +23,5 @@ add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME} --reload=true --state_reco
     WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
 set_tests_properties(${PROJECT_NAME} PROPERTIES DEPENDS "${PROJECT_NAME}_particle_relaxation")
-
 set_tests_properties(${PROJECT_NAME} PROPERTIES LABELS "muscle, diffusion reaction")
+
diff --git a/tests/3d_examples/test_3d_muscle_soft_body_contact/CMakeLists.txt b/tests/3d_examples/test_3d_muscle_soft_body_contact/CMakeLists.txt
index 94a5be8d13..01b83c672c 100644
--- a/tests/3d_examples/test_3d_muscle_soft_body_contact/CMakeLists.txt
+++ b/tests/3d_examples/test_3d_muscle_soft_body_contact/CMakeLists.txt
@@ -20,4 +20,5 @@ set_target_properties(${PROJECT_NAME} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "
 target_link_libraries(${PROJECT_NAME} sphinxsys_3d)
 
 add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME}
-    WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
\ No newline at end of file
+    WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
+set_tests_properties(${PROJECT_NAME} PROPERTIES LABELS "solid_dynamics; contact")
\ No newline at end of file
diff --git a/tests/3d_examples/test_3d_muscle_solid_contact/CMakeLists.txt b/tests/3d_examples/test_3d_muscle_solid_contact/CMakeLists.txt
index 6a3e1ef89f..ecf2800d68 100644
--- a/tests/3d_examples/test_3d_muscle_solid_contact/CMakeLists.txt
+++ b/tests/3d_examples/test_3d_muscle_solid_contact/CMakeLists.txt
@@ -19,7 +19,7 @@ ADD_EXECUTABLE(${PROJECT_NAME} ${DIR_SRCS})
 
 add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME} --state_recording=${TEST_STATE_RECORDING}
     WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
-set_tests_properties(${PROJECT_NAME} PROPERTIES LABELS "periodic boundary, solid dynamics")
+set_tests_properties(${PROJECT_NAME} PROPERTIES LABELS "contact, solid dynamics")
 
 set_target_properties(${PROJECT_NAME} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${EXECUTABLE_OUTPUT_PATH}")
 target_link_libraries(${PROJECT_NAME} sphinxsys_3d)
\ No newline at end of file
diff --git a/tests/3d_examples/test_3d_repose_angle/CMakeLists.txt b/tests/3d_examples/test_3d_repose_angle/CMakeLists.txt
index 372aa2e79c..bcbd334aa6 100644
--- a/tests/3d_examples/test_3d_repose_angle/CMakeLists.txt
+++ b/tests/3d_examples/test_3d_repose_angle/CMakeLists.txt
@@ -20,3 +20,4 @@ add_test(NAME ${PROJECT_NAME}_particle_relaxation COMMAND ${PROJECT_NAME} --rela
         WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME}  --reload=true --state_recording=${TEST_STATE_RECORDING}
         WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
+set_tests_properties(${PROJECT_NAME} PROPERTIES DEPENDS "${PROJECT_NAME}_particle_relaxation")
diff --git a/tests/3d_examples/test_3d_shell_stability_half_sphere/CMakeLists.txt b/tests/3d_examples/test_3d_shell_stability_half_sphere/CMakeLists.txt
index 24f247ad40..1480b96b7b 100644
--- a/tests/3d_examples/test_3d_shell_stability_half_sphere/CMakeLists.txt
+++ b/tests/3d_examples/test_3d_shell_stability_half_sphere/CMakeLists.txt
@@ -20,6 +20,6 @@ add_test(NAME ${PROJECT_NAME}
 	COMMAND ${PROJECT_NAME}
 	WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
-set_tests_properties(${PROJECT_NAME} PROPERTIES LABELS "particle relaxation, shell")
+set_tests_properties(${PROJECT_NAME} PROPERTIES LABELS "shell")
 
 gtest_discover_tests(${PROJECT_NAME} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
\ No newline at end of file