diff --git a/simulations/geometry5D/testcollisions/testcollisions.cpp b/simulations/geometry5D/testcollisions/testcollisions.cpp index 04d2b86e1..bfb439380 100644 --- a/simulations/geometry5D/testcollisions/testcollisions.cpp +++ b/simulations/geometry5D/testcollisions/testcollisions.cpp @@ -145,8 +145,8 @@ int main(int argc, char** argv) DDomVpar dom_vpar(IdxVpar(0), DVecVpar(grid_vpar.size())); ddc::init_discrete_space(grid_mu); DDomMu dom_mu(IdxMu(0), DVecMu(grid_mu.size())); - DVecSp const kinspecies(charges.size()); - DDomSp const dom_kinsp(IdxSp(0), kinspecies); + IVectSp const kinspecies(charges.size()); + IDomainSp const dom_kinsp(IndexSp(0), kinspecies); DFieldTor1 field_grid_tor1(dom_tor1); ddc::parallel_deepcopy(field_grid_tor1, DViewTor1(grid_tor1.data(), dom_tor1)); diff --git a/src/geometry5D/geometry/geometry.hpp b/src/geometry5D/geometry/geometry.hpp index ce47257b6..78434a5cf 100644 --- a/src/geometry5D/geometry/geometry.hpp +++ b/src/geometry5D/geometry/geometry.hpp @@ -10,19 +10,6 @@ * */ -using Species = IDimSp; -using IdxSp = ddc::DiscreteElement; -using DVecSp = ddc::DiscreteVector; -using DDomSp = ddc::DiscreteDomain; - -template -using FieldSp = ddc::Chunk; -using DFieldSp = FieldSp; - -template -using ViewSp = ddc::ChunkView; -using DViewSp = ViewSp; - /** * @brief Define non periodic radial dimension @f$r@f$. */ @@ -129,8 +116,8 @@ using DDomMu = ddc::DiscreteDomain; using DDomTorCS = ddc::DiscreteDomain; using DDomTor3D = ddc::DiscreteDomain; using DDomV2D = ddc::DiscreteDomain; -using DDomSpTor3DV2D = ddc::DiscreteDomain; -using DDomSpTorCS = ddc::DiscreteDomain; +using DDomSpTor3DV2D = ddc::DiscreteDomain; +using DDomSpTorCS = ddc::DiscreteDomain; template using FieldTor1 = device_t>; diff --git a/src/geometryRTheta/geometry/geometry.hpp b/src/geometryRTheta/geometry/geometry.hpp index 7e65ea5bb..b48182f1b 100644 --- a/src/geometryRTheta/geometry/geometry.hpp +++ b/src/geometryRTheta/geometry/geometry.hpp @@ -544,30 +544,22 @@ struct IDimVx : SplineInterpPointsVx::interpolation_mesh_type { }; - - using IndexX = ddc::DiscreteElement; using IndexVx = ddc::DiscreteElement; using IndexXVx = ddc::DiscreteElement; -using IndexSp = ddc::DiscreteElement; using IndexSpX = ddc::DiscreteElement; using IndexSpVx = ddc::DiscreteElement; using IndexSpXVx = ddc::DiscreteElement; - - using IVectX = ddc::DiscreteVector; using IVectVx = ddc::DiscreteVector; using IVectXVx = ddc::DiscreteVector; -using IVectSp = ddc::DiscreteVector; using IVectSpX = ddc::DiscreteVector; using IVectSpVx = ddc::DiscreteVector; using IVectSpXVx = ddc::DiscreteVector; - - using BSDomainX = ddc::DiscreteDomain; using BSDomainVx = ddc::DiscreteDomain; @@ -575,22 +567,17 @@ using IDomainX = ddc::DiscreteDomain; using IDomainVx = ddc::DiscreteDomain; using IDomainXVx = ddc::DiscreteDomain; -using IDomainSp = ddc::DiscreteDomain; using IDomainSpX = ddc::DiscreteDomain; using IDomainSpVx = ddc::DiscreteDomain; using IDomainSpXVx = ddc::DiscreteDomain; - template using FieldX = ddc::Chunk; template using FieldVx = ddc::Chunk; -template -using FieldSp = ddc::Chunk; - template using FieldSpX = ddc::Chunk; @@ -600,27 +587,19 @@ using FieldSpVx = ddc::Chunk; template using FieldSpXVx = ddc::Chunk; - - using DFieldX = FieldX; using DFieldVx = FieldVx; -using DFieldSp = FieldSp; using DFieldSpX = FieldSpX; using DFieldSpVx = FieldSpVx; using DFieldSpXVx = FieldSpXVx; - - template using SpanX = ddc::ChunkSpan; template using SpanVx = ddc::ChunkSpan; -template -using SpanSp = ddc::ChunkSpan; - template using SpanSpX = ddc::ChunkSpan; @@ -630,27 +609,19 @@ using SpanSpVx = ddc::ChunkSpan; template using SpanSpXVx = ddc::ChunkSpan; - - using DSpanX = SpanX; using DSpanVx = SpanVx; -using DSpanSp = SpanSp; using DSpanSpX = SpanSpX; using DSpanSpVx = SpanSpVx; using DSpanSpXVx = SpanSpXVx; - - template using ViewX = ddc::ChunkSpan; template using ViewVx = ddc::ChunkSpan; -template -using ViewSp = ddc::ChunkSpan; - template using ViewSpX = ddc::ChunkSpan; @@ -663,12 +634,9 @@ using ViewSpXVx = ddc::ChunkSpan; template using BSViewX = ddc::ChunkSpan; - - using DViewX = ViewX; using DViewVx = ViewVx; -using DViewSp = ViewSp; using DViewSpX = ViewSpX; using DViewSpVx = ViewSpVx; using DViewSpXVx = ViewSpXVx; @@ -968,7 +936,6 @@ template using BSViewXY = ddc::ChunkSpan; - using DViewXY = ViewXY; using DViewVxVy = ViewVxVy; diff --git a/src/geometryXVx/geometry/geometry.hpp b/src/geometryXVx/geometry/geometry.hpp index 212bdbf1a..da053e2bd 100644 --- a/src/geometryXVx/geometry/geometry.hpp +++ b/src/geometryXVx/geometry/geometry.hpp @@ -181,8 +181,6 @@ struct IDimM : Moments using IndexM = ddc::DiscreteElement; -using IndexSp = ddc::DiscreteElement; - using IndexVx = ddc::DiscreteElement; using IndexX = ddc::DiscreteElement; @@ -204,8 +202,6 @@ using IndexXVx = ddc::DiscreteElement; using IVectM = ddc::DiscreteVector; -using IVectSp = ddc::DiscreteVector; - using IVectVx = ddc::DiscreteVector; using IVectX = ddc::DiscreteVector; @@ -233,14 +229,10 @@ using BSDomainVx = ddc::DiscreteDomain; using IDomainM = ddc::DiscreteDomain; -using IDomainSp = ddc::DiscreteDomain; - using IDomainVx = ddc::DiscreteDomain; using IDomainX = ddc::DiscreteDomain; - - using IDomainSpM = ddc::DiscreteDomain; using IDomainSpMX = ddc::DiscreteDomain; @@ -254,10 +246,6 @@ using IDomainSpXVx = ddc::DiscreteDomain; using IDomainXVx = ddc::DiscreteDomain; - -template -using FieldSp = device_t>; - template using FieldVx = device_t>; @@ -288,8 +276,6 @@ using FieldSpXVx = device_t>; template using DField = device_t>; -using DFieldSp = FieldSp; - using DFieldVx = FieldVx; using DFieldX = FieldX; @@ -312,9 +298,6 @@ using DFieldSpXVx = FieldSpXVx; template using BSSpanX = device_t>; -template -using SpanSp = device_t>; - template using SpanX = device_t>; @@ -339,8 +322,6 @@ using DSpan = device_t>; using DBSSpanX = BSSpanX; -using DSpanSp = SpanSp; - using DSpanVx = SpanVx; using DSpanX = SpanX; @@ -354,10 +335,6 @@ using DSpanSpX = SpanSpX; using DSpanSpXVx = SpanSpXVx; - -template -using ViewSp = device_t>; - template using ViewVx = device_t>; @@ -388,8 +365,6 @@ using ViewSpXVx = device_t>; template using DView = device_t>; -using DViewSp = ViewSp; - using DViewVx = ViewVx; using DViewX = ViewX; diff --git a/src/geometryXYVxVy/geometry/geometry.hpp b/src/geometryXYVxVy/geometry/geometry.hpp index 0df0e2750..628a923b5 100644 --- a/src/geometryXYVxVy/geometry/geometry.hpp +++ b/src/geometryXYVxVy/geometry/geometry.hpp @@ -256,7 +256,6 @@ using BSViewXY = device_t>; using DBSViewXY = BSViewXY; // Index -using IndexSp = ddc::DiscreteElement; using IndexX = ddc::DiscreteElement; using IndexY = ddc::DiscreteElement; using IndexXY = ddc::DiscreteElement; @@ -267,14 +266,12 @@ using IndexXYVxVy = ddc::DiscreteElement; using IndexSpXYVxVy = ddc::DiscreteElement; // IVect definition -using IVectSp = ddc::DiscreteVector; using IVectX = ddc::DiscreteVector; using IVectY = ddc::DiscreteVector; using IVectVx = ddc::DiscreteVector; using IVectVy = ddc::DiscreteVector; // Idomain definition -using IDomainSp = ddc::DiscreteDomain; using IDomainX = ddc::DiscreteDomain; using IDomainY = ddc::DiscreteDomain; using IDomainXY = ddc::DiscreteDomain; @@ -285,11 +282,6 @@ using IDomainVxVy = ddc::DiscreteDomain; using IDomainSpVxVy = ddc::DiscreteDomain; using IDomainSpXYVxVy = ddc::DiscreteDomain; -// Field definition -template -using FieldSp = device_t>; -using DFieldSp = FieldSp; - template using FieldX = device_t>; using DFieldX = FieldX; @@ -358,10 +350,6 @@ using SpanSpXYVxVy = device_t>; using DSpanSpXYVxVy = SpanSpXYVxVy; // View definition -template -using ViewSp = device_t>; -using DViewSp = ViewSp; - template using ViewX = device_t>; diff --git a/src/speciesinfo/species_info.hpp b/src/speciesinfo/species_info.hpp index 900e4ec83..698a94f9c 100644 --- a/src/speciesinfo/species_info.hpp +++ b/src/speciesinfo/species_info.hpp @@ -4,6 +4,8 @@ #include +#include + /// @brief Species discrete dimension to access constant attributes related to species. class SpeciesInformation { @@ -161,3 +163,20 @@ KOKKOS_INLINE_FUNCTION double mass(ddc::DiscreteElement const isp) { return ddc::discrete_space().mass(isp); } + +using IndexSp = ddc::DiscreteElement; +using IDomainSp = ddc::DiscreteDomain; // --> Should be DomSp +using IVectSp = ddc::DiscreteVector; // --> Should be VectSp or VecSp + +template +using FieldSp = ddc::Chunk; +using DFieldSp = FieldSp; +using IFieldSp = device_t>; + +template +using ViewSp = ddc::ChunkView; +using DViewSp = ViewSp; + +template +using SpanSp = device_t>; +using DSpanSp = SpanSp; diff --git a/src/speciesinfo/species_init.cpp b/src/speciesinfo/species_init.cpp index f8fa47daf..d4c04ecb7 100644 --- a/src/speciesinfo/species_init.cpp +++ b/src/speciesinfo/species_init.cpp @@ -17,12 +17,6 @@ void init_all_species( int nb_kinspecies, int nb_fluidspecies) { - using IndexSp = ddc::DiscreteElement; - using IDomainSp = ddc::DiscreteDomain; - using IVectSp = ddc::DiscreteVector; - using DFieldSp = device_t>; - using IFieldSp = device_t>; - // Define the domain for kinetic species dom_kinsp = IDomainSp(IndexSp(0), IVectSp(nb_kinspecies)); host_t kinetic_charges(dom_kinsp); diff --git a/tests/species_info.cpp b/tests/species_info.cpp index f17868db1..fc12f67b2 100644 --- a/tests/species_info.cpp +++ b/tests/species_info.cpp @@ -6,17 +6,6 @@ #include -namespace { - - -using IVectSp = ddc::DiscreteVector; -using IndexSp = ddc::DiscreteElement; -using IDomainSp = ddc::DiscreteDomain; -template -using FieldSp = ddc::Chunk; - -} // namespace - TEST(SpeciesInfo, Ielec) { IVectSp const nb_kinspecies(2);