Commit 3f245cb1 authored by PIACIBELLO Cyrille's avatar PIACIBELLO Cyrille

Needed changes for path in include files have been applied

parent a6767187
......@@ -146,8 +146,9 @@ typedef void (*Callback_free_cell)(void*);
* @brief Callback used to know the size of userData.
* @param level current level of current cell
* @param morton_index of the current cell
* @param userData : ptr to user's kernel
*/
typedef FSize (*Callback_get_cell_size)(int level, long long morton_index);
typedef FSize (*Callback_get_cell_size)(int level, long long morton_index, void * userData);
/**
* @brief Callback used to serialize userdata inside an array of size
......
......@@ -11,17 +11,21 @@
#include "Utils/FMpi.hpp"
#include "FUserKernelEngine.hpp"
#include "BalanceTree/FLeafBalance.hpp"
#include "Utils/FLeafBalance.hpp"
#include "Files/FMpiTreeBuilder.hpp"
#include "Containers/FVector.hpp"
#include "Core/FFmmAlgorithmThreadProc.hpp"
class CoreCellDist : public CoreCell, public FAbstractSendable{
int level;
void * userKernelData;
public:
CoreCellDist() : level(-1){
CoreCellDist() : level(-1),userKernelData(nullptr){
}
void init_UserKernelData(void * in){
this->userKernelData = in;
}
/**
......@@ -32,7 +36,7 @@ public:
FBasicCell::save<BufferWriterClass>(buffer);
buffer << level;
if(user_cell_descriptor.user_get_size){
FSize sizeToSave = user_cell_descriptor.user_get_size(level,getMortonIndex());
FSize sizeToSave = user_cell_descriptor.user_get_size(level,getMortonIndex(),userKernelData);
char * temp = new char[sizeToSave];
user_cell_descriptor.user_copy_cell(CoreCell::getContainer(),sizeToSave,(void *) temp);
buffer.write(temp,sizeToSave);
......@@ -48,7 +52,7 @@ public:
FBasicCell::restore<BufferReaderClass>(buffer);
buffer >> level;
if(user_cell_descriptor.user_restore_cell){
FSize sizeToSave = user_cell_descriptor.user_get_size(level,getMortonIndex());
FSize sizeToSave = user_cell_descriptor.user_get_size(level,getMortonIndex(),userKernelData);
char * temp = new char[sizeToSave];
buffer.fillArray(temp,sizeToSave);
CoreCell::setContainer(user_cell_descriptor.user_restore_cell(level,temp));
......@@ -61,7 +65,7 @@ public:
*/
template <class BufferWriterClass>
void serializeUp(BufferWriterClass& buffer) const {
FSize sizeToSave = user_cell_descriptor.user_get_size(level,getMortonIndex());
FSize sizeToSave = user_cell_descriptor.user_get_size(level,getMortonIndex(),userKernelData);
char * temp = new char[sizeToSave];
user_cell_descriptor.user_copy_cell(CoreCell::getContainer(),sizeToSave,(void *) temp);
buffer.write(temp,sizeToSave);
......@@ -69,7 +73,7 @@ public:
}
template <class BufferWriterClass>
void serializeDown(BufferWriterClass& buffer) const {
FSize sizeToSave = user_cell_descriptor.user_get_size(level,getMortonIndex());
FSize sizeToSave = user_cell_descriptor.user_get_size(level,getMortonIndex(),userKernelData);
char * temp = new char[sizeToSave];
user_cell_descriptor.user_copy_cell(CoreCell::getContainer(),sizeToSave,(void *) temp);
buffer.write(temp,sizeToSave);
......@@ -77,7 +81,7 @@ public:
}
template <class BufferReaderClass>
void deserializeUp(BufferReaderClass& buffer) const {
FSize sizeToSave = user_cell_descriptor.user_get_size(level,getMortonIndex());
FSize sizeToSave = user_cell_descriptor.user_get_size(level,getMortonIndex(),userKernelData);
char * temp = new char[sizeToSave];
buffer.fillArray(temp,sizeToSave);
CoreCell::setContainer(user_cell_descriptor.user_restore_cell(level,temp));
......@@ -86,7 +90,7 @@ public:
}
template <class BufferReaderClass>
void deserializeDown(BufferReaderClass& buffer) const {
FSize sizeToSave = user_cell_descriptor.user_get_size(level,getMortonIndex());
FSize sizeToSave = user_cell_descriptor.user_get_size(level,getMortonIndex(),userKernelData);
char * temp = new char[sizeToSave];
buffer.fillArray(temp,sizeToSave);
CoreCell::setContainer(user_cell_descriptor.user_restore_cell(level,temp));
......@@ -99,7 +103,8 @@ public:
*/
FSize getSavedSize() const {
FSize toReturn = user_cell_descriptor.user_get_size(level,
getMortonIndex())
getMortonIndex(),
userKernelData)
+ FBasicCell::getSavedSize() //Size of storage needed for Basic Cell
+ sizeof(int) //Size of storage needed for this class
+ sizeof(nullptr); //Size of storage needed for the parent class
......@@ -107,12 +112,14 @@ public:
}
FSize getSavedSizeUp() const{
FSize toReturn = user_cell_descriptor.user_get_size(level,
getMortonIndex());
getMortonIndex(),
userKernelData);
return toReturn;
}
FSize getSavedSizeDown() const{
FSize toReturn = user_cell_descriptor.user_get_size(level,
getMortonIndex());
getMortonIndex(),
userKernelData);
return toReturn;
}
};
......@@ -451,6 +458,10 @@ public:
Parent::boxWidthAtLeafLevel = BoxWidth/(2<<TreeHeight);
printf("Tree Height : %d \n",TreeHeight);
octreeDist = new OctreeClass(TreeHeight,FMath::Min(3,TreeHeight-1),BoxWidth,FPoint<FReal>(BoxCenter));
//There : for each cell, set a ptr to UserkernelData
octreeDist->forEachCell([&](CoreCellDist * currCell){
currCell->init_UserKernelData(Parent::getKernelPtr()->getUserKernelDatas());
});
}
void user_kernel_config( Scalfmm_Kernel_Descriptor userKernel, void * userDatas){
......
......@@ -324,9 +324,6 @@ protected:
OctreeClass* getTree() const {
return octree;
}
CoreKernelClass * getKernelPtr() const {
return kernel;
}
public:
......@@ -353,6 +350,10 @@ public:
}
}
CoreKernelClass * getKernelPtr() {
return kernel;
}
virtual void user_kernel_config( Scalfmm_Kernel_Descriptor userKernel, void * userDatas){
if(!kernel){
kernel = new CoreKernelClass(userKernel,userDatas);
......
......@@ -105,7 +105,7 @@ void cheb_resetCell(int level, long long morton_index, int* tree_position,
* @brief Following functions are defined in order to serialize the
* cells
*/
FSize cheb_get_size(int level, long long morton_index){
FSize cheb_get_size(int level, long long morton_index, void * userData){
return ChebCell_getSize(level,morton_index);
}
......
......@@ -38,7 +38,7 @@
#include "Files/FMpiFmaGenericLoader.hpp"
#include "Files/FMpiTreeBuilder.hpp"
#include "BalanceTree/FLeafBalance.hpp"
#include "Utils/FLeafBalance.hpp"
#include "Kernels/Interpolation/FInterpMatrixKernel.hpp"
#include "Kernels/Chebyshev/FChebSymKernel.hpp"
......@@ -99,7 +99,7 @@ int main(int argc, char* argv[])
FMpi app(argc,argv);
#ifdef SCALFMM_USE_EZTRACE
eztrace_pause();
#endif
#endif
//
// Initialize timer
FTic time;
......
......@@ -38,7 +38,7 @@
#include "Files/FMpiSplitFmaLoader.hpp"
#include "Files/FMpiTreeBuilder.hpp"
#include "BalanceTree/FLeafBalance.hpp"
#include "Utils/FLeafBalance.hpp"
#include "Kernels/Interpolation/FInterpMatrixKernel.hpp"
#include "Kernels/Chebyshev/FChebSymKernel.hpp"
......@@ -158,7 +158,7 @@ int main(int argc, char* argv[])
double minTime,maxTime;
std::cout << "Proc:" << app.global().processId()
<< " " << loader.getMyNumberOfParticles()
<< "particles have been inserted in the tree. (@Reading and Inserting Particles = "
<< "particles have been inserted in the tree. (@Reading and Inserting Particles = "
<< time.elapsed() << " s)."
<< std::endl;
......@@ -191,7 +191,7 @@ int main(int argc, char* argv[])
MPI_Reduce(&timeUsed,&maxTime,1,MPI_DOUBLE,MPI_MAX,0,app.global().getComm());
if(app.global().processId() == 0){
std::cout << "exec-time-min:" << minTime
<< " exec-time-max:" << maxTime
<< " exec-time-max:" << maxTime
<< std::endl;
}
......
......@@ -37,7 +37,7 @@
#include "Files/FMpiFmaGenericLoader.hpp"
#include "Files/FMpiTreeBuilder.hpp"
#include "BalanceTree/FLeafBalance.hpp"
#include "Utils/FLeafBalance.hpp"
#include "Kernels/Rotation/FRotationKernel.hpp"
#include "Kernels/Rotation/FRotationCell.hpp"
......@@ -93,9 +93,9 @@ int main(int argc, char* argv[])
std::cout << "\n>> Sequential version.\n" << std::endl;
#endif
//
std::cout << "Parameters "<< std::endl
std::cout << "Parameters "<< std::endl
<< " Octree Depth "<< TreeHeight <<std::endl
<< " SubOctree depth "<< SubTreeHeight <<std::endl
<< " SubOctree depth "<< SubTreeHeight <<std::endl
<< " Input file name: " <<filename <<std::endl
<< " Thread number: " << NbThreads <<std::endl
<<std::endl;
......@@ -152,7 +152,7 @@ int main(int argc, char* argv[])
//idx (in file) of the first part that will be used by this proc.
FSize idxStart = loader->getStart();
for(FSize idxPart = 0 ; idxPart < loader->getMyNumberOfParticles() ; ++idxPart){
//Storage of the index (in the original file) of each part.
particles[idxPart].indexInFile = idxPart + idxStart;
......
......@@ -30,8 +30,8 @@
#include "../Containers/FVector.hpp"
#include "../BalanceTree/FLeafBalance.hpp"
#include "../BalanceTree/FEqualize.hpp"
#include "../Utils/FLeafBalance.hpp"
#include "../Utils/FEqualize.hpp"
#include "../Containers/FCoordinateComputer.hpp"
......@@ -432,7 +432,7 @@ public:
// Ask the packs to receive to fill my objective
FLOG(if(VerboseLog) FLog::Controller << "SCALFMM-DEBUG [" << communicator.processId() << "] Get my receive interval \n"; FLog::Controller.flush(); );
std::pair<size_t, size_t> myObjective = allObjectives[myRank];
const std::vector<FEqualize::Package> packsToRecv = FEqualize::GetPackToRecv(myObjective, allCurrentIntervals);
const std::vector<FEqualize::Package> packsToRecv = FEqualize::GetPackToRecv(myObjective, allCurrentIntervals);
FLOG(if(VerboseLog) FLog::Controller << "SCALFMM-DEBUG [" << communicator.processId() << "] recv nb particles \n"; FLog::Controller.flush(); );
// Count the number of parts to receive
......
......@@ -51,7 +51,7 @@
#include "../../Src/Core/FFmmAlgorithmThread.hpp"
#include "../../Src/Core/FFmmAlgorithmThreadProc.hpp"
#include "../../Src/BalanceTree/FLeafBalance.hpp"
#include "../../Src/Utils/FLeafBalance.hpp"
#include "../../Src/Utils/FParameterNames.hpp"
......
......@@ -54,7 +54,7 @@
#include "../../Src/Core/FFmmAlgorithmThread.hpp"
#include "../../Src/Core/FFmmAlgorithmThreadProc.hpp"
#include "../../Src/BalanceTree/FLeafBalance.hpp"
#include "../../Src/Utils/FLeafBalance.hpp"
#include "../../Src/Utils/FParameterNames.hpp"
......@@ -80,12 +80,12 @@ int main(int argc, char* argv[])
// typedef FRotationKernel<FReal,CellClass,ContainerClass,ORDER> KernelClass;
typedef FInterpMatrixKernelR<FReal> MatrixKernelClass;
typedef FUnifCell<FReal,ORDER> CellClass;
typedef FUnifKernel<FReal,CellClass,ContainerClass,MatrixKernelClass,ORDER> KernelClass;
typedef FInterpMatrixKernelR<FReal> MatrixKernelClass;
typedef FUnifCell<FReal,ORDER> CellClass;
typedef FUnifKernel<FReal,CellClass,ContainerClass,MatrixKernelClass,ORDER> KernelClass;
typedef FOctree<FReal,CellClass,ContainerClass,LeafClass> OctreeClass;
typedef FFmmAlgorithmThreadProc<OctreeClass,CellClass,ContainerClass,KernelClass,LeafClass> FmmClass;
typedef FOctree<FReal,CellClass,ContainerClass,LeafClass> OctreeClass;
typedef FFmmAlgorithmThreadProc<OctreeClass,CellClass,ContainerClass,KernelClass,LeafClass> FmmClass;
FMpi app(argc,argv);
......@@ -169,4 +169,3 @@ int main(int argc, char* argv[])
return 0;
}
......@@ -47,7 +47,7 @@
#include "../../Src/Core/FFmmAlgorithmThread.hpp"
#include "../../Src/Core/FFmmAlgorithmThreadProc.hpp"
#include "../../Src/BalanceTree/FLeafBalance.hpp"
#include "../../Src/Utils/FLeafBalance.hpp"
#include "../../Src/Utils/FParameterNames.hpp"
......@@ -163,4 +163,3 @@ int main(int argc, char* argv[])
return 0;
}
......@@ -45,7 +45,7 @@
#include "../../Src/Files/FMpiFmaGenericLoader.hpp"
#include "../../Src/Files/FMpiTreeBuilder.hpp"
#include "../../Src/BalanceTree/FLeafBalance.hpp"
#include "../../Src/Utils/FLeafBalance.hpp"
#include "../../Src/Utils/FParameterNames.hpp"
......@@ -297,9 +297,9 @@ int main(int argc, char ** argv){
FVector<TestParticle> finalParticles;
FLeafBalance balancer;
// FMpiTreeBuilder< FReal,TestParticle >::ArrayToTree(app.global(), particles, loader.getNumberOfParticles(),
// tree.getBoxCenter(),
// tree.getBoxWidth(),
// tree.getHeight(), &finalParticles,&balancer);
// tree.getBoxCenter(),
// tree.getBoxWidth(),
// tree.getHeight(), &finalParticles,&balancer);
FMpiTreeBuilder< FReal,TestParticle >::DistributeArrayToContainer(app.global(),particles,
loader.getMyNumberOfParticles(),
tree.getBoxCenter(),
......@@ -433,6 +433,3 @@ int main(int argc, char ** argv){
return 0;
}
......@@ -56,7 +56,7 @@
#include "../../Src/Core/FFmmAlgorithmThread.hpp"
#include "../../Src/Core/FFmmAlgorithmThreadProc.hpp"
#include "../../Src/BalanceTree/FLeafBalance.hpp"
#include "../../Src/Utils/FLeafBalance.hpp"
#include "../../Src/Utils/FParameterNames.hpp"
......@@ -102,7 +102,7 @@ int main(int argc, char* argv[])
#else
std::cout << "\n>> Sequential version.\n" << std::endl;
#endif
std::cout << "Opening : " <<filename << "\n" << std::endl;
// init timer
FTic time;
......
......@@ -47,7 +47,7 @@
#include "../../Src/Components/FBasicKernels.hpp"
#include "../../Src/BalanceTree/FLeafBalance.hpp"
#include "../../Src/Utils/FLeafBalance.hpp"
#include "../../Src/Utils/FParameterNames.hpp"
......@@ -475,6 +475,3 @@ int main(int argc, char ** argv){
return 0;
}
......@@ -47,7 +47,7 @@
#include "../../Src/Files/FMpiTreeBuilder.hpp"
#include "../../Src/BalanceTree/FLeafBalance.hpp"
#include "../../Src/Utils/FLeafBalance.hpp"
#include "../../Src/Utils/FParameterNames.hpp"
......@@ -280,6 +280,3 @@ int main(int argc, char ** argv){
return 0;
}
// ===================================================================================
// Copyright ScalFmm 2016 INRIA, Olivier Coulaud, Bérenger Bramas,
// Matthias Messner olivier.coulaud@inria.fr, berenger.bramas@inria.fr
......@@ -48,7 +47,7 @@
#include "../../Src/Components/FBasicKernels.hpp"
#include "../../Src/BalanceTree/FLeafBalance.hpp"
#include "../../Src/Utils/FLeafBalance.hpp"
#include "../../Src/Utils/FParameterNames.hpp"
......@@ -209,6 +208,3 @@ int main(int argc, char ** argv){
return 0;
}
......@@ -45,7 +45,7 @@
#include "../../Src/Files/FMpiFmaGenericLoader.hpp"
#include "../../Src/Files/FMpiTreeBuilder.hpp"
#include "BalanceTree/FLeafBalance.hpp"
#include "Utils/FLeafBalance.hpp"
#include "../../Src/Utils/FParameterNames.hpp"
......
......@@ -44,7 +44,7 @@
#include "../../Src/Components/FBasicParticleContainer.hpp"
#include "../../Src/BalanceTree/FLeafBalance.hpp"
#include "../../Src/Utils/FLeafBalance.hpp"
#include "../../Src/Utils/FParameterNames.hpp"
......@@ -136,8 +136,8 @@ int main(int argc, char ** argv){
FVector<TestParticle<FReal>> finalParticles;
FLeafBalance balancer;
// FMpiTreeBuilder< FReal,TestParticle<FReal> >::ArrayToTree(app.global(), particles, NbPart,
// FPoint<FReal>(BoxCenter,BoxCenter,BoxCenter),
// BoxWidth, tree.getHeight(), &finalParticles,&balancer);
// FPoint<FReal>(BoxCenter,BoxCenter,BoxCenter),
// BoxWidth, tree.getHeight(), &finalParticles,&balancer);
FMpiTreeBuilder< FReal,TestParticle<FReal> >::DistributeArrayToContainer(app.global(),particles,
NbPart,
FPoint<FReal>(BoxCenter,BoxCenter,BoxCenter),
......@@ -278,6 +278,3 @@ int main(int argc, char ** argv){
return 0;
}
......@@ -36,7 +36,7 @@
#include "../../Src/Utils/FParameters.hpp"
#include "../../Src/Utils/FMemUtils.hpp"
#include "../../Src/BalanceTree/FPartitionsMapping.hpp"
#include "../../Src/Utils/FPartitionsMapping.hpp"
#include "../../Src/Containers/FOctree.hpp"
#include "../../Src/Containers/FVector.hpp"
......@@ -48,7 +48,7 @@
#include "../../Src/Core/FFmmAlgorithmThread.hpp"
#include "../../Src/Core/FFmmAlgorithmThreadProc.hpp"
#include "../../Src/BalanceTree/FLeafBalance.hpp"
#include "../../Src/Utils/FLeafBalance.hpp"
#include "../../Src/Utils/FParameterNames.hpp"
......@@ -150,4 +150,3 @@ int main(int argc, char* argv[])
return 0;
}
......@@ -47,7 +47,7 @@
#include "../../Src/Kernels/Rotation/FRotationKernel.hpp"
#include "../../Src/Kernels/Rotation/FRotationCell.hpp"
#include "../Src/BalanceTree/FLeafBalance.hpp"
#include "../Src/Utils/FLeafBalance.hpp"
#include "../Src/Containers/FTreeCoordinate.hpp"
#include "../../Src/Files/FMpiFmaGenericLoader.hpp"
#include "../../Src/Files/FMpiTreeBuilder.hpp"
......
......@@ -47,7 +47,7 @@
#include "../../Src/Core/FFmmAlgorithmThread.hpp"
#include "../../Src/Core/FFmmAlgorithmThreadProc.hpp"
#include "../../Src/BalanceTree/FLeafBalance.hpp"
#include "../../Src/Utils/FLeafBalance.hpp"
#include "../../Src/Utils/FParameterNames.hpp"
......@@ -152,5 +152,3 @@ int main(int argc, char* argv[])
return 0;
}
......@@ -50,7 +50,7 @@
#include "../../Src/Files/FMpiTreeBuilder.hpp"
#include "../../Src/Files/FTreeBuilder.hpp"
#include "../../Src/BalanceTree/FLeafBalance.hpp"
#include "../../Src/Utils/FLeafBalance.hpp"
#include "../../Src/Utils/FParameterNames.hpp"
......@@ -135,9 +135,9 @@ int main(int argc, char ** argv){
FVector<TestParticle> finalParticles;
FLeafBalance balancer;
// FMpiTreeBuilder< FReal,TestParticle >::ArrayToTree(app.global(), particles, loader.getNumberOfParticles(),
// tree.getBoxCenter(),
// tree.getBoxWidth(),
// tree.getHeight(), &finalParticles,&balancer);
// tree.getBoxCenter(),
// tree.getBoxWidth(),
// tree.getHeight(), &finalParticles,&balancer);
FMpiTreeBuilder< FReal,TestParticle >::DistributeArrayToContainer(app.global(),particles,
loader.getMyNumberOfParticles(),
tree.getBoxCenter(),
......
......@@ -49,7 +49,7 @@
#include "../../Src/Files/FMpiFmaGenericLoader.hpp"
#include "../../Src/Files/FMpiTreeBuilder.hpp"
#include "../../Src/BalanceTree/FLeafBalance.hpp"
#include "../../Src/Utils/FLeafBalance.hpp"
#include "../../Src/Utils/FParameterNames.hpp"
......@@ -134,9 +134,9 @@ int main(int argc, char ** argv){
FVector<TestParticle> finalParticles;
FLeafBalance balancer;
// FMpiTreeBuilder< FReal,TestParticle >::ArrayToTree(app.global(), particles, loader.getNumberOfParticles(),
// tree.getBoxCenter(),
// tree.getBoxWidth(),
// tree.getHeight(), &finalParticles,&balancer);
// tree.getBoxCenter(),
// tree.getBoxWidth(),
// tree.getHeight(), &finalParticles,&balancer);
FMpiTreeBuilder< FReal,TestParticle >::DistributeArrayToContainer(app.global(),particles,
loader.getMyNumberOfParticles(),
tree.getBoxCenter(),
......
......@@ -34,7 +34,7 @@
#include "Files/FMpiTreeBuilder.hpp"
#include "Core/FFmmAlgorithmThreadProc.hpp"
#include "BalanceTree/FLeafBalance.hpp"
#include "Utils/FLeafBalance.hpp"
#include "FUTester.hpp"
......@@ -79,7 +79,7 @@ class TestChebyshevMpiDirect : public FUTesterMpi<TestChebyshevMpiDirect>{
struct TestParticle : public FmaRWParticle<FReal, 8,8>{
FSize index;
// const FPoint<FReal>& getPosition(){
// return position;
// return position;
// }
};
......@@ -101,9 +101,9 @@ class TestChebyshevMpiDirect : public FUTesterMpi<TestChebyshevMpiDirect>{
FLeafBalance balancer;
OctreeClass tree(nbLevels,sizeOfSubLevel,loader.getBoxWidth(),loader.getCenterOfBox());
// FMpiTreeBuilder< FReal,TestParticle >::ArrayToTree(app.global(), particles, loader.getMyNumberOfParticles(),
// tree.getBoxCenter(),
// tree.getBoxWidth(),
// tree.getHeight(), &finalParticles,&balancer);
// tree.getBoxCenter(),
// tree.getBoxWidth(),
// tree.getHeight(), &finalParticles,&balancer);
FMpiTreeBuilder< FReal,TestParticle >::DistributeArrayToContainer(app.global(),particles,
loader.getMyNumberOfParticles(),
tree.getBoxCenter(),
......
......@@ -48,7 +48,7 @@
#include "Components/FBasicKernels.hpp"
#include "BalanceTree/FLeafBalance.hpp"
#include "Utils/FLeafBalance.hpp"
#include <iostream>
#include <cstdio>
......@@ -308,5 +308,3 @@ public:
// You must do this
TestClassMpi(TestFmmAlgoProc)
......@@ -35,7 +35,7 @@
#include "Files/FMpiTreeBuilder.hpp"
#include "Core/FFmmAlgorithmThreadProc.hpp"
#include "BalanceTree/FLeafBalance.hpp"
#include "Utils/FLeafBalance.hpp"
#include "FUTester.hpp"
......@@ -79,7 +79,7 @@ class TestLagrangeMpiDirect : public FUTesterMpi<TestLagrangeMpiDirect>{
struct TestParticle : public FmaRWParticle<FReal, 8,8>{
FSize index;
// const FPoint<FReal>& getPosition(){
// return position;
// return position;
// }
};
......@@ -101,9 +101,9 @@ class TestLagrangeMpiDirect : public FUTesterMpi<TestLagrangeMpiDirect>{
FLeafBalance balancer;
OctreeClass tree(nbLevels,sizeOfSubLevel,loader.getBoxWidth(),loader.getCenterOfBox());
// FMpiTreeBuilder< FReal,TestParticle >::ArrayToTree(app.global(), particles, loader.getMyNumberOfParticles(),
// tree.getBoxCenter(),
// tree.getBoxWidth(),
// tree.getHeight(), &finalParticles,&balancer);
// tree.getBoxCenter(),
// tree.getBoxWidth(),
// tree.getHeight(), &finalParticles,&balancer);
FMpiTreeBuilder< FReal,TestParticle >::DistributeArrayToContainer(app.global(),particles,
loader.getMyNumberOfParticles(),
tree.getBoxCenter(),
......
......@@ -36,7 +36,7 @@
#include "Files/FFmaGenericLoader.hpp"
#include "Files/FMpiFmaGenericLoader.hpp"
#include "BalanceTree/FLeafBalance.hpp"
#include "Utils/FLeafBalance.hpp"
#include "Containers/FTreeCoordinate.hpp"
#include "Containers/FCoordinateComputer.hpp"
......
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