Skip to content

Commit

Permalink
Velocity bc aliases (minor)
Browse files Browse the repository at this point in the history
  • Loading branch information
EmilyBourne committed Oct 10, 2023
1 parent f6b8808 commit 354e959
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 11 deletions.
14 changes: 8 additions & 6 deletions src/geometryRTheta/geometry/geometry.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -373,14 +373,15 @@ using BSplinesVx = UniformBSplines<DimVx, BSDegreeVx>;


auto constexpr SplineXBoundary = DimX::PERIODIC ? BoundCond::PERIODIC : BoundCond::GREVILLE;
auto constexpr SplineVxBoundary = BoundCond::HERMITE;

using InterpPointsX = GrevilleInterpolationPoints<BSplinesX, SplineXBoundary, SplineXBoundary>;
using IDimX = typename InterpPointsX::interpolation_mesh_type;
using SplineXBuilder = SplineBuilder<BSplinesX, IDimX, SplineXBoundary, SplineXBoundary>;

using InterpPointsVx
= GrevilleInterpolationPoints<BSplinesVx, BoundCond::HERMITE, BoundCond::HERMITE>;
using InterpPointsVx = GrevilleInterpolationPoints<BSplinesVx, SplineVxBoundary, SplineVxBoundary>;
using IDimVx = typename InterpPointsVx::interpolation_mesh_type;
using SplineVxBuilder = SplineBuilder<BSplinesVx, IDimVx, BoundCond::HERMITE, BoundCond::HERMITE>;
using SplineVxBuilder = SplineBuilder<BSplinesVx, IDimVx, SplineVxBoundary, SplineVxBoundary>;

// Species dimension
using IDimSp = SpeciesInformation;
Expand Down Expand Up @@ -542,14 +543,15 @@ using BSplinesVy = UniformBSplines<DimVy, BSDegreeVy>;


auto constexpr SplineYBoundary = DimY::PERIODIC ? BoundCond::PERIODIC : BoundCond::GREVILLE;
auto constexpr SplineVyBoundary = BoundCond::HERMITE;

using InterpPointsY = GrevilleInterpolationPoints<BSplinesY, SplineYBoundary, SplineYBoundary>;
using IDimY = typename InterpPointsY::interpolation_mesh_type;
using SplineYBuilder = SplineBuilder<BSplinesY, IDimY, SplineYBoundary, SplineYBoundary>;

using InterpPointsVy
= GrevilleInterpolationPoints<BSplinesVy, BoundCond::HERMITE, BoundCond::HERMITE>;
using InterpPointsVy = GrevilleInterpolationPoints<BSplinesVy, SplineVyBoundary, SplineVyBoundary>;
using IDimVy = typename InterpPointsVy::interpolation_mesh_type;
using SplineVyBuilder = SplineBuilder<BSplinesVy, IDimVy, BoundCond::HERMITE, BoundCond::HERMITE>;
using SplineVyBuilder = SplineBuilder<BSplinesVy, IDimVy, SplineVyBoundary, SplineVyBoundary>;

// Species dimension
using IndexY = ddc::DiscreteElement<IDimY>;
Expand Down
2 changes: 1 addition & 1 deletion src/geometryXVx/geometry/geometry.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ using SplineInterpPointsVx
= GrevilleInterpolationPoints<BSplinesVx, SplineVxBoundary, SplineVxBoundary>;

using SplineXBuilder = SplineBuilder<BSplinesX, IDimX, SplineXBoundary, SplineXBoundary>;
using SplineVxBuilder = SplineBuilder<BSplinesVx, IDimVx, BoundCond::HERMITE, BoundCond::HERMITE>;
using SplineVxBuilder = SplineBuilder<BSplinesVx, IDimVx, SplineVxBoundary, SplineVxBoundary>;


// Species dimension
Expand Down
8 changes: 4 additions & 4 deletions src/geometryXYVxVy/geometry/geometry.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -147,16 +147,16 @@ using SplineInterpPointsX
using SplineInterpPointsY
= GrevilleInterpolationPoints<BSplinesY, SplineYBoundary, SplineYBoundary>;
using SplineInterpPointsVx
= GrevilleInterpolationPoints<BSplinesVx, BoundCond::HERMITE, BoundCond::HERMITE>;
= GrevilleInterpolationPoints<BSplinesVx, SplineVxBoundary, SplineVxBoundary>;
using SplineInterpPointsVy
= GrevilleInterpolationPoints<BSplinesVy, BoundCond::HERMITE, BoundCond::HERMITE>;
= GrevilleInterpolationPoints<BSplinesVy, SplineVyBoundary, SplineVyBoundary>;

// SplineBuilder and SplineEvaluator definition
using SplineXBuilder = SplineBuilder<BSplinesX, IDimX, SplineXBoundary, SplineXBoundary>;
using SplineYBuilder = SplineBuilder<BSplinesY, IDimY, SplineYBoundary, SplineYBoundary>;
using SplineXYBuilder = SplineBuilder2D<SplineXBuilder, SplineYBuilder>;
using SplineVxBuilder = SplineBuilder<BSplinesVx, IDimVx, BoundCond::HERMITE, BoundCond::HERMITE>;
using SplineVyBuilder = SplineBuilder<BSplinesVy, IDimVy, BoundCond::HERMITE, BoundCond::HERMITE>;
using SplineVxBuilder = SplineBuilder<BSplinesVx, IDimVx, SplineVxBoundary, SplineVxBoundary>;
using SplineVyBuilder = SplineBuilder<BSplinesVy, IDimVy, SplineVyBoundary, SplineVyBoundary>;
using SplineVxVyBuilder = SplineBuilder2D<SplineVxBuilder, SplineVyBuilder>;
using SplineXYEvaluator = SplineEvaluator2D<BSplinesX, BSplinesY>;
using SplineVxVyEvaluator = SplineEvaluator2D<BSplinesVx, BSplinesVy>;
Expand Down

0 comments on commit 354e959

Please sign in to comment.