From 5a8bb58cbb59f45113ca9f201a91931b46a210cd Mon Sep 17 00:00:00 2001 From: Berenger Bramas <bbramas@mpcdf.mpg.de> Date: Tue, 13 Sep 2016 10:07:57 +0200 Subject: [PATCH] Update unif test --- Tests/GroupTree/testBlockedImplicitUniform.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Tests/GroupTree/testBlockedImplicitUniform.cpp b/Tests/GroupTree/testBlockedImplicitUniform.cpp index 838e5c541..8143f841b 100644 --- a/Tests/GroupTree/testBlockedImplicitUniform.cpp +++ b/Tests/GroupTree/testBlockedImplicitUniform.cpp @@ -62,7 +62,7 @@ using namespace std; typedef FStarPUCpuWrapper<typename GroupOctreeClass::CellGroupClass, GroupCellClass, GroupKernelClass, typename GroupOctreeClass::ParticleGroupClass, GroupContainerClass> GroupCpuWrapper; typedef FGroupTaskStarPUImplicitAlgorithm<GroupOctreeClass, typename GroupOctreeClass::CellGroupClass, GroupKernelClass, typename GroupOctreeClass::ParticleGroupClass, GroupCpuWrapper > GroupAlgorithm; -#define LOAD_FILE +//#define LOAD_FILE #ifndef LOAD_FILE typedef FRandomLoader<FReal> LoaderClass; #else @@ -144,7 +144,7 @@ int main(int argc, char* argv[]){ GroupOctreeClass groupedTree(NbLevels, loader.getBoxWidth(), loader.getCenterOfBox(), groupSize, &allParticles, sizeForEachGroup, true); // Run the algorithm - int operationsToProceed = FFmmP2P; // | FFmmP2M | FFmmM2M | FFmmM2L | FFmmL2L | FFmmL2P; + int operationsToProceed = FFmmNearAndFarFields;//FFmmP2P; // | FFmmP2M | FFmmM2M | FFmmM2L | FFmmL2L | FFmmL2P; const MatrixKernelClass MatrixKernel; GroupKernelClass groupkernel(NbLevels, loader.getBoxWidth(), loader.getCenterOfBox(), &MatrixKernel); GroupAlgorithm groupalgo(&groupedTree,&groupkernel, distributedMortonIndex); @@ -266,6 +266,7 @@ int main(int argc, char* argv[]){ //std::cout << "Comparing is over" << std::endl; } + std::cout << "Done" << std::endl; return 0; } void timeAverage(int mpi_rank, int nproc, double elapsedTime) -- GitLab