Skip to content

Add 3D Splines (with periodic or greville boundary conditions) #925

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tpadioleau merged 10 commits into from
Oct 10, 2025
Merged

Add 3D Splines (with periodic or greville boundary conditions) #925

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4b408a3
Add a 3D spline builder for the periodic case
tretre91 Sep 26, 2025
e9b3232
Changes to the derivs domain
tretre91 Sep 29, 2025
6875f7a
Reword the FIXMEs in the 3D test
tretre91 Sep 30, 2025
2edd0b9
Fix a typo
tretre91 Sep 30, 2025
ccd338e
Format the splines CMakeLists.txt
tretre91 Sep 30, 2025
6291ff3
Add missing doc comments and add unused annotations to the derivs
tretre91 Sep 30, 2025
c176354
Declare new header files to CMake
tpadioleau Sep 30, 2025
d70785d
Increase timeout
tpadioleau Oct 1, 2025
11b2f8e
Modify 3D error bound computation
tretre91 Oct 2, 2025
75cc670
Slightly increase tolerance
tpadioleau Oct 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/tests-ubuntu.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ jobs:
cmake --build build
if [ 'xcpu' = 'x${{matrix.backend.name}}' ]
then
ctest --test-dir build --output-on-failure --timeout 10 --output-junit tests.xml
ctest --test-dir build --output-on-failure --timeout 20 --output-junit tests.xml
cp build/tests.xml .
./build/examples/characteristics_advection
./build/examples/game_of_life
Expand Down Expand Up @@ -454,7 +454,7 @@ jobs:
. /src/sanitizer_env.sh
fi

ctest --test-dir build --output-on-failure --timeout 10 --output-junit tests.xml
ctest --test-dir build --output-on-failure --timeout 20 --output-junit tests.xml
cp build/tests.xml .
./build/examples/characteristics_advection
./build/examples/game_of_life
Expand Down
2 changes: 2 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,8 +282,10 @@ if("${DDC_BUILD_KERNELS_SPLINES}")
include/ddc/kernels/splines/spline_boundary_conditions.hpp
include/ddc/kernels/splines/spline_builder.hpp
include/ddc/kernels/splines/spline_builder_2d.hpp
include/ddc/kernels/splines/spline_builder_3d.hpp
include/ddc/kernels/splines/spline_evaluator.hpp
include/ddc/kernels/splines/spline_evaluator_2d.hpp
include/ddc/kernels/splines/spline_evaluator_3d.hpp
include/ddc/kernels/splines/spline_traits.hpp
include/ddc/kernels/splines/splines_linear_problem.hpp
include/ddc/kernels/splines/splines_linear_problem_2x2_blocks.hpp
Expand Down
2 changes: 2 additions & 0 deletions include/ddc/kernels/splines.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@
#include "splines/spline_boundary_conditions.hpp"
#include "splines/spline_builder.hpp"
#include "splines/spline_builder_2d.hpp"
#include "splines/spline_builder_3d.hpp"
#include "splines/spline_evaluator.hpp"
#include "splines/spline_evaluator_2d.hpp"
#include "splines/spline_evaluator_3d.hpp"
#include "splines/spline_traits.hpp"
#include "splines/splines_linear_problem.hpp"
#include "splines/splines_linear_problem_2x2_blocks.hpp"
Expand Down
708 changes: 708 additions & 0 deletions include/ddc/kernels/splines/spline_builder_3d.hpp
View file
Open in desktop

Large diffs are not rendered by default.

2,425 changes: 2,425 additions & 0 deletions include/ddc/kernels/splines/spline_evaluator_3d.hpp
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 20 additions & 0 deletions tests/splines/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,26 @@ foreach(BC "BC_PERIODIC" "BC_GREVILLE" "BC_HERMITE")
endforeach()
endforeach()

foreach(BC "BC_PERIODIC" "BC_GREVILLE") # "BC_HERMITE")
Copy link
Copy Markdown
Member

@science-enthusiast science-enthusiast Oct 8, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just like commenting out BC_HERMITE here, let us see whether we can comment out or remove BC_HERMITE related stuff in all places in CMake and C++ logic. Removing all the #if defined(BC_HERMITE) should be at least easy.

foreach(EVALUATOR "EVALUATOR_POLYNOMIAL")
foreach(DEGREE RANGE "${DDC_SPLINES_TEST_DEGREE_MIN}" "${DDC_SPLINES_TEST_DEGREE_MAX}")
foreach(BSPLINES_TYPE "BSPLINES_TYPE_UNIFORM" "BSPLINES_TYPE_NON_UNIFORM")
set(test_name
"3d_splines_tests_BATCHED_DEGREE_${DEGREE}_${BSPLINES_TYPE}_${EVALUATOR}_${BC}"
)
add_executable("${test_name}" ../main.cpp batched_3d_spline_builder.cpp)
target_compile_definitions(
"${test_name}"
PUBLIC -DDEGREE=${DEGREE} -D${BSPLINES_TYPE} -D${EVALUATOR} -D${BC}
)
target_compile_features("${test_name}" PUBLIC cxx_std_17)
target_link_libraries("${test_name}" PUBLIC DDC::core DDC::splines GTest::gtest)
gtest_discover_tests("${test_name}" DISCOVERY_MODE PRE_TEST)
endforeach()
endforeach()
endforeach()
endforeach()

foreach(SOLVER "GINKGO" "LAPACK")
foreach(BC "BC_PERIODIC" "BC_GREVILLE" "BC_HERMITE")
foreach(DEGREE_X RANGE "${DDC_SPLINES_TEST_DEGREE_MIN}" "${DDC_SPLINES_TEST_DEGREE_MAX}")
Expand Down
Loading
Loading