Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 9 additions & 1 deletion benchmarks/splines.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,14 @@ void characteristics_advection_unitary(benchmark::State& state)
spline_builder.batched_interpolation_domain(x_mesh),
ddc::KokkosAllocator<ddc::Coordinate<X>, typename ExecSpace::memory_space>());
ddc::ChunkSpan const feet_coords = feet_coords_alloc.span_view();
ddc::ChunkSpan<
double const,
ddc::StridedDiscreteDomain<
DDimX<IsNonUniform, s_degree_x>,
ddc::Deriv<typename DDimX<IsNonUniform, s_degree_x>::continuous_dimension_type>,
DDimY>,
Kokkos::layout_right,
typename ExecSpace::memory_space> const derivs {};

for (auto _ : state) {
Kokkos::Profiling::pushRegion("FeetCharacteristics");
Expand All @@ -193,7 +201,7 @@ void characteristics_advection_unitary(benchmark::State& state)
});
Kokkos::Profiling::popRegion();
Kokkos::Profiling::pushRegion("SplineBuilder");
spline_builder(coef, density.span_cview());
spline_builder(coef, density.span_cview(), derivs.span_cview());
Kokkos::Profiling::popRegion();
Kokkos::Profiling::pushRegion("SplineEvaluator");
spline_evaluator(density, feet_coords.span_cview(), coef.span_cview());
Expand Down
10 changes: 9 additions & 1 deletion examples/characteristics_advection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include <ddc/kernels/splines.hpp>

#include <Kokkos_Core.hpp>
#include <Kokkos_Core_fwd.hpp>

#define PERIODIC_DOMAIN // Comment this to run non-periodic simulation

Expand Down Expand Up @@ -230,6 +231,13 @@ int main(int argc, char** argv)
spline_builder.batched_interpolation_domain(x_mesh),
ddc::DeviceAllocator<ddc::Coordinate<X>>());
ddc::ChunkSpan const feet_coords = feet_coords_alloc.span_view();

// Instantiate empty derivative chunkspan
ddc::ChunkSpan<
double const,
ddc::StridedDiscreteDomain<DDimX, ddc::Deriv<DDimX::continuous_dimension_type>, DDimY>,
Kokkos::layout_right,
ddc::DeviceAllocator<double>::memory_space> const derivs {};
//! [instantiate intermediate chunks]


Expand All @@ -255,7 +263,7 @@ int main(int argc, char** argv)
- ddc::Coordinate<X>(vx * ddc::step<DDimT>());
});
// Interpolate the values at feet on the grid
spline_builder(coef, last_density.span_cview());
spline_builder(coef, last_density.span_cview(), derivs.span_cview());
spline_evaluator(next_density, feet_coords.span_cview(), coef.span_cview());
//! [numerical scheme]

Expand Down
Loading