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
179aa70b
Commit
179aa70b
authored
11 years ago
by
Olivier COULAUD
Browse files
Options
Downloads
Patches
Plain Diff
Some improvements
parent
a0162afc
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Examples/statisticsOnOctree.cpp
+1
-1
1 addition, 1 deletion
Examples/statisticsOnOctree.cpp
Src/Kernels/Rotation/FRotationKernel.hpp
+5
-5
5 additions, 5 deletions
Src/Kernels/Rotation/FRotationKernel.hpp
with
6 additions
and
6 deletions
Examples/statisticsOnOctree.cpp
+
1
−
1
View file @
179aa70b
...
@@ -135,7 +135,7 @@ int main(int argc, char ** argv){
...
@@ -135,7 +135,7 @@ int main(int argc, char ** argv){
{
// get stats
{
// get stats
{
// get stats on the leaf level (Particles)
{
// get stats on the leaf level (Particles)
long
int
allLeaves
=
(
1
<<
(
3
*
(
NbLevels
-
1
)
))
;
long
int
allLeaves
=
(
1
<<
(
3
*
(
NbLevels
-
1
)
))
;
std
::
cout
<<
std
::
endl
<<
"[STAT] Leaf level "
<<
" is "
<<
NbLevels
<<
std
::
endl
;
std
::
cout
<<
std
::
endl
<<
"[STAT] Leaf level "
<<
" is "
<<
NbLevels
-
1
<<
std
::
endl
;
std
::
cout
<<
"[STAT] potentials leafs number is "
<<
allLeaves
<<
std
::
endl
;
std
::
cout
<<
"[STAT] potentials leafs number is "
<<
allLeaves
<<
std
::
endl
;
FReal
averageParticles
=
0.0
,
varianceParticles
=
0.0
;
FReal
averageParticles
=
0.0
,
varianceParticles
=
0.0
;
...
...
This diff is collapsed.
Click to expand it.
Src/Kernels/Rotation/FRotationKernel.hpp
+
5
−
5
View file @
179aa70b
// ===================================================================================
// ===================================================================================
// Copyright ScalFmm 2011 INRIA, Olivier Coulaud, B
é
renger Bramas, Matthias Messner
// Copyright ScalFmm 2011 INRIA, Olivier Coulaud, B
��
renger Bramas, Matthias Messner
// olivier.coulaud@inria.fr, berenger.bramas@inria.fr
// olivier.coulaud@inria.fr, berenger.bramas@inria.fr
// This software is a computer program whose purpose is to compute the FMM.
// This software is a computer program whose purpose is to compute the FMM.
//
//
...
@@ -193,7 +193,7 @@ class FRotationKernel : public FAbstractKernels<CellClass,ContainerClass> {
...
@@ -193,7 +193,7 @@ class FRotationKernel : public FAbstractKernels<CellClass,ContainerClass> {
///////////////////////////////////////////////////////
///////////////////////////////////////////////////////
/** The f
a
llowing comments include formula taken from the original vectors
/** The f
o
llowing comments include formula taken from the original vectors
*
*
*
*
* This function rotate a multipole vector by an angle azimuth phi
* This function rotate a multipole vector by an angle azimuth phi
...
@@ -242,7 +242,7 @@ class FRotationKernel : public FAbstractKernels<CellClass,ContainerClass> {
...
@@ -242,7 +242,7 @@ class FRotationKernel : public FAbstractKernels<CellClass,ContainerClass> {
*
*
* Remark about the structure of the structure of the matrixes DlmkCoef[O/M](Minus)Theta.
* Remark about the structure of the structure of the matrixes DlmkCoef[O/M](Minus)Theta.
* It is composed of "P" small matrix.
* It is composed of "P" small matrix.
* The matrix M(l) (0 <= l <= P) has a size of (l*2+1)
²
* The matrix M(l) (0 <= l <= P) has a size of (l*2+1)
��
* It means indexes are going from -l to l for column and row.
* It means indexes are going from -l to l for column and row.
* l = 0: ( -0 <= m <= 0 ; -0 <= k <= 0)
* l = 0: ( -0 <= m <= 0 ; -0 <= k <= 0)
* [X]
* [X]
...
@@ -970,7 +970,7 @@ public:
...
@@ -970,7 +970,7 @@ public:
* and finaly rotate back.
* and finaly rotate back.
*/
*/
void
M2M
(
CellClass
*
const
FRestrict
inPole
,
const
CellClass
*
const
FRestrict
*
const
FRestrict
inChildren
,
const
int
inLevel
)
{
void
M2M
(
CellClass
*
const
FRestrict
inPole
,
const
CellClass
*
const
FRestrict
*
const
FRestrict
inChildren
,
const
int
inLevel
)
{
// Get the translation coef for this level (same for all chi
d
l)
// Get the translation coef for this level (same for all chil
d
)
const
FReal
*
const
coef
=
M2MTranslationCoef
[
inLevel
];
const
FReal
*
const
coef
=
M2MTranslationCoef
[
inLevel
];
// A buffer to copy the source w allocated once
// A buffer to copy the source w allocated once
FComplexe
source_w
[
SizeArray
];
FComplexe
source_w
[
SizeArray
];
...
@@ -994,7 +994,7 @@ public:
...
@@ -994,7 +994,7 @@ public:
FReal
w_lm_real
=
0.0
;
FReal
w_lm_real
=
0.0
;
FReal
w_lm_imag
=
0.0
;
FReal
w_lm_imag
=
0.0
;
int
index_jm
=
atLm
(
m
,
m
);
// get atLm(l,m)
int
index_jm
=
atLm
(
m
,
m
);
// get atLm(l,m)
int
index_l_minus_j
=
l
-
m
;
// get l-j continously
int
index_l_minus_j
=
l
-
m
;
// get l-j contin
u
ously
for
(
int
j
=
m
;
j
<=
l
;
++
j
,
--
index_l_minus_j
,
index_jm
+=
j
){
for
(
int
j
=
m
;
j
<=
l
;
++
j
,
--
index_l_minus_j
,
index_jm
+=
j
){
//const coef = (b^l-j) / (l-j)!;
//const coef = (b^l-j) / (l-j)!;
w_lm_real
+=
coef
[
index_l_minus_j
]
*
source_w
[
index_jm
].
getReal
();
w_lm_real
+=
coef
[
index_l_minus_j
]
*
source_w
[
index_jm
].
getReal
();
...
...
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