Commit ac8a201e authored by berenger-bramas's avatar berenger-bramas
Browse files

Split the core directory into :

Core (Fmm)
Components (cells, leafs, particules)
Changed FMM into Fmm.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/scalfmm/scalfmm/trunk@38 2616d619-271b-44dc-8df4-d4a8f33a7222
parent bd07c935
......@@ -12,7 +12,7 @@
/**
* @author Berenger Bramas (berenger.bramas@inria.fr)
* @class FFMMAlgorithm
* @class FFmmAlgorithm
* @brief
* Please read the license
*
......@@ -25,7 +25,7 @@ template<template< class ParticuleClass, class CellClass, int OctreeHeight> clas
class ParticuleClass, class CellClass,
template<class ParticuleClass> class LeafClass,
int OctreeHeight, int SubtreeHeight>
class FFMMAlgorithm : protected FAssertable{
class FFmmAlgorithm : protected FAssertable{
// To reduce the size of variable type based on foctree in this file
typedef FOctree<ParticuleClass, CellClass, LeafClass, OctreeHeight, SubtreeHeight> Octree;
typedef typename FOctree<ParticuleClass, CellClass,LeafClass, OctreeHeight, SubtreeHeight>::Iterator FOctreeIterator;
......@@ -42,17 +42,17 @@ public:
* @param inKernels the kernels to call
* An assert is launched if one of the arguments is null
*/
FFMMAlgorithm(Octree* const inTree, KernelClass<ParticuleClass,CellClass,OctreeHeight>* const inKernels)
FFmmAlgorithm(Octree* const inTree, KernelClass<ParticuleClass,CellClass,OctreeHeight>* const inKernels)
: tree(inTree) , kernels(inKernels) {
assert(tree, "tree cannot be null", __LINE__, __FILE__);
assert(kernels, "kernels cannot be null", __LINE__, __FILE__);
FDEBUG(FDebug::Controller << "FFMMAlgorithm\n");
FDEBUG(FDebug::Controller << "FFmmAlgorithm\n");
}
/** Default destructor */
virtual ~FFMMAlgorithm(){
virtual ~FFmmAlgorithm(){
}
/**
......
......@@ -15,7 +15,7 @@
/**
* @author Berenger Bramas (berenger.bramas@inria.fr)
* @class FFMMAlgorithmArray
* @class FFmmAlgorithmArray
* @brief
* Please read the license
*
......@@ -33,7 +33,7 @@ template<template< class ParticuleClass, class CellClass, int OctreeHeight> clas
class ParticuleClass, class CellClass,
template<class ParticuleClass> class LeafClass,
int OctreeHeight, int SubtreeHeight>
class FFMMAlgorithmArray : protected FAssertable{
class FFmmAlgorithmArray : protected FAssertable{
// To reduce the size of variable type based on foctree in this file
typedef FOctree<ParticuleClass, CellClass, LeafClass, OctreeHeight, SubtreeHeight> Octree;
typedef typename FOctree<ParticuleClass, CellClass,LeafClass, OctreeHeight, SubtreeHeight>::Iterator OctreeIterator;
......@@ -53,7 +53,7 @@ public:
* @param inKernels the kernels to call
* An assert is launched if one of the arguments is null
*/
FFMMAlgorithmArray(Octree* const inTree, Kernel* const inKernels)
FFmmAlgorithmArray(Octree* const inTree, Kernel* const inKernels)
: tree(inTree) , iterArray(0) {
assert(tree, "tree cannot be null", __LINE__, __FILE__);
......@@ -63,11 +63,11 @@ public:
this->kernels[idxThread] = new KernelClass<ParticuleClass, CellClass, OctreeHeight>(*inKernels);
}
FDEBUG(FDebug::Controller << "FFMMAlgorithmArray\n");
FDEBUG(FDebug::Controller << "FFmmAlgorithmArray\n");
}
/** Default destructor */
virtual ~FFMMAlgorithmArray(){
virtual ~FFmmAlgorithmArray(){
for(int idxThread = 0 ; idxThread < FThreadNumbers ; ++idxThread){
delete this->kernels[idxThread];
}
......
......@@ -13,7 +13,7 @@
/**
* @author Berenger Bramas (berenger.bramas@inria.fr)
* @class FFMMAlgorithmTask
* @class FFmmAlgorithmTask
* @brief
* Please read the license
*
......@@ -29,7 +29,7 @@ template<template< class ParticuleClass, class CellClass, int OctreeHeight> clas
class ParticuleClass, class CellClass,
template<class ParticuleClass> class LeafClass,
int OctreeHeight, int SubtreeHeight>
class FFMMAlgorithmTask : protected FAssertable{
class FFmmAlgorithmTask : protected FAssertable{
// To reduce the size of variable type based on foctree in this file
typedef FOctree<ParticuleClass, CellClass, LeafClass, OctreeHeight, SubtreeHeight> Octree;
typedef typename FOctree<ParticuleClass, CellClass,LeafClass, OctreeHeight, SubtreeHeight>::Iterator FOctreeIterator;
......@@ -45,7 +45,7 @@ public:
* @param inKernels the kernels to call
* An assert is launched if one of the arguments is null
*/
FFMMAlgorithmTask(Octree* const inTree, KernelClass<ParticuleClass,CellClass,OctreeHeight>* const inKernels)
FFmmAlgorithmTask(Octree* const inTree, KernelClass<ParticuleClass,CellClass,OctreeHeight>* const inKernels)
: tree(inTree) {
assert(tree, "tree cannot be null", __LINE__, __FILE__);
......@@ -55,11 +55,11 @@ public:
this->kernels[idxThread] = new KernelClass<ParticuleClass, CellClass, OctreeHeight>(*inKernels);
}
FDEBUG(FDebug::Controller << "FFMMAlgorithmTask\n");
FDEBUG(FDebug::Controller << "FFmmAlgorithmTask\n");
}
/** Default destructor */
virtual ~FFMMAlgorithmTask(){
virtual ~FFmmAlgorithmTask(){
for(int idxThread = 0 ; idxThread < FThreadNumbers ; ++idxThread){
delete this->kernels[idxThread];
}
......
......@@ -15,7 +15,7 @@
/**
* @author Berenger Bramas (berenger.bramas@inria.fr)
* @class FFMMAlgorithmThreaded
* @class FFmmAlgorithmThreaded
* @brief
* Please read the license
* This is a threaded FMM Algorithm
......@@ -28,7 +28,7 @@ template<template< class ParticuleClass, class CellClass, int OctreeHeight> clas
class ParticuleClass, class CellClass,
template<class ParticuleClass> class LeafClass,
int OctreeHeight, int SubtreeHeight>
class FFMMAlgorithmThreaded : protected FAssertable{
class FFmmAlgorithmThreaded : protected FAssertable{
// To reduce the size of variable type based on foctree in this file
typedef FOctree<ParticuleClass, CellClass, LeafClass, OctreeHeight, SubtreeHeight> Octree;
typedef typename FOctree<ParticuleClass, CellClass, LeafClass, OctreeHeight, SubtreeHeight>::Iterator FOctreeIterator;
......@@ -44,7 +44,7 @@ public:
* @param inKernels the kernels
* an assert is launched if one of the arguments is null
*/
FFMMAlgorithmThreaded(Octree* const inTree,
FFmmAlgorithmThreaded(Octree* const inTree,
KernelClass<ParticuleClass, CellClass, OctreeHeight>* const inKernels)
: tree(inTree) {
......@@ -55,11 +55,11 @@ public:
this->kernels[idxThread] = new KernelClass<ParticuleClass, CellClass, OctreeHeight>(*inKernels);
}
FDEBUG(FDebug::Controller << "FFMMAlgorithmThreaded\n" );
FDEBUG(FDebug::Controller << "FFmmAlgorithmThreaded\n" );
}
/** Default destructor */
virtual ~FFMMAlgorithmThreaded(){
virtual ~FFmmAlgorithmThreaded(){
for(int idxThread = 0 ; idxThread < FThreadNumbers ; ++idxThread){
delete this->kernels[idxThread];
}
......
......@@ -12,7 +12,7 @@
/**
* @author Berenger Bramas (berenger.bramas@inria.fr)
* @class FFMMAlgorithmToS
* @class FFmmAlgorithmToS
* @brief
* Please read the license
*
......@@ -25,7 +25,7 @@ template<template< class ParticuleClass, class CellClass, int OctreeHeight> clas
class ParticuleClass, class CellClass,
template<class ParticuleClass> class LeafClass,
int OctreeHeight, int SubtreeHeight>
class FFMMAlgorithmToS : protected FAssertable{
class FFmmAlgorithmToS : protected FAssertable{
// To reduce the size of variable type based on foctree in this file
typedef FOctree<ParticuleClass, CellClass, LeafClass, OctreeHeight, SubtreeHeight> Octree;
typedef typename FOctree<ParticuleClass, CellClass,LeafClass, OctreeHeight, SubtreeHeight>::Iterator FOctreeIterator;
......@@ -42,17 +42,17 @@ public:
* @param inKernels the kernels to call
* An assert is launched if one of the arguments is null
*/
FFMMAlgorithmToS(Octree* const inTree, KernelClass<ParticuleClass,CellClass,OctreeHeight>* const inKernels)
FFmmAlgorithmToS(Octree* const inTree, KernelClass<ParticuleClass,CellClass,OctreeHeight>* const inKernels)
: tree(inTree) , kernels(inKernels) {
assert(tree, "tree cannot be null", __LINE__, __FILE__);
assert(kernels, "kernels cannot be null", __LINE__, __FILE__);
FDEBUG(FDebug::Controller << "FFMMAlgorithmToS\n");
FDEBUG(FDebug::Controller << "FFmmAlgorithmToS\n");
}
/** Default destructor */
virtual ~FFMMAlgorithmToS(){
virtual ~FFmmAlgorithmToS(){
}
/**
......
......@@ -3,7 +3,7 @@
// /!\ Please, you must read the license at the bottom of this page
#include "../Utils/FGlobal.hpp"
#include "../Core/FAbstractKernels.hpp"
#include "../Components/FAbstractKernels.hpp"
#include "../Containers/FTreeCoordinate.hpp"
#include "../Containers/FList.hpp"
......
......@@ -10,19 +10,19 @@
#include "../Sources/Containers/FOctree.hpp"
#include "../Sources/Containers/FList.hpp"
#include "../Sources/Core/FFmaParticule.hpp"
#include "../Sources/Components/FFmaParticule.hpp"
#include "../Sources/Extenssions/FExtendForces.hpp"
#include "../Sources/Extenssions/FExtendPotential.hpp"
#include "../Sources/Core/FBasicCell.hpp"
#include "../Sources/Components/FBasicCell.hpp"
#include "../Sources/Fmb/FExtendFmbCell.hpp"
#include "../Sources/Core/FFMMAlgorithm.hpp"
#include "../Sources/Core/FFMMAlgorithmArray.hpp"
#include "../Sources/Core/FFMMAlgorithmThreaded.hpp"
#include "../Sources/Core/FFMMAlgorithmTask.hpp"
#include "../Sources/Core/FFmmAlgorithm.hpp"
#include "../Sources/Core/FFmmAlgorithmArray.hpp"
#include "../Sources/Core/FFmmAlgorithmThreaded.hpp"
#include "../Sources/Core/FFmmAlgorithmTask.hpp"
#include "../Sources/Core/FSimpleLeaf.hpp"
#include "../Sources/Components/FSimpleLeaf.hpp"
#include "../Sources/Fmb/FFmbKernelsPotentialForces.hpp"
#include "../Sources/Fmb/FFmbKernelsForces.hpp"
......@@ -119,7 +119,7 @@ int main(int argc, char ** argv){
//FFmbKernelsPotentialForces FFmbKernelsForces FFmbKernelsPotential
FFmbKernelsPotentialForces<FmbParticule, FmbCell, NbLevels> kernels(loader.getBoxWidth());
//FFMMAlgorithm FFMMAlgorithmThreaded FFMMAlgorithmArray FFMMAlgorithmTask
FFMMAlgorithm<FFmbKernelsPotentialForces, FmbParticule, FmbCell, FSimpleLeaf, NbLevels, SizeSubLevels> algo(&tree,&kernels);
FFmmAlgorithm<FFmbKernelsPotentialForces, FmbParticule, FmbCell, FSimpleLeaf, NbLevels, SizeSubLevels> algo(&tree,&kernels);
algo.execute();
counter.tac();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment