Skip to content

Commit 1158ec8

Browse files
authored
Merge pull request #364 from STEllAR-GROUP/revert-356-develop
Revert "Add new hydro and gravity kernels"
2 parents a2275c4 + bc6f4e9 commit 1158ec8

File tree

164 files changed

+5713
-16110
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

164 files changed

+5713
-16110
lines changed

.circleci/config.yml

Lines changed: 4 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -24,55 +24,28 @@ jobs:
2424
steps:
2525
- checkout:
2626
path: /octotiger
27-
- run:
28-
name: Get reference data submodule
29-
command: cd /octotiger && git submodule update --init --recursive && cd ..
30-
- run:
31-
name: Checkout CPPuddle
32-
command: git clone https://github.com/G-071/hpx-kokkos-interopt-WIP.git cppuddle
33-
- run:
34-
name: Create CPPuddle installation directory
35-
command: mkdir cppuddle-install
36-
- run:
37-
name: Configure CPPuddle
38-
command: cmake -Hcppuddle -Bcppuddle/build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=cppuddle-install
39-
- run:
40-
name: Build CPPuddle
41-
command: cmake --build cppuddle/build -- -j 2 VERBOSE=1
42-
- run:
43-
name: Install CPPuddle
44-
command: cmake --build cppuddle/build --target install
4527
- run:
4628
name: Configure Octo-Tiger
4729
command: |
4830
cmake -H/octotiger -B/octotiger/build \
4931
-DCMAKE_BUILD_TYPE=Release \
5032
-DHPX_DIR=/local/hpx/lib/cmake/HPX \
5133
-DVc_DIR=/local/vc/lib/cmake/Vc \
52-
-DCPPuddle_DIR=/root/project/cppuddle-install/lib/cmake/CPPuddle \
5334
-DSilo_DIR=/local/silo \
5435
-DHDF5_ROOT=/local/hdf5 \
5536
-DBOOST_ROOT=/local/boost \
56-
-DOCTOTIGER_WITH_Vc=OFF \
5737
-DOCTOTIGER_WITH_DOCU=ON \
5838
-GNinja
5939
- run:
6040
name: Build
6141
command: cmake --build /octotiger/build -- -j2
62-
- run:
63-
name: Install CPPuddle lib to persistent octotiger directory
64-
command: |
65-
cp cppuddle-install/lib/libbuffer_manager.so /octotiger/build/libbuffer_manager.so
66-
cp cppuddle-install/lib/libstream_manager.so /octotiger/build/libstream_manager.so
6742
- run:
6843
name: Documentation
6944
command: make -C /octotiger/build doc
7045
- persist_to_workspace:
7146
root: /
7247
paths:
7348
- octotiger/build
74-
- cppuddle/build
75-
- cppuddle-install
7649

7750
test_marshak:
7851
<<: *docker_config
@@ -105,7 +78,7 @@ jobs:
10578
at: /
10679
- run:
10780
name: Blast test
108-
command: ctest --output-on-failure -R test_problems.cpu.blast_legacy
81+
command: ctest --output-on-failure -R test_problems.cpu.blast.diff
10982
no_output_timeout: 200m
11083
- run:
11184
name: Move artifacts
@@ -126,7 +99,7 @@ jobs:
12699
at: /
127100
- run:
128101
name: Sod shock tube test
129-
command: ctest --output-on-failure -R test_problems.cpu.sod_legacy
102+
command: ctest --output-on-failure -R test_problems.cpu.sod.diff
130103
no_output_timeout: 25m
131104
- run:
132105
name: Move artifacts
@@ -147,7 +120,7 @@ jobs:
147120
at: /
148121
- run:
149122
name: Solid sphere test
150-
command: ctest --output-on-failure -R test_problems.cpu.sphere_legacy
123+
command: ctest --output-on-failure -R test_problems.cpu.sphere.diff
151124
no_output_timeout: 25m
152125
- run:
153126
name: Move artifacts
@@ -168,7 +141,7 @@ jobs:
168141
at: /
169142
- run:
170143
name: Rotating star test
171-
command: ctest --output-on-failure -R test_problems.cpu.rotating_star_legacy
144+
command: ctest --output-on-failure -R test_problems.cpu.rotating_star.diff
172145
no_output_timeout: 25m
173146
- run:
174147
name: Move artifacts

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,3 @@ newgit
44
cmake-build-*
55
cmake-cuda-*
66
.spack-env/*
7-
.clangd/*

.gitmodules

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

.jenkins/lsu/Jenkinsfile

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

.jenkins/lsu/entry.sh

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

0 commit comments

Comments
 (0)