Skip to content

Commit

Permalink
Cleaning up.
Browse files Browse the repository at this point in the history
  • Loading branch information
massimim committed Oct 20, 2022
1 parent 91b5653 commit 206989e
Show file tree
Hide file tree
Showing 31 changed files with 332 additions and 326 deletions.
8 changes: 8 additions & 0 deletions libNeonDomain/include/Neon/domain/StaggeredGrid.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#pragma once
#include "Neon/core/core.h"
#include "Neon/domain/internal/experimental/staggeredGrid/StaggeredGrid.h"

namespace Neon::domain::experimental {
template <typename BuildingBlockGridT>
using StaggeredGrid = Neon::domain::internal::experimental::staggeredGrid::StaggeredGrid<BuildingBlockGridT>;
}
33 changes: 20 additions & 13 deletions libNeonDomain/include/Neon/domain/interface/Stencil.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ struct Stencil
* @param listOfPoinst
* @param filterCenterOut
*/
Stencil(std::vector<Neon::index_3d> const& listOfPoinst, bool filterCenterOut = true);
Stencil(std::vector<Neon::index_3d> const& listOfPoinst,
bool filterCenterOut = true);

/**
* Default constructor
Expand All @@ -24,28 +25,31 @@ struct Stencil
* Returns number of point in the stencil
* @return
*/
auto nPoints() const
-> int;
auto nPoints()
const -> int;

/*
* Returns the id of a direction.
* Id is just the index of the direction in the vector of points
* Returns the index of the direction in the vector of points.
* -1 is returned if the 3dIndex is not found.
*/
auto find(const Neon::index_3d& direction) const
-> int;
auto find(const Neon::index_3d& direction)
const -> int;

/**
* Returns number of neighbours for the stencil
* @return
*/
auto nNeighbours() const
-> int;
auto nNeighbours()
const -> int;

auto points() const
-> const std::vector<Neon::index_3d>&;
auto points()
const -> const std::vector<Neon::index_3d>&;

auto neighbours() const
-> const std::vector<Neon::index_3d>&;
auto neighbours()
const -> const std::vector<Neon::index_3d>&;

auto addPoint(const Neon::index_3d& newPoint)
-> void;

/**
* static method to create a 19 point stencil
Expand Down Expand Up @@ -83,6 +87,9 @@ struct Stencil
static auto s6_Jacobi_t()
-> Stencil;

static auto getUnion(const std::vector<Stencil>& vec)
-> Stencil;

private:
std::vector<Neon::index_3d> m_points{}; /** point in the stencil */
std::vector<Neon::index_3d> m_neighbour{}; /** point in the stencil excluding center position */
Expand Down

This file was deleted.

Loading

0 comments on commit 206989e

Please sign in to comment.