Commit 27d3ea79 authored by BRAMAS Berenger's avatar BRAMAS Berenger

Change F3DPosition to FPoint

parent f2d5125a
......@@ -12,7 +12,7 @@
#define FOCTREEARRANGER_HPP
#include "../Utils/FGlobal.hpp"
#include "../Utils/F3DPosition.hpp"
#include "../Utils/FPoint.hpp"
#include "../Containers/FVector.hpp"
#include "../Utils/FAssertable.hpp"
......@@ -37,8 +37,8 @@ public:
// For periodic
const FReal boxWidth = tree->getBoxWidth();
const F3DPosition min(tree->getBoxCenter(),-boxWidth/2);
const F3DPosition max(tree->getBoxCenter(),boxWidth/2);
const FPoint min(tree->getBoxCenter(),-boxWidth/2);
const FPoint max(tree->getBoxCenter(),boxWidth/2);
{ // iterate on the leafs and found particle to remove
typename OctreeClass::Iterator octreeIterator(tree);
......@@ -49,7 +49,7 @@ public:
typename ContainerClass::BasicIterator iter(*octreeIterator.getCurrentListTargets());
while( iter.hasNotFinished() ){
if(isPeriodic){
F3DPosition partPos = iter.data().getPosition();
FPoint partPos = iter.data().getPosition();
while(partPos.getX() < min.getX()){
partPos.incX(boxWidth);
}
......
......@@ -89,8 +89,8 @@ public:
{ // iterate on the leafs and found particle to remove or to send
// For periodic
const FReal boxWidth = tree->getBoxWidth();
const F3DPosition min(tree->getBoxCenter(),-boxWidth/2);
const F3DPosition max(tree->getBoxCenter(),boxWidth/2);
const FPoint min(tree->getBoxCenter(),-boxWidth/2);
const FPoint max(tree->getBoxCenter(),boxWidth/2);
typename OctreeClass::Iterator octreeIterator(tree);
octreeIterator.gotoBottomLeft();
......@@ -100,7 +100,7 @@ public:
typename ContainerClass::BasicIterator iter(*octreeIterator.getCurrentListTargets());
while( iter.hasNotFinished() ){
if(isPeriodic){
F3DPosition partPos = iter.data().getPosition();
FPoint partPos = iter.data().getPosition();
while(partPos.getX() < min.getX()){
partPos.incX(boxWidth);
}
......
......@@ -53,7 +53,7 @@ public:
* Must be implemented by each user Cell class
* @param inPosition the position of the current cell
*/
virtual void setPosition(const F3DPosition& inPosition) = 0;
virtual void setPosition(const FPoint& inPosition) = 0;
/**
* Must be implemented by each user Cell class
......
......@@ -13,7 +13,7 @@
/* forward declaration to avoid include */
class F3DPosition;
class FPoint;
/**
* @author Berenger Bramas (berenger.bramas@inria.fr)
......@@ -42,7 +42,7 @@ public:
* Must be implemented by each user Particle class
* @return the position of the current cell
*/
virtual const F3DPosition& getPosition() const = 0;
virtual const FPoint& getPosition() const = 0;
};
......
......@@ -17,7 +17,7 @@
#include "../Utils/FDebug.hpp"
#include "../Utils/FGlobal.hpp"
#include "../Utils/F3DPosition.hpp"
#include "../Utils/FPoint.hpp"
#include "../Utils/FMath.hpp"
#include "../Utils/FNoCopyable.hpp"
#include "../Utils/FAssertable.hpp"
......@@ -33,7 +33,7 @@
* Please refere to testOctree.cpp to see an example.
* <code>
* // can be used as : <br>
* FOctree<TestParticle, TestCell> tree(1.0,F3DPosition(0.5,0.5,0.5));
* FOctree<TestParticle, TestCell> tree(1.0,FPoint(0.5,0.5,0.5));
* </code>
*
* Particles and cells has to respect the Abstract class definition.
......@@ -50,8 +50,8 @@ class FOctree : protected FAssertable, public FNoCopyable {
FAbstractSubOctree< ParticleClass, CellClass , ContainerClass, LeafClass>* root; //< root suboctree
const F3DPosition boxCenter; //< the space system center
const F3DPosition boxCorner; //< the space system corner (used to compute morton index)
const FPoint boxCenter; //< the space system center
const FPoint boxCorner; //< the space system corner (used to compute morton index)
const FReal boxWidth; //< the space system width
......@@ -61,7 +61,7 @@ class FOctree : protected FAssertable, public FNoCopyable {
* @param inPosition position to compute
* @return the morton index
*/
FTreeCoordinate getCoordinateFromPosition(const F3DPosition& inPosition) const {
FTreeCoordinate getCoordinateFromPosition(const FPoint& inPosition) const {
// box coordinate to host the particle
FTreeCoordinate host;
// position has to be relative to corner not center
......@@ -94,7 +94,7 @@ public:
* @param inBoxCenter box center for this simulation
*/
FOctree(const int inHeight, const int inSubHeight,
const FReal inBoxWidth, const F3DPosition& inBoxCenter)
const FReal inBoxWidth, const FPoint& inBoxCenter)
: boxWidthAtLevel(new FReal[inHeight]),
height(inHeight) , subHeight(inSubHeight), leafIndex(this->height-1),
root(0), boxCenter(inBoxCenter), boxCorner(inBoxCenter,-(inBoxWidth/2)), boxWidth(inBoxWidth)
......@@ -138,7 +138,7 @@ public:
}
/** To get the center of the box */
const F3DPosition& getBoxCenter() const{
const FPoint& getBoxCenter() const{
return this->boxCenter;
}
......@@ -189,7 +189,7 @@ public:
* @param a position to compute MI
* @return the morton index
*/
MortonIndex getMortonFromPosition(const F3DPosition& position) const {
MortonIndex getMortonFromPosition(const FPoint& position) const {
return getCoordinateFromPosition(position).getMortonIndex(leafIndex);
}
......
......@@ -13,7 +13,7 @@
#include "../Utils/FGlobal.hpp"
#include "../Utils/F3DPosition.hpp"
#include "../Utils/FPoint.hpp"
#include "../Utils/FAssertable.hpp"
#include "../Utils/FMath.hpp"
......
......@@ -13,7 +13,7 @@
#include "../Utils/FGlobal.hpp"
#include "../Utils/F3DPosition.hpp"
#include "../Utils/FPoint.hpp"
#include "../Containers/FBufferReader.hpp"
#include "../Containers/FBufferWriter.hpp"
......@@ -27,7 +27,7 @@
*/
class FExtendForces {
protected:
F3DPosition forces; //< 3D vector stored in a position object
FPoint forces; //< 3D vector stored in a position object
public:
/** Default constructor */
......@@ -45,12 +45,12 @@ public:
}
/** Return the forces */
const F3DPosition& getForces() const {
const FPoint& getForces() const {
return this->forces;
}
/** Set Forces */
void incForces(const F3DPosition& inForces) {
void incForces(const FPoint& inForces) {
this->forces += inForces;
}
......
......@@ -13,7 +13,7 @@
#include "../Utils/FGlobal.hpp"
#include "../Utils/F3DPosition.hpp"
#include "../Utils/FPoint.hpp"
#include "../Containers/FBufferReader.hpp"
#include "../Containers/FBufferWriter.hpp"
......@@ -26,7 +26,7 @@
*/
class FExtendPosition {
protected:
F3DPosition position; //< The position
FPoint position; //< The position
public:
/** Default constructor */
......@@ -44,12 +44,12 @@ public:
}
/** To get the position */
const F3DPosition& getPosition() const {
const FPoint& getPosition() const {
return this->position;
}
/** To set the position */
void setPosition(const F3DPosition& inPosition) {
void setPosition(const FPoint& inPosition) {
this->position = inPosition;
}
......@@ -61,7 +61,7 @@ public:
}
/** Set Position */
void incPosition(const F3DPosition& inPosition) {
void incPosition(const FPoint& inPosition) {
this->position += inPosition;
}
......
......@@ -14,7 +14,7 @@
#include "../Utils/FGlobal.hpp"
#include "../Utils/F3DPosition.hpp"
#include "../Utils/FPoint.hpp"
#include "../Containers/FBufferReader.hpp"
#include "../Containers/FBufferWriter.hpp"
......@@ -28,7 +28,7 @@
*/
class FExtendVelocity {
protected:
F3DPosition velocity; //< 3D vector stored in a position object
FPoint velocity; //< 3D vector stored in a position object
public:
/** Default constructor */
......@@ -46,12 +46,12 @@ public:
}
/** Return the velocity */
const F3DPosition& getVelocity() const {
const FPoint& getVelocity() const {
return this->velocity;
}
/** Set Velocity */
void incVelocity(const F3DPosition& inVelocity) {
void incVelocity(const FPoint& inVelocity) {
this->velocity += inVelocity;
}
......
......@@ -13,7 +13,7 @@
#include "../Utils/FGlobal.hpp"
class F3DPosition;
class FPoint;
/**
* @author Berenger Bramas (berenger.bramas@inria.fr)
......@@ -46,7 +46,7 @@ public:
* Get the center of the simulation box
* @return box center needed by the octree
*/
virtual F3DPosition getCenterOfBox() const = 0;
virtual FPoint getCenterOfBox() const = 0;
/**
* Get the simulation box width
......
......@@ -17,7 +17,7 @@
#include "../Utils/FGlobal.hpp"
#include "FAbstractLoader.hpp"
#include "../Utils/F3DPosition.hpp"
#include "../Utils/FPoint.hpp"
/**
* @author Berenger Bramas (berenger.bramas@inria.fr)
......@@ -48,7 +48,7 @@ template <class ParticleClass>
class FBasicLoader : public FAbstractLoader<ParticleClass> {
protected:
std::ifstream file; //< The file to read
F3DPosition centerOfBox; //< The center of box read from file
FPoint centerOfBox; //< The center of box read from file
FReal boxWidth; //< the box width read from file
int nbParticles; //< the number of particles read from file
......@@ -98,7 +98,7 @@ public:
* The center of the box from the simulation file opened by the loader
* @return box center
*/
F3DPosition getCenterOfBox() const{
FPoint getCenterOfBox() const{
return this->centerOfBox;
}
......@@ -118,7 +118,7 @@ public:
void fillParticle(ParticleClass& inParticle){
FReal x,y,z;
this->file >> x >> y >> z;
inParticle.setPosition(F3DPosition(x,y,z));
inParticle.setPosition(FPoint(x,y,z));
}
};
......
......@@ -18,7 +18,7 @@
#include "../Utils/FGlobal.hpp"
#include "FAbstractLoader.hpp"
#include "../Utils/F3DPosition.hpp"
#include "../Utils/FPoint.hpp"
/**
* @author Berenger Bramas (berenger.bramas@inria.fr)
......@@ -30,7 +30,7 @@ template <class ParticleClass>
class FEwalLoader : public FAbstractLoader<ParticleClass> {
protected:
std::ifstream file; //< The file to read
F3DPosition centerOfBox; //< The center of box read from file
FPoint centerOfBox; //< The center of box read from file
FReal boxWidth; //< the box width read from file
int nbParticles; //< the number of particles read from file
......@@ -97,7 +97,7 @@ public:
* The center of the box from the simulation file opened by the loader
* @return box center
*/
F3DPosition getCenterOfBox() const{
FPoint getCenterOfBox() const{
return this->centerOfBox;
}
......
......@@ -16,7 +16,7 @@
#include "../Utils/FGlobal.hpp"
#include "FAbstractLoader.hpp"
#include "../Utils/F3DPosition.hpp"
#include "../Utils/FPoint.hpp"
#include "../Utils/FDebug.hpp"
/**
......@@ -50,7 +50,7 @@ template <class ParticleClass>
class FFmaBinLoader : public FAbstractLoader<ParticleClass> {
protected:
FILE* const file; //< The file to read
F3DPosition centerOfBox; //< The center of box read from file
FPoint centerOfBox; //< The center of box read from file
FReal boxWidth; //< the box width read from file
FSize nbParticles; //< the number of particles read from file
......@@ -115,7 +115,7 @@ public:
* The center of the box from the simulation file opened by the loader
* @return box center
*/
F3DPosition getCenterOfBox() const{
FPoint getCenterOfBox() const{
return this->centerOfBox;
}
......
......@@ -17,7 +17,7 @@
#include "../Utils/FGlobal.hpp"
#include "FAbstractLoader.hpp"
#include "../Utils/F3DPosition.hpp"
#include "../Utils/FPoint.hpp"
/**
* @author Berenger Bramas (berenger.bramas@inria.fr)
......@@ -50,7 +50,7 @@ template <class ParticleClass>
class FFmaLoader : public FAbstractLoader<ParticleClass> {
protected:
std::ifstream file; //< The file to read
F3DPosition centerOfBox; //< The center of box read from file
FPoint centerOfBox; //< The center of box read from file
FReal boxWidth; //< the box width read from file
int nbParticles; //< the number of particles read from file
......@@ -101,7 +101,7 @@ public:
* The center of the box from the simulation file opened by the loader
* @return box center
*/
F3DPosition getCenterOfBox() const{
FPoint getCenterOfBox() const{
return this->centerOfBox;
}
......
......@@ -17,7 +17,7 @@
#include "../Utils/FGlobal.hpp"
#include "FAbstractLoader.hpp"
#include "../Utils/F3DPosition.hpp"
#include "../Utils/FPoint.hpp"
/**
* @author Berenger Bramas (berenger.bramas@inria.fr)
......@@ -50,7 +50,7 @@ template <class ParticleClass>
class FFmaScanfLoader : public FAbstractLoader<ParticleClass> {
protected:
FILE* file; //< The file to read
F3DPosition centerOfBox; //< The center of box read from file
FPoint centerOfBox; //< The center of box read from file
FReal boxWidth; //< the box width read from file
int nbParticles; //< the number of particles read from file
......@@ -108,7 +108,7 @@ public:
* The center of the box from the simulation file opened by the loader
* @return box center
*/
F3DPosition getCenterOfBox() const{
FPoint getCenterOfBox() const{
return this->centerOfBox;
}
......
......@@ -17,7 +17,7 @@
#include "../Utils/FGlobal.hpp"
#include "FAbstractLoader.hpp"
#include "../Utils/F3DPosition.hpp"
#include "../Utils/FPoint.hpp"
/**
* @author Berenger Bramas (berenger.bramas@inria.fr)
......@@ -50,7 +50,7 @@ template <class ParticleClass>
class FFmaTsmLoader : public FAbstractLoader<ParticleClass> {
protected:
std::ifstream file; //< The file to read
F3DPosition centerOfBox; //< The center of box read from file
FPoint centerOfBox; //< The center of box read from file
FReal boxWidth; //< the box width read from file
int nbParticles; //< the number of particles read from file
......@@ -101,7 +101,7 @@ public:
* The center of the box from the simulation file opened by the loader
* @return box center
*/
F3DPosition getCenterOfBox() const{
FPoint getCenterOfBox() const{
return this->centerOfBox;
}
......
......@@ -17,7 +17,7 @@
#include "../Utils/FGlobal.hpp"
#include "FAbstractLoader.hpp"
#include "../Utils/F3DPosition.hpp"
#include "../Utils/FPoint.hpp"
/**
* @author Berenger Bramas (berenger.bramas@inria.fr)
......@@ -50,7 +50,7 @@ template <class ParticleClass>
class FHLoader : public FAbstractLoader<ParticleClass> {
protected:
FILE* file; //< The file to read
F3DPosition centerOfBox; //< The center of box read from file
FPoint centerOfBox; //< The center of box read from file
FReal boxWidth; //< the box width read from file
int nbParticles; //< the number of particles read from file
......@@ -112,7 +112,7 @@ public:
* The center of the box from the simulation file opened by the loader
* @return box center
*/
F3DPosition getCenterOfBox() const{
FPoint getCenterOfBox() const{
return this->centerOfBox;
}
......
......@@ -17,7 +17,7 @@
#include "../Utils/FGlobal.hpp"
#include "FAbstractLoader.hpp"
#include "../Utils/F3DPosition.hpp"
#include "../Utils/FPoint.hpp"
#include "../Utils/FMpi.hpp"
/**
......@@ -50,7 +50,7 @@
template <class ParticleClass>
class FMpiFmaLoader : public FAbstractLoader<ParticleClass> {
protected:
F3DPosition centerOfBox; //< The center of box read from file
FPoint centerOfBox; //< The center of box read from file
FReal boxWidth; //< the box width read from file
FSize totalNbParticles; //< the number of particles read from file
FSize nbParticles; //< the number of particles read from file
......@@ -204,7 +204,7 @@ public:
* The center of the box from the simulation file opened by the loader
* @return box center
*/
F3DPosition getCenterOfBox() const{
FPoint getCenterOfBox() const{
return this->centerOfBox;
}
......
......@@ -72,7 +72,7 @@ private:
// create particles
IndexedParticle*const realParticlesIndexed = new IndexedParticle[loader.getNumberOfParticles()];
FMemUtils::memset(realParticlesIndexed, 0, sizeof(IndexedParticle) * loader.getNumberOfParticles());
F3DPosition boxCorner(loader.getCenterOfBox() - (loader.getBoxWidth()/2));
FPoint boxCorner(loader.getCenterOfBox() - (loader.getBoxWidth()/2));
FTreeCoordinate host;
const FReal boxWidthAtLeafLevel = loader.getBoxWidth() / FReal(1 << (TreeHeight - 1) );
......@@ -98,7 +98,7 @@ private:
}
static void SortParticlesFromArray( const FMpi::FComm& communicator, const ParticleClass array[], const int size, const SortingType type,
const F3DPosition& centerOfBox, const FReal boxWidth,
const FPoint& centerOfBox, const FReal boxWidth,
const int TreeHeight, IndexedParticle**const outputArray, FSize* const outputSize){
FTRACE( FTrace::FFunction functionTrace(__FUNCTION__ , "Loader to Tree" , __FILE__ , __LINE__) );
......@@ -106,7 +106,7 @@ private:
IndexedParticle*const realParticlesIndexed = new IndexedParticle[size];
FMemUtils::memset(realParticlesIndexed, 0, sizeof(IndexedParticle) * size);
F3DPosition boxCorner(centerOfBox - (boxWidth/2));
FPoint boxCorner(centerOfBox - (boxWidth/2));
FTreeCoordinate host;
const FReal boxWidthAtLeafLevel = boxWidth / FReal(1 << (TreeHeight - 1) );
......@@ -510,7 +510,7 @@ public:
template <class OctreeClass>
static void ArrayToTree(const FMpi::FComm& communicator, const ParticleClass array[], const int size,
const F3DPosition& boxCenter, const FReal boxWidth,
const FPoint& boxCenter, const FReal boxWidth,
OctreeClass& realTree, const SortingType type = QuickSort){
IndexedParticle* particlesArray = 0;
......
......@@ -19,7 +19,7 @@
#include "../Utils/FGlobal.hpp"
#include "FAbstractLoader.hpp"
#include "../Utils/F3DPosition.hpp"
#include "../Utils/FPoint.hpp"
/**
* @author Berenger Bramas (berenger.bramas@inria.fr)
......@@ -31,14 +31,14 @@ class FRandomLoader : public FAbstractLoader<ParticleClass> {
protected:
const int nbParticles; //< the number of particles
const FReal boxWidth; //< the box width
const F3DPosition centerOfBox; //< The center of box
const FPoint centerOfBox; //< The center of box
public:
/**
* The constructor need the simulation data
*/
FRandomLoader(const int inNbParticles, const FReal inBoxWidth = 1.0,
const F3DPosition& inCenterOfBox = F3DPosition(0,0,0), const unsigned int inSeed = static_cast<unsigned int>(time(NULL)))
const FPoint& inCenterOfBox = FPoint(0,0,0), const unsigned int inSeed = static_cast<unsigned int>(time(NULL)))
: nbParticles(inNbParticles), boxWidth(inBoxWidth), centerOfBox(inCenterOfBox) {
srand(inSeed);
}
......@@ -68,7 +68,7 @@ public:
* The center of the box
* @return box center
*/
F3DPosition getCenterOfBox() const{
FPoint getCenterOfBox() const{
return this->centerOfBox;
}
......@@ -104,7 +104,7 @@ template <class ParticleClass>
class FRandomLoaderTsm : public FRandomLoader<ParticleClass> {
public:
FRandomLoaderTsm(const int inNbParticles, const FReal inBoxWidth = 1.0,
const F3DPosition& inCenterOfBox = F3DPosition(0,0,0), const unsigned int inSeed = static_cast<unsigned int>(time(NULL)))
const FPoint& inCenterOfBox = FPoint(0,0,0), const unsigned int inSeed = static_cast<unsigned int>(time(NULL)))
: FRandomLoader<ParticleClass>(inNbParticles,inBoxWidth,inCenterOfBox,inSeed) {
}
......
......@@ -53,7 +53,7 @@ public:
const FReal width = tree.getBoxWidth();
file.write((const char*)&width, sizeof(FReal));
file.write((const char*)&tree.getBoxCenter(), sizeof(F3DPosition));
file.write((const char*)&tree.getBoxCenter(), sizeof(FPoint));
{
typename OctreeClass::Iterator octreeIterator(&tree);
......@@ -181,8 +181,8 @@ public:
file.read((char*)&treeSubHeight, sizeof(int));
FReal boxWidth = 0;
file.read((char*)&boxWidth, sizeof(FReal));
F3DPosition center;
file.read((char*)&center, sizeof(F3DPosition));
FPoint center;
file.read((char*)&center, sizeof(FPoint));
tree.~OctreeClass();
new (&tree) OctreeClass(treeHeight,treeSubHeight,boxWidth,center);
......
......@@ -42,7 +42,7 @@ protected:
/// Height of the entire oct-tree
const unsigned int TreeHeight;
/// Corner of oct-tree box
const F3DPosition BoxCorner;
const FPoint BoxCorner;
/// Width of oct-tree box
const FReal BoxWidth;
/// Width of a leaf cell box
......@@ -53,9 +53,9 @@ protected:
* @param[in] Coordinate tree coordinate
* @return center of leaf cell
*/
const F3DPosition getLeafCellCenter(const FTreeCoordinate& Coordinate) const
const FPoint getLeafCellCenter(const FTreeCoordinate& Coordinate) const
{
return F3DPosition(BoxCorner.getX() + (FReal(Coordinate.getX()) + FReal(.5)) * BoxWidthLeaf,
return FPoint(BoxCorner.getX() + (FReal(Coordinate.getX()) + FReal(.5)) * BoxWidthLeaf,
BoxCorner.getY() + (FReal(Coordinate.getY()) + FReal(.5)) * BoxWidthLeaf,
BoxCorner.getZ() + (FReal(Coordinate.getZ()) + FReal(.5)) * BoxWidthLeaf);
}
......@@ -68,7 +68,7 @@ public:
* runtime_error is thrown if the required file is not valid).
*/
FAbstractChebKernel(const int inTreeHeight,
const F3DPosition& inBoxCenter,
const FPoint& inBoxCenter,
const FReal inBoxWidth)
: Interpolator(new InterpolatorClass()),
MatrixKernel(new MatrixKernelClass()),
......@@ -200,7 +200,7 @@ private:
const FReal ws = Source.getPhysicalValue();
// potential
Target.incPotential(one_over_r * ws);
F3DPosition force(Source.getPosition() - Target.getPosition());
FPoint force(Source.getPosition() - Target.getPosition());
force *= ((ws*wt) * (one_over_r*one_over_r*one_over_r));
// force
Target.incForces(force.getX(), force.getY(), force.getZ());
......@@ -215,7 +215,7 @@ private:
Target.incPotential(one_over_r * ws);
Source.incPotential(one_over_r * wt);
// force
F3DPosition force(Source.getPosition() - Target.getPosition());
FPoint force(Source.getPosition() - Target.getPosition());
force *= ((ws*wt) * (one_over_r*one_over_r*one_over_r));
Target.incForces( force.getX(), force.getY(), force.getZ());
Source.incForces((-force.getX()), (-force.getY()), (-force.getZ()));
......
......@@ -40,12 +40,12 @@ class FChebInterpolator : FNoCopyable
*/
void initM2MandL2L()
{
F3DPosition ParentRoots[nnodes], ChildRoots[nnodes];
FPoint ParentRoots[nnodes], ChildRoots[nnodes];
const FReal ParentWidth(2.);
const F3DPosition ParentCenter(0., 0., 0.);
const FPoint ParentCenter(0., 0., 0.);
FChebTensor<ORDER>::setRoots(ParentCenter, ParentWidth, ParentRoots);
F3DPosition ChildCenter;
FPoint ChildCenter;
const FReal ChildWidth(1.);
// loop: child cells
......@@ -106,7 +106,7 @@ public:
* @param[out] Interpolator
*/
void assembleInterpolator(const unsigned int NumberOfLocalPoints,
const F3DPosition *const LocalPoints,
const FPoint *const LocalPoints,
FReal *const Interpolator) const
{
// values of chebyshev polynomials of source particle: T_o(x_i)
......@@ -143,7 +143,7 @@ public:
* (anterpolation, it is the transposed interpolation)
*/
template <class ContainerClass>
void applyP2M(const F3DPosition& center,
void applyP2M(const FPoint& center,
const FReal width,
FReal *const multipoleExpansion,
const ContainerClass *const sourceParticles) const;
......@@ -154,7 +154,7 @@ public:
* Local to particle operation: application of \f$S_\ell(x,\bar x_m)\f$ (interpolation)
*/
template <class ContainerClass>
void applyL2P(const F3DPosition& center,
void applyL2P(const FPoint& center,
const FReal width,
const FReal *const localExpansion,
ContainerClass *const localParticles) const;
......@@ -164,7 +164,7 @@ public:
* Local to particle operation: application of \f$\nabla_x S_\ell(x,\bar x_m)\f$ (interpolation)
*/
template <class ContainerClass>
void applyL2PGradient(const F3DPosition& center,
void applyL2PGradient(const FPoint& center,
const FReal width,
const FReal *const localExpansion,
ContainerClass *const localParticles) const;
......@@ -174,7 +174,7 @@ public:
* \f$\nabla_x S_\ell(x,\bar x_m)\f$ (interpolation)
*/
template <class ContainerClass>
void applyL2PTotal(const F3DPosition& center,
void applyL2PTotal(const FPoint& center,
const FReal width,
const FReal *const localExpansion,
ContainerClass *const localParticles) const;
......@@ -212,7 +212,7 @@ public:
*/
template <int ORDER>
template <class ContainerClass>
inline void FChebInterpolator<ORDER>::applyP2M(const F3DPosition& center,
inline void FChebInterpolator<ORDER>::applyP2M(const FPoint& center,
const FReal width,
FReal *const multipoleExpansion,
const ContainerClass *const sourceParticles) const
......@@ -222,7 +222,7 @@ inline void FChebInterpolator<ORDER>::applyP2M(const F3DPosition& center,
// allocate stuff
const map_glob_loc map(center, width);
F3DPosition localPosition;
FPoint localPosition;
FReal T_of_x[ORDER][3];
FReal S[3];
......@@ -272,14 +272,14 @@ inline void FChebInterpolator<ORDER>::applyP2M(const F3DPosition& center,