Commit 5a8bb58c authored by Berenger Bramas's avatar Berenger Bramas

Update unif test

parent 9d5a03e4
...@@ -62,7 +62,7 @@ using namespace std; ...@@ -62,7 +62,7 @@ using namespace std;
typedef FStarPUCpuWrapper<typename GroupOctreeClass::CellGroupClass, GroupCellClass, GroupKernelClass, typename GroupOctreeClass::ParticleGroupClass, GroupContainerClass> GroupCpuWrapper; typedef FStarPUCpuWrapper<typename GroupOctreeClass::CellGroupClass, GroupCellClass, GroupKernelClass, typename GroupOctreeClass::ParticleGroupClass, GroupContainerClass> GroupCpuWrapper;
typedef FGroupTaskStarPUImplicitAlgorithm<GroupOctreeClass, typename GroupOctreeClass::CellGroupClass, GroupKernelClass, typename GroupOctreeClass::ParticleGroupClass, GroupCpuWrapper > GroupAlgorithm; typedef FGroupTaskStarPUImplicitAlgorithm<GroupOctreeClass, typename GroupOctreeClass::CellGroupClass, GroupKernelClass, typename GroupOctreeClass::ParticleGroupClass, GroupCpuWrapper > GroupAlgorithm;
#define LOAD_FILE //#define LOAD_FILE
#ifndef LOAD_FILE #ifndef LOAD_FILE
typedef FRandomLoader<FReal> LoaderClass; typedef FRandomLoader<FReal> LoaderClass;
#else #else
...@@ -144,7 +144,7 @@ int main(int argc, char* argv[]){ ...@@ -144,7 +144,7 @@ int main(int argc, char* argv[]){
GroupOctreeClass groupedTree(NbLevels, loader.getBoxWidth(), loader.getCenterOfBox(), groupSize, &allParticles, sizeForEachGroup, true); GroupOctreeClass groupedTree(NbLevels, loader.getBoxWidth(), loader.getCenterOfBox(), groupSize, &allParticles, sizeForEachGroup, true);
// Run the algorithm // Run the algorithm
int operationsToProceed = FFmmP2P; // | FFmmP2M | FFmmM2M | FFmmM2L | FFmmL2L | FFmmL2P; int operationsToProceed = FFmmNearAndFarFields;//FFmmP2P; // | FFmmP2M | FFmmM2M | FFmmM2L | FFmmL2L | FFmmL2P;
const MatrixKernelClass MatrixKernel; const MatrixKernelClass MatrixKernel;
GroupKernelClass groupkernel(NbLevels, loader.getBoxWidth(), loader.getCenterOfBox(), &MatrixKernel); GroupKernelClass groupkernel(NbLevels, loader.getBoxWidth(), loader.getCenterOfBox(), &MatrixKernel);
GroupAlgorithm groupalgo(&groupedTree,&groupkernel, distributedMortonIndex); GroupAlgorithm groupalgo(&groupedTree,&groupkernel, distributedMortonIndex);
...@@ -266,6 +266,7 @@ int main(int argc, char* argv[]){ ...@@ -266,6 +266,7 @@ int main(int argc, char* argv[]){
//std::cout << "Comparing is over" << std::endl; //std::cout << "Comparing is over" << std::endl;
} }
std::cout << "Done" << std::endl;
return 0; return 0;
} }
void timeAverage(int mpi_rank, int nproc, double elapsedTime) void timeAverage(int mpi_rank, int nproc, double elapsedTime)
......
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