Skip to content

Commit

Permalink
Merge branch 'main' into fft-doc
Browse files Browse the repository at this point in the history
  • Loading branch information
blegouix authored Jul 19, 2024
2 parents dae0e82 + 24e28f0 commit 7db728c
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 17 deletions.
9 changes: 0 additions & 9 deletions include/ddc/non_uniform_point_sampling.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -209,15 +209,6 @@ struct is_non_uniform_point_sampling
template <class DDim>
constexpr bool is_non_uniform_point_sampling_v = is_non_uniform_point_sampling<DDim>::value;

template <class DDim>
using is_non_uniform_sampling [[deprecated("Use is_non_uniform_point_sampling instead")]]
= is_non_uniform_point_sampling<DDim>;

template <class DDim>
[[deprecated(
"Use is_non_uniform_point_sampling_v instead")]] constexpr bool is_non_uniform_sampling_v
= is_non_uniform_point_sampling_v<DDim>;

template <
class DDimImpl,
std::enable_if_t<
Expand Down
6 changes: 6 additions & 0 deletions include/ddc/periodic_sampling.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,8 @@ class PeriodicSampling : detail::PeriodicSamplingBase

/** Construct a Impl<Kokkos::HostSpace> and associated discrete_domain_type from a segment
* \f$[a, b] \subset [a, +\infty[\f$ and a number of points `n`.
* Note that there is no guarantee that either the boundaries a or b will be exactly represented in the sampling.
* One should expect usual floating point rounding errors.
*
* @param a coordinate of the first point of the domain
* @param b coordinate of the last point of the domain
Expand All @@ -159,6 +161,8 @@ class PeriodicSampling : detail::PeriodicSamplingBase

/** Construct a periodic `DiscreteDomain` from a segment \f$[a, b] \subset [a, +\infty[\f$ and a
* number of points `n`.
* Note that there is no guarantee that either the boundaries a or b will be exactly represented in the sampling.
* One should expect usual floating point rounding errors.
*
* @param a coordinate of the first point of the domain
* @param b coordinate of the last point of the domain
Expand Down Expand Up @@ -209,6 +213,8 @@ class PeriodicSampling : detail::PeriodicSamplingBase

/** Construct a periodic `DiscreteDomain` from a segment \f$[a, b] \subset [a, +\infty[\f$ and a
* number of points `n`.
* Note that there is no guarantee that either the boundaries a or b will be exactly represented in the sampling.
* One should expect usual floating point rounding errors.
*
* @param a coordinate of the first point of the domain
* @param b coordinate of the last point of the domain
Expand Down
14 changes: 6 additions & 8 deletions include/ddc/uniform_point_sampling.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,8 @@ class UniformPointSampling : detail::UniformPointSamplingBase

/** Construct a Impl<Kokkos::HostSpace> and associated discrete_domain_type from a segment
* \f$[a, b] \subset [a, +\infty[\f$ and a number of points `n`.
* Note that there is no guarantee that either the boundaries a or b will be exactly represented in the sampling.
* One should expect usual floating point rounding errors.
*
* @param a coordinate of the first point of the domain
* @param b coordinate of the last point of the domain
Expand All @@ -135,6 +137,8 @@ class UniformPointSampling : detail::UniformPointSamplingBase

/** Construct a uniform `DiscreteDomain` from a segment \f$[a, b] \subset [a, +\infty[\f$ and a
* number of points `n`.
* Note that there is no guarantee that either the boundaries a or b will be exactly represented in the sampling.
* One should expect usual floating point rounding errors.
*
* @param a coordinate of the first point of the domain
* @param b coordinate of the last point of the domain
Expand Down Expand Up @@ -180,6 +184,8 @@ class UniformPointSampling : detail::UniformPointSamplingBase

/** Construct a uniform `DiscreteDomain` from a segment \f$[a, b] \subset [a, +\infty[\f$ and a
* number of points `n`.
* Note that there is no guarantee that either the boundaries a or b will be exactly represented in the sampling.
* One should expect usual floating point rounding errors.
*
* @param a coordinate of the first point of the domain
* @param b coordinate of the last point of the domain
Expand Down Expand Up @@ -211,14 +217,6 @@ struct is_uniform_point_sampling : public std::is_base_of<detail::UniformPointSa
template <class DDim>
constexpr bool is_uniform_point_sampling_v = is_uniform_point_sampling<DDim>::value;

template <class DDim>
using is_uniform_sampling [[deprecated("Use is_uniform_point_sampling instead")]]
= is_uniform_point_sampling<DDim>;

template <class DDim>
[[deprecated("Use is_uniform_point_sampling_v instead")]] constexpr bool is_uniform_sampling_v
= is_uniform_point_sampling_v<DDim>;

template <
class DDimImpl,
std::enable_if_t<
Expand Down

0 comments on commit 7db728c

Please sign in to comment.