Commit da14a1b2 authored by berenger-bramas's avatar berenger-bramas

The new kernel now compile (even if it does not work yet).

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/scalfmm/scalfmm/trunk@294 2616d619-271b-44dc-8df4-d4a8f33a7222
parent 45b9d50e
......@@ -203,7 +203,7 @@ public:
}
/** Set the data */
void setData(const T& inData){
void setData(const Object& inData){
(*iter)->target = inData;
}
......
This diff is collapsed.
This diff is collapsed.
......@@ -19,6 +19,9 @@
#include "../Src/Files/FFmaLoader.hpp"
#include "../Src/Kernels/FElecForcesKernels.hpp"
// With openmp : g++ testFmbAlgorithm.cpp ../Src/Utils/FDebug.cpp ../Src/Utils/FTrace.cpp -lgomp -fopenmp -O2 -o testFmbAlgorithm.exe
// icpc -openmp -openmp-lib=compat testFmbAlgorithm.cpp ../Src/Utils/FAssertable.cpp ../Src/Utils/FDebug.cpp -O2 -o testFmbAlgorithm.exe
......@@ -37,7 +40,8 @@ int main(int argc, char ** argv){
typedef FSimpleLeaf<ParticleClass, ContainerClass > LeafClass;
typedef FOctree<ParticleClass, CellClass, ContainerClass , LeafClass > OctreeClass;
typedef FFmbKernels<ParticleClass, CellClass, ContainerClass > KernelClass;
//typedef FFmbKernels<ParticleClass, CellClass, ContainerClass > KernelClass;
typedef FElecForcesKernels<ParticleClass, CellClass, ContainerClass > KernelClass;
typedef FFmmAlgorithm<OctreeClass, ParticleClass, CellClass, ContainerClass, KernelClass, LeafClass > FmmClass;
///////////////////////What we do/////////////////////////////
......@@ -92,7 +96,8 @@ int main(int argc, char ** argv){
std::cout << "Working on particles ..." << std::endl;
counter.tic();
KernelClass kernels(NbLevels,loader.getBoxWidth());
//KernelClass kernels(NbLevels,loader.getBoxWidth());
KernelClass kernels(6,NbLevels,loader.getBoxWidth());
FmmClass algo(&tree,&kernels);
algo.execute();
......
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