Mentions légales du service
Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
ScalFMM
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
solverstack
ScalFMM
Commits
e973f2ad
Commit
e973f2ad
authored
10 years ago
by
BRAMAS Berenger
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' of
git+ssh://scm.gforge.inria.fr//gitroot//scalfmm/scalfmm
parents
6df52ff2
8ee7a710
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Examples/ChebyshevInterpolationFMM.cpp
+3
-2
3 additions, 2 deletions
Examples/ChebyshevInterpolationFMM.cpp
NEWS.txt
+2
-2
2 additions, 2 deletions
NEWS.txt
Src/Core/FFmmAlgorithm.hpp
+2
-2
2 additions, 2 deletions
Src/Core/FFmmAlgorithm.hpp
with
7 additions
and
6 deletions
Examples/ChebyshevInterpolationFMM.cpp
+
3
−
2
View file @
e973f2ad
...
...
@@ -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
//
...
...
This diff is collapsed.
Click to expand it.
NEWS.txt
+
2
−
2
View file @
e973f2ad
...
...
@@ -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
-----
...
...
This diff is collapsed.
Click to expand it.
Src/Core/FFmmAlgorithm.hpp
+
2
−
2
View file @
e973f2ad
// ===================================================================================
// Copyright ScalFmm 2011 INRIA, Olivier Coulaud, B
é
renger Bramas, Matthias Messner
// Copyright ScalFmm 2011 INRIA, Olivier Coulaud, B
e
renger 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
<<
"
\t
Finished (@Direct Pass (L2P + P2P) = "
<<
counterTime
.
tacAndElapsed
()
<<
"s)
\n
"
);
FLOG
(
FLog
::
Controller
<<
"
\t
Finished (@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
"
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment