diff --git a/CMakeLists.txt b/CMakeLists.txt index e9f804910b340fe2fedb239995320ca6fd889b3e..9fd86f4e3d89738a17a711ccb12737c8b601d0f1 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,7 +57,7 @@ OPTION( ScalFMM_USE_SSE "Set to ON to compile with SSE support" OPTION( ScalFMM_USE_AVX "Set to ON to compile with AVX support" OFF ) OPTION( ScalFMM_USE_ASSERT "Set to ON to enable safe tests during execution" ON ) OPTION( ScalFMM_USE_MIC_NATIVE "Set to ON to compile in native mode for MIC" OFF ) -OPTION( ScalFMM_BUILD_ONLY_LIB "Set to ON to compile ionly the lib (examples are not compiled) " OFF ) +OPTION( ScalFMM_BUILD_ONLY_LIB "Set to ON to compile only the lib (examples are not compiled) " OFF ) # Set scalfmm to default libraries SET(SCALFMM_LIBRARIES "") SET(ScaLFMM_CXX_FLAGS "") diff --git a/UTests/utestChebyshevMpi.cpp b/UTests/utestChebyshevMpi.cpp index 4ef3cf2d1a6ff4f4d523411fd07cf2be02a467de..6d450a8b6eca8ce20591609917abc9ecb8ddc76f 100644 --- a/UTests/utestChebyshevMpi.cpp +++ b/UTests/utestChebyshevMpi.cpp @@ -93,11 +93,15 @@ class TestChebyshevMpiDirect : public FUTesterMpi<TestChebyshevMpiDirect>{ FVector<TestParticle> finalParticles; FLeafBalance balancer; OctreeClass tree(nbLevels,sizeOfSubLevel,loader.getBoxWidth(),loader.getCenterOfBox()); - FMpiTreeBuilder< TestParticle >::ArrayToTree(app.global(), particles, loader.getMyNumberOfParticles(), - tree.getBoxCenter(), - tree.getBoxWidth(), - tree.getHeight(), &finalParticles,&balancer); - + // FMpiTreeBuilder< TestParticle >::ArrayToTree(app.global(), particles, loader.getMyNumberOfParticles(), + // tree.getBoxCenter(), + // tree.getBoxWidth(), + // tree.getHeight(), &finalParticles,&balancer); + FMpiTreeBuilder< TestParticle >::DistributeArrayToContainer(app.global(),particles, + loader.getMyNumberOfParticles(), + tree.getBoxCenter(), + tree.getBoxWidth(),tree.getHeight(), + &finalParticles, &balancer); for(int idx = 0 ; idx < finalParticles.getSize(); ++idx){ tree.insert(finalParticles[idx].position,int(finalParticles[idx].index),finalParticles[idx].physicalValue); }