diff --git a/Examples/ChebyshevInterpolationFMM.cpp b/Examples/ChebyshevInterpolationFMM.cpp index 25c1515f11e5e2bc2e06d0885d570fc297d738b3..deb55d89f6c7f2a1c5f9b5ff7bd9592a37473f00 100644 --- a/Examples/ChebyshevInterpolationFMM.cpp +++ b/Examples/ChebyshevInterpolationFMM.cpp @@ -150,8 +150,9 @@ int main(int argc, char* argv[]) // KernelClass kernels(TreeHeight, loader.getBoxWidth(), loader.getCenterOfBox(),&MatrixKernel); // - // false : dynamic schedule. - FmmClass algo(&tree, &kernels,true); + // false : dynamic schedule. + int inUserChunckSize = 10 // To specify the chunck size in the loops (-1 is static, 0 is N/p^2, otherwise i) + FmmClass algo(&tree, &kernels, inUserChunckSize); // algo.execute(); // Here the call of the FMM algorithm // diff --git a/NEWS.txt b/NEWS.txt index d471a8f1fa5e8b3a22e860d398cc92f85bba3d75..7126bc6e3e5a6eb4a905e7d573a46c5bd1d0ba0b 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -11,13 +11,13 @@ version 1.1 ----- - The choice of floating point values is done by template (by passing template to all classes) and no more at configure time - There is no more ScalFMM variables and defines but only SCALFMM (all letters in upper case) -- BLAS and FFTW are turned on by default, and the compilation continue even if they are not found - We start to use unique ptr (and advise to use it) in the main files - Add interpolation FMM based on uniform grid points. - Add blocked version of the algorithm to increase the granularity (task-based approach) - Fix bug with Chebyschev kernel and multi RHS. - Improvements in unit tests (works with Linux and MacOs X for intel and gcc) -- +- Use MORSE distribution to detect BLAS, FFTW, .... +- BLAS and FFTW are turned on by default, and the compilation continue even if they are not found 1.2.1 ----- diff --git a/Src/Core/FFmmAlgorithm.hpp b/Src/Core/FFmmAlgorithm.hpp index 4804b459dbdca726f5f8b0133e1acab2af4abba3..3a8fffc259d63a41508f197cc35a60a9599b38a5 100644 --- a/Src/Core/FFmmAlgorithm.hpp +++ b/Src/Core/FFmmAlgorithm.hpp @@ -1,5 +1,5 @@ // =================================================================================== -// Copyright ScalFmm 2011 INRIA, Olivier Coulaud, Bérenger Bramas, Matthias Messner +// Copyright ScalFmm 2011 INRIA, Olivier Coulaud, Berenger Bramas, Matthias Messner // olivier.coulaud@inria.fr, berenger.bramas@inria.fr // This software is a computer program whose purpose is to compute the FMM. // @@ -300,7 +300,7 @@ protected: } while(octreeIterator.moveRight()); - FLOG( FLog::Controller << "\tFinished (@Direct Pass (L2P + P2P) = " << counterTime.tacAndElapsed() << "s)\n" ); + FLOG( FLog::Controller << "\tFinished (@Direct Pass (L2P + P2P) = " << counterTime.tacAndElapsed() << " s)\n" ); FLOG( FLog::Controller << "\t\t Computation L2P : " << computationCounterL2P.cumulated() << " s\n" ); FLOG( FLog::Controller << "\t\t Computation P2P : " << computationCounterP2P.cumulated() << " s\n" );