Skip to content

Commit 4fd3298

Browse files
Xiangyu-HuXiangyu-Hu
authored
Merge pull request #938 from Xiangyu-Hu/xiangyu/code_cleanning
delete unused file
2 parents a3517f4 + 17e0277 commit 4fd3298

36 files changed

+233
-274
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 168 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,12 +150,57 @@ jobs:
150150
ctest --rerun-failed --output-on-failure --timeout 1000
151151
continue-on-error: true
152152

153-
- name: Test with the last try for failed cases
153+
- name: Test with the fifth try for failed cases
154+
id: fifth-try
154155
if: ${{ steps.fourth-try.outcome == 'failure' }}
155156
run: |
156157
source /opt/intel/oneapi/setvars.sh --include-intel-llvm
157158
cd build/tests/tests_sycl
158159
ctest --rerun-failed --output-on-failure --timeout 1000
160+
continue-on-error: true
161+
162+
- name: Test with the sixth try for failed cases
163+
id: sixth-try
164+
if: ${{ steps.fifth-try.outcome == 'failure' }}
165+
run: |
166+
source /opt/intel/oneapi/setvars.sh --include-intel-llvm
167+
cd build/tests/tests_sycl
168+
ctest --rerun-failed --output-on-failure --timeout 1000
169+
continue-on-error: true
170+
171+
- name: Test with the seventh try for failed cases
172+
id: seventh-try
173+
if: ${{ steps.sixth-try.outcome == 'failure' }}
174+
run: |
175+
source /opt/intel/oneapi/setvars.sh --include-intel-llvm
176+
cd build/tests/tests_sycl
177+
ctest --rerun-failed --output-on-failure --timeout 1000
178+
continue-on-error: true
179+
180+
- name: Test with the eighth try for failed cases
181+
id: eighth-try
182+
if: ${{ steps.seventh-try.outcome == 'failure' }}
183+
run: |
184+
source /opt/intel/oneapi/setvars.sh --include-intel-llvm
185+
cd build/tests/tests_sycl
186+
ctest --rerun-failed --output-on-failure --timeout 1000
187+
continue-on-error: true
188+
189+
- name: Test with the ninth try for failed cases
190+
id: ninth-try
191+
if: ${{ steps.eighth-try.outcome == 'failure' }}
192+
run: |
193+
source /opt/intel/oneapi/setvars.sh --include-intel-llvm
194+
cd build/tests/tests_sycl
195+
ctest --rerun-failed --output-on-failure --timeout 1000
196+
continue-on-error: true
197+
198+
- name: Test with the last try for failed cases
199+
if: ${{ steps.ninth-try.outcome == 'failure' }}
200+
run: |
201+
source /opt/intel/oneapi/setvars.sh --include-intel-llvm
202+
cd build/tests/tests_sycl
203+
ctest --rerun-failed --output-on-failure --timeout 1000
159204
160205
###############################################################################
161206
Linux-build:
@@ -335,12 +380,51 @@ jobs:
335380
ctest --rerun-failed --output-on-failure --timeout 1000
336381
continue-on-error: true
337382

338-
- name: Test with the last try for failed cases
383+
- name: Test with the fifth try for failed cases
384+
id: fifth-try
339385
if: ${{ steps.fourth-try.outcome == 'failure' }}
340386
run: |
341387
cd build
342388
ctest --rerun-failed --output-on-failure --timeout 1000
343389
390+
- name: Test with the sixth try
391+
id: sixth-try
392+
if: ${{ steps.fifth-try.outcome == 'failure' }}
393+
run: |
394+
cd build
395+
ctest --output-on-failure --timeout 1000
396+
continue-on-error: true
397+
398+
- name: Test with the seventh try for failed cases
399+
id: seventh-try
400+
if: ${{ steps.sixth-try.outcome == 'failure' }}
401+
run: |
402+
cd build
403+
ctest --rerun-failed --output-on-failure --timeout 1000
404+
continue-on-error: true
405+
406+
- name: Test with the eighth try for failed cases
407+
id: eighth-try
408+
if: ${{ steps.seventh-try.outcome == 'failure' }}
409+
run: |
410+
cd build
411+
ctest --rerun-failed --output-on-failure --timeout 1000
412+
continue-on-error: true
413+
414+
- name: Test with the ninth try for failed cases
415+
id: ninth-try
416+
if: ${{ steps.eighth-try.outcome == 'failure' }}
417+
run: |
418+
cd build
419+
ctest --rerun-failed --output-on-failure --timeout 1000
420+
continue-on-error: true
421+
422+
- name: Test with the last try for failed cases
423+
if: ${{ steps.ninth-try.outcome == 'failure' }}
424+
run: |
425+
cd build
426+
ctest --rerun-failed --output-on-failure --timeout 1000
427+
344428
- name: 🐛 Initialize VS Code Server for debug in dispatch work flow only
345429
shell: pwsh
346430
run: |
@@ -516,11 +600,51 @@ jobs:
516600
ctest.exe --rerun-failed --output-on-failure --timeout 1000
517601
continue-on-error: true
518602

519-
- name: Test with the last try for failed cases
603+
- name: Test with the fifth try for failed cases
604+
id: fifth-try
520605
if: ${{ steps.fourth-try.outcome == 'failure' }}
521606
run: |
522607
cd C:\build
523608
ctest.exe --rerun-failed --output-on-failure --timeout 1000
609+
continue-on-error: true
610+
611+
- name: Test with the sixth try for failed cases
612+
id: sixth-try
613+
if: ${{ steps.fifth-try.outcome == 'failure' }}
614+
run: |
615+
cd C:\build
616+
ctest.exe --rerun-failed --output-on-failure --timeout 1000
617+
continue-on-error: true
618+
619+
- name: Test with the seventh try for failed cases
620+
id: seventh-try
621+
if: ${{ steps.sixth-try.outcome == 'failure' }}
622+
run: |
623+
cd C:\build
624+
ctest.exe --rerun-failed --output-on-failure --timeout 1000
625+
continue-on-error: true
626+
627+
- name: Test with the eighth try for failed cases
628+
id: eighth-try
629+
if: ${{ steps.seventh-try.outcome == 'failure' }}
630+
run: |
631+
cd C:\build
632+
ctest.exe --rerun-failed --output-on-failure --timeout 1000
633+
continue-on-error: true
634+
635+
- name: Test with the ninth try for failed cases
636+
id: ninth-try
637+
if: ${{ steps.eighth-try.outcome == 'failure' }}
638+
run: |
639+
cd C:\build
640+
ctest.exe --rerun-failed --output-on-failure --timeout 1000
641+
continue-on-error: true
642+
643+
- name: Test with the last try for failed cases
644+
if: ${{ steps.ninth-try.outcome == 'failure' }}
645+
run: |
646+
cd C:\build
647+
ctest.exe --rerun-failed --output-on-failure --timeout 1000
524648
525649
###############################################################################
526650

@@ -679,11 +803,51 @@ jobs:
679803
ctest --rerun-failed --output-on-failure --timeout 1000
680804
continue-on-error: true
681805

682-
- name: Test with the last try for failed cases
806+
- name: Test with the fifth try for failed cases
807+
id: fifth-try
683808
if: ${{ steps.fourth-try.outcome == 'failure' }}
684809
run: |
685810
cd build
686811
ctest --rerun-failed --output-on-failure --timeout 1000
812+
continue-on-error: true
813+
814+
- name: Test with the sixth try for failed cases
815+
id: sixth-try
816+
if: ${{ steps.fifth-try.outcome == 'failure' }}
817+
run: |
818+
cd build
819+
ctest --rerun-failed --output-on-failure --timeout 1000
820+
continue-on-error: true
821+
822+
- name: Test with the seventh try for failed cases
823+
id: seventh-try
824+
if: ${{ steps.sixth-try.outcome == 'failure' }}
825+
run: |
826+
cd build
827+
ctest --rerun-failed --output-on-failure --timeout 1000
828+
continue-on-error: true
829+
830+
- name: Test with the eighth try for failed cases
831+
id: eighth-try
832+
if: ${{ steps.seventh-try.outcome == 'failure' }}
833+
run: |
834+
cd build
835+
ctest --rerun-failed --output-on-failure --timeout 1000
836+
continue-on-error: true
837+
838+
- name: Test with the ninth try for failed cases
839+
id: ninth-try
840+
if: ${{ steps.eighth-try.outcome == 'failure' }}
841+
run: |
842+
cd build
843+
ctest --rerun-failed --output-on-failure --timeout 1000
844+
continue-on-error: true
845+
846+
- name: Test with the last try for failed cases
847+
if: ${{ steps.ninth-try.outcome == 'failure' }}
848+
run: |
849+
cd build
850+
ctest --rerun-failed --output-on-failure --timeout 1000
687851
688852
###############################################################################
689853
Windows-dispatch-for-sycl-build:

‎src/for_3D_build/meshes/block_cluster_3d.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,3 @@ struct Coord3DHash
1818

1919
std::vector<Block3D> clusterActiveCells3D(const std::vector<Coord3D> &activeCells);
2020
} // namespace SPH
21-
//=============================================================================================//

‎src/for_3D_build/particle_dynamics/solid_dynamics/slender_structure_dynamics.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
#include "base_kernel.h"
3636
#include "elastic_solid.h"
3737
#include "slender_structure_math.h"
38-
#include "solid_body.h"
3938

4039
namespace SPH
4140
{

‎src/shared/bodies/all_bodies.h‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,9 @@
2929
#ifndef ALL_BODIES_H
3030
#define ALL_BODIES_H
3131

32-
#pragma once
33-
3432
#include "all_complex_bodies.h"
3533
#include "base_body_part.h"
3634
#include "body_partition.h"
37-
#include "fluid_body.h"
38-
#include "observer_body.h"
39-
#include "solid_body.h"
35+
#include "predefined_bodies.h"
36+
4037
#endif // ALL_BODIES_H

‎src/shared/bodies/base_body_part.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
/**
2424
* @file base_body_part.h
2525
* @brief This is the base classes of body parts.
26-
* @details There two main type of body parts. One is part by particle.
26+
* @details There two main type of body parts. One is part by particle, the other is part by cell.
2727
* @author Chi Zhang and Xiangyu Hu
2828
*/
2929

‎src/shared/bodies/complex_bodies/unstructured_mesh.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
#include "unstructured_mesh.h"
32

43
#include "base_particle_dynamics.h"

‎src/shared/bodies/fluid_body.h‎

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎src/shared/bodies/observer_body.cpp‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎src/shared/bodies/observer_body.h‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

0 commit comments

Comments
 (0)