Commit e973f2ad authored by BRAMAS Berenger's avatar BRAMAS Berenger
Browse files
parents 6df52ff2 8ee7a710
......@@ -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
//
......
......@@ -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
-----
......
// ===================================================================================
// 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" );
......
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