diff --git a/Src/GroupTree/Core/FGroupTaskStarpuAlgorithm.hpp b/Src/GroupTree/Core/FGroupTaskStarpuAlgorithm.hpp
index 50f952e2a4df55318327a0a53a72d6f136164110..9cb953a846d9e1ad95d80763d0a4a6c93fca1a10 100644
--- a/Src/GroupTree/Core/FGroupTaskStarpuAlgorithm.hpp
+++ b/Src/GroupTree/Core/FGroupTaskStarpuAlgorithm.hpp
@@ -907,7 +907,7 @@ protected:
MortonIndex interactionsIndexes[26];
int interactionsPosition[26];
- FTreeCoordinate coord(mindex, tree->getHeight()-1);
+ FTreeCoordinate coord(mindex);
int counter = coord.getNeighborsIndexes(tree->getHeight(),interactionsIndexes,interactionsPosition);
for(int idxInter = 0 ; idxInter < counter ; ++idxInter){
@@ -995,7 +995,7 @@ protected:
MortonIndex interactionsIndexes[189];
int interactionsPosition[189];
- const FTreeCoordinate coord(mindex, idxLevel);
+ const FTreeCoordinate coord(mindex);
int counter = coord.getInteractionNeighbors(idxLevel,interactionsIndexes,interactionsPosition);
for(int idxInter = 0 ; idxInter < counter ; ++idxInter){
diff --git a/Src/GroupTree/Core/FGroupTaskStarpuMpiAlgorithm.hpp b/Src/GroupTree/Core/FGroupTaskStarpuMpiAlgorithm.hpp
index 889cb80f205f0a5d95de4fcd6f590471e9ce2b79..eae42277ddf8f5edc1ccb1d3f99e2660a268b6af 100644
--- a/Src/GroupTree/Core/FGroupTaskStarpuMpiAlgorithm.hpp
+++ b/Src/GroupTree/Core/FGroupTaskStarpuMpiAlgorithm.hpp
@@ -1679,19 +1679,14 @@ protected:
/////////////////////////////////////////////////////////////////////////////////////
/// Mpi Function overload
/////////////////////////////////////////////////////////////////////////////////////
-#define LIMIT_SIZE_MPI 1000000//1Mo
void mpiPostISend(starpu_data_handle_t handle, const int dest, const int level, const MortonIndex startingIndex, const int idxBlock, const int mode)
{
- size_t size = starpu_data_get_size(handle);
- const size_t limitSize = LIMIT_SIZE_MPI;
starpu_mpi_isend_detached(handle, dest,
getTag(level,startingIndex,idxBlock, mode, dest),
comm.getComm(), 0/*callback*/, 0/*arg*/ );
}
void mpiPostIRecv(starpu_data_handle_t handle, const int dest, const int level, const MortonIndex startingIndex, const int idxBlock, const int mode)
{
- size_t size = starpu_data_get_size(handle);
- const size_t limitSize = LIMIT_SIZE_MPI;
starpu_mpi_irecv_detached(handle, dest,
getTag(level,startingIndex,idxBlock, mode, dest),
comm.getComm(), 0/*callback*/, 0/*arg*/ );
diff --git a/Tests/GroupTree/testBlockedChebyshev.cpp b/Tests/GroupTree/testBlockedChebyshev.cpp
index b92dffe0d2468be2ce422b15fe1a1fe5befb9750..9f066167438a9a48885a8942e1805edafd11c462 100644
--- a/Tests/GroupTree/testBlockedChebyshev.cpp
+++ b/Tests/GroupTree/testBlockedChebyshev.cpp
@@ -103,14 +103,14 @@ int main(int argc, char* argv[]){
setSeed(1);
FReal * tmpParticles = new FReal[4*loader.getNumberOfParticles()];
if(FParameters::existParameter(argc, argv, "-ellipsoid")) {
- nonunifRandonPointsOnElipsoid(loader.getNumberOfParticles(), loader.getBoxWidth()/2, loader.getBoxWidth()/4, loader.getBoxWidth()/8, tmpParticles);
+ nonunifRandomPointsOnElipsoid(loader.getNumberOfParticles(), loader.getBoxWidth()/2, loader.getBoxWidth()/4, loader.getBoxWidth()/8, tmpParticles);
}
else if(FParameters::existParameter(argc, argv, "-plummer")) {
//The M argument is not used in the algorithm of the plummer distribution
- unifRandonPlummer(loader.getNumberOfParticles(), loader.getBoxWidth()/2, 0.0, tmpParticles) ;
+ unifRandomPlummer(loader.getNumberOfParticles(), loader.getBoxWidth()/2, tmpParticles) ;
}
else { //Uniform cube
- unifRandonPointsOnCube(loader.getNumberOfParticles(), loader.getBoxWidth()/2, loader.getBoxWidth()/2, loader.getBoxWidth()/2, tmpParticles);
+ unifRandomPointsInCube(loader.getNumberOfParticles(), loader.getBoxWidth()/2, loader.getBoxWidth()/2, loader.getBoxWidth()/2, tmpParticles);
}
#endif
diff --git a/Tests/GroupTree/testBlockedImplicitChebyshev.cpp b/Tests/GroupTree/testBlockedImplicitChebyshev.cpp
index 9cd93ea360e3f2b68f3b051bb7af5ed9045a8e16..af2e5d6a87131acf409630323813349e746fdfe9 100644
--- a/Tests/GroupTree/testBlockedImplicitChebyshev.cpp
+++ b/Tests/GroupTree/testBlockedImplicitChebyshev.cpp
@@ -120,14 +120,14 @@ int main(int argc, char* argv[]){
setSeed(i+1);//Add +1 so the seed given is never 0 which correspond to random
FReal * tmpParticles = new FReal[4*NbParticlesPerNode];
if(FParameters::existParameter(argc, argv, "-ellipsoid")) {
- nonunifRandonPointsOnElipsoid(NbParticlesPerNode, boxWidth/2, boxWidth/4, boxWidth/8, tmpParticles);
+ nonunifRandomPointsOnElipsoid(NbParticlesPerNode, boxWidth/2, boxWidth/4, boxWidth/8, tmpParticles);
}
else if(FParameters::existParameter(argc, argv, "-plummer")) {
//The M argument is not used in the algorithm of the plummer distribution
- unifRandonPlummer(NbParticlesPerNode, boxWidth/2, 0.0, tmpParticles) ;
+ unifRandomPlummer(NbParticlesPerNode, boxWidth/2, tmpParticles) ;
}
else { //Uniform cube
- unifRandonPointsOnCube(NbParticlesPerNode, boxWidth/2, boxWidth/2, boxWidth/2, tmpParticles);
+ unifRandomPointsInCube(NbParticlesPerNode, boxWidth/2, boxWidth/2, boxWidth/2, tmpParticles);
}
for(FSize j= 0 ; j < NbParticlesPerNode ; ++j){
allParticlesToSort[idxPart].setPosition(tmpParticles[j*4], tmpParticles[j*4+1], tmpParticles[j*4+2]);//Same with file or not
diff --git a/Tests/GroupTree/testBlockedMpiChebyshev.cpp b/Tests/GroupTree/testBlockedMpiChebyshev.cpp
index 1ae69d4c029fcefcc21ce176df91e37344378f10..963a32335015b8efa5013d4bd59c828d5d708510 100644
--- a/Tests/GroupTree/testBlockedMpiChebyshev.cpp
+++ b/Tests/GroupTree/testBlockedMpiChebyshev.cpp
@@ -123,14 +123,13 @@ int main(int argc, char* argv[]){
memset(allParticles,0,(unsigned int) (sizeof(TestParticle)* loader.getNumberOfParticles()));
memset(tmpParticles,0,(unsigned int) (sizeof(FReal)* loader.getNumberOfParticles() * 4));
if(FParameters::existParameter(argc, argv, "-ellipsoid")) {
- nonunifRandonPointsOnElipsoid(loader.getNumberOfParticles(), boxWidth/2, boxWidth/4, boxWidth/8, tmpParticles);
+ nonunifRandomPointsOnElipsoid(loader.getNumberOfParticles(), boxWidth/2, boxWidth/4, boxWidth/8, tmpParticles);
}
else if(FParameters::existParameter(argc, argv, "-plummer")) {
- //The M argument is not used in the algorithm of the plummer distribution
- unifRandonPlummer(loader.getNumberOfParticles(), boxWidth/2, 0.0, tmpParticles) ;
+ unifRandomPlummer(loader.getNumberOfParticles(), boxWidth/2, tmpParticles) ;
}
else { //Uniform cube
- unifRandonPointsOnCube(loader.getNumberOfParticles(), boxWidth/2, boxWidth/2, boxWidth/2, tmpParticles);
+ unifRandomPointsInCube(loader.getNumberOfParticles(), boxWidth/2, boxWidth/2, boxWidth/2, tmpParticles);
}
for(FSize idxPart = 0 ; idxPart < loader.getNumberOfParticles() ; ++idxPart){
diff --git a/Tests/noDist/testFmmAlgorithmThreadProc.cpp b/Tests/noDist/testFmmAlgorithmThreadProc.cpp
index 503f0eff868d6f05e141a8e934a08bedb6200103..339485770d65b4201ae5d6934510a30baa2469a2 100644
--- a/Tests/noDist/testFmmAlgorithmThreadProc.cpp
+++ b/Tests/noDist/testFmmAlgorithmThreadProc.cpp
@@ -99,14 +99,14 @@ int main(int argc, char* argv[]){
memset(allParticles,0,(unsigned int) (sizeof(TestParticle)* loader.getNumberOfParticles()));
memset(tmpParticles,0,(unsigned int) (sizeof(FReal)* loader.getNumberOfParticles() * 4));
if(FParameters::existParameter(argc, argv, "-ellipsoid")) {
- nonunifRandonPointsOnElipsoid(loader.getNumberOfParticles(), boxWidth/2, boxWidth/4, boxWidth/8, tmpParticles);
+ nonunifRandomPointsOnElipsoid(loader.getNumberOfParticles(), boxWidth/2, boxWidth/4, boxWidth/8, tmpParticles);
}
else if(FParameters::existParameter(argc, argv, "-plummer")) {
//The M argument is not used in the algorithm of the plummer distribution
- unifRandonPlummer(loader.getNumberOfParticles(), boxWidth/2, 0.0, tmpParticles) ;
+ unifRandomPlummer(loader.getNumberOfParticles(), boxWidth/2, tmpParticles) ;
}
else { //Uniform cube
- unifRandonPointsOnCube(loader.getNumberOfParticles(), boxWidth/2, boxWidth/2, boxWidth/2, tmpParticles);
+ unifRandomPointsInCube(loader.getNumberOfParticles(), boxWidth/2, boxWidth/2, boxWidth/2, tmpParticles);
}
for(FSize idxPart = 0 ; idxPart < loader.getNumberOfParticles() ; ++idxPart){
@@ -142,7 +142,7 @@ int main(int argc, char* argv[]){
loader.getBoxWidth(),
TreeHeight,
myParticles[myParticles.getSize()-1].position );
- const MortonIndex myLeftLimite = host.getMortonIndex(TreeHeight-1);
+ const MortonIndex myLeftLimite = host.getMortonIndex();
MortonIndex leftLimite = -1;
if(mpiComm.global().processId() != 0){
FMpi::Assert(MPI_Recv(&leftLimite, sizeof(leftLimite), MPI_BYTE,