Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
ScalFMM
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
5
Issues
5
List
Boards
Labels
Service Desk
Milestones
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
solverstack
ScalFMM
Commits
8cee40f2
Commit
8cee40f2
authored
Jul 01, 2013
by
COULAUD Olivier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Taylor : Ajout du potentiel et améliorations des formules
parent
e716c0c1
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
62 additions
and
21 deletions
+62
-21
Doc/CMakeLists.txt
Doc/CMakeLists.txt
+6
-0
ScalFMMConfig.cmake.in
ScalFMMConfig.cmake.in
+2
-0
Src/Kernels/Taylor/FTaylorKernel.hpp
Src/Kernels/Taylor/FTaylorKernel.hpp
+51
-19
Tests/Kernels/testTaylorSimple.cpp
Tests/Kernels/testTaylorSimple.cpp
+3
-2
No files found.
Doc/CMakeLists.txt
View file @
8cee40f2
...
...
@@ -10,5 +10,11 @@ IF(ScalFMM_BUILD_DOC)
WORKING_DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
COMMENT
"Generating API documentation with Doxygen"
VERBATIM
)
# INSTALL(FILES ${ScalFMM_BINARY_DIR}/Doc/scalfmm.tag
# DESTINATION doc/
# )
# INSTALL(DIRECTORY ${ScalFMM_BINARY_DIR}/Doc/html
# DESTINATION doc/
# )
endif
(
DOXYGEN_FOUND
)
endif
(
ScalFMM_BUILD_DOC
)
ScalFMMConfig.cmake.in
View file @
8cee40f2
...
...
@@ -37,6 +37,8 @@ SET(ScalFMM_USE_ADDONS "@ScalFMM_USE_ADDONS@")
#SET(ScalFMM_FLAGS "@@")
#SET(ScalFMM_FLAGS "@@")
#
SET(ScalFMM_DOC_TAGS "@CMAKE_BINARY_DIR@/Doc/scalfmm.tag")
#
IF(ScalFMM_USE_ADDONS)
SET(ScalFMM_LIBRARIES "-L${ScalFMM_LIBRARIES_DIR} -l${ScalFMM_LIBRARY_NAME} ${ScalFMM_LIBRARIES_ADD}" )
...
...
Src/Kernels/Taylor/FTaylorKernel.hpp
View file @
8cee40f2
...
...
@@ -196,6 +196,9 @@ private:
* -(\left |\mathbf{k}\right |-1)\times \sum_{j=0}^{3}\left
* [\Psi_{\mathbf{k}-2\times e_j,i}^{c}\times \frac{1}{(\mathbf{k}-2\times e_j)!}\right]
* \f]
*
* @todo METTRE les fonctions pour intialiser la recurrence.
*
*/
void
initDerivative
(
const
FPoint
target
,
const
FPoint
src
,
FReal
*
tab
)
{
...
...
@@ -295,11 +298,12 @@ public:
/**P2M
* @brief Fill the Multipole with the field created by the cell
* particles.
*
*
* Formula :
* \f[
* M_{k} = \sum_{j=0}^{nb_{particule}}{ q_j * \frac{|k|!}{k! k!} (x_j-x_c)^{k}}
* \f]
* where \f$x_c\f$ is the centre of the cell and \f$x_j\f$ the \f$j^{th}\f$ particles and \f$q_j\f$ its charge.
*/
void
P2M
(
CellClass
*
const
pole
,
const
ContainerClass
*
const
particles
)
...
...
@@ -355,9 +359,6 @@ public:
//
//Computation
//
// FReal value = FReal(0.0);
// value += potential*arrayDX[a]*arrayDY[b]*arrayDZ[c];
// value += potential*FMath::pow(dx,a)*FMath::pow(dy,b)*FMath::pow(dz,c);
multipole
[
i
]
+=
coeff
*
potential
*
arrayDX
[
a
]
*
arrayDY
[
b
]
*
arrayDZ
[
c
];
incPowers
(
&
a
,
&
b
,
&
c
);
//inc powers of expansion
}
// end loop on multipoles
...
...
@@ -370,6 +371,22 @@ public:
// cellCenter.getX(),cellCenter.getY(),cellCenter.getZ(),a+b+c,a,b,c,multipole[i]);
// incPowers(&a,&b,&c);
// }
// std::cout << std::endl;
// for(int l=0 , idx = 0; l<= P ; ++l) // length of i + j + k = l
// {
// for( c=0 ; c <= l ; ++c)
// {
// for( b = 0 ; b<= l-c ; ++b)
// {
// for( a = l-c-b ; a+b+c==l; --a, ++idx)
// {
// std::cout << "P2M>> "<< idx << " = (i,j,k) = ("<< a << " , " <<b << " , " << c << " ) " <<std::endl;
// }
// }
// }
// }
// }
}
...
...
@@ -457,11 +474,17 @@ public:
/**
*@brief Convert the multipole expansion into local expansion The
* operator do not use symmetries.
* \f[
* L_{\mathbf{n}}^{c} =
* \frac{
1}{\mathbf{n}!} \times \sum_{\mathbf{k}=0}^{p} \left [
* \Psi_{\mathbf{n+k}}
^{c}(\mathbf{x}\times M_{\mathbf{k}^c
})\right
* \f[
* L_{\mathbf{n}}^{c} =
* \frac{
|n|!}{n! n!} \sum_{\mathbf{k}=0}^{p} \left [M_\mathbf{k}^c \,
* \Psi_{\mathbf{n+k}}
( \mathbf{x_c^{target}
})\right
* ] \f]
* and
* \f[
* \Psi_{\mathbf{i}}^{c}(\mathbf{x}) = \frac{\partial^i}{\partial x^i} \frac{1}{|x-x_c^{src}|}
* \f]
*Where \f$x_c^{src}\f$ is the centre of the cell where the multiplole are considered,\f$x_c^{target}\f$ is the centre of the current celle. The celle where we compute the local expansion.
*
*/
void
M2L
(
CellClass
*
const
FRestrict
local
,
const
CellClass
*
distantNeighbors
[
343
],
...
...
@@ -477,7 +500,7 @@ public:
FReal
*
iterLocal
=
local
->
getLocal
();
FMemUtils
::
memset
(
iterLocal
,
0
,
SizeVector
*
sizeof
(
FReal
(
0
)));
for
(
idxNeigh
=
0
;
idxNeigh
<
343
;
idxNeigh
++
){
for
(
idxNeigh
=
0
;
idxNeigh
<
343
;
++
idxNeigh
){
//Need to test if current neighbor is one of the interaction list
if
(
distantNeighbors
[
idxNeigh
]){
...
...
@@ -492,8 +515,7 @@ public:
//Iteration over Multipole / Local
int
al
=
0
,
bl
=
0
,
cl
=
0
;
//For local array
int
am
=
0
,
bm
=
0
,
cm
=
0
;
//For distant array
//
int
count
=
0
;
//Iterating over local array : n
for
(
int
i
=
0
;
i
<
SizeVector
;
i
++
){
...
...
@@ -574,9 +596,15 @@ public:
}
/**
*@brief Apply on the particles the force computed from the local expansion
/**
L2P
*@brief Apply on the particles the force computed from the local expansion
to all particles in the cell
*
*
* Formula :
* \f[
* Potential = \sum_{j=0}^{nb_{particles}}{q_j \sum_{l=0}^{P}{ L_k * (x_j-x_c)^{k}}}
* \f]
* where \f$x_c\f$ is the centre of the cell and \f$x_j\f$ the \f$j^{th}\f$ particles and \f$q_j\f$ its charge.
*/
void
L2P
(
const
CellClass
*
const
local
,
ContainerClass
*
const
particles
)
...
...
@@ -594,13 +622,15 @@ public:
FReal
*
const
forceX
=
particles
->
getForcesX
();
FReal
*
const
forceY
=
particles
->
getForcesY
();
FReal
*
const
forceZ
=
particles
->
getForcesZ
();
//
FReal
*
const
targetsPotentials
=
particles
->
getPotentials
();
printf
(
"L2P : Cell : %f, fx = %f, fy = %f, fz = %f
\n\n
"
,
locCenter
.
getX
(),
forceX
[
0
],
forceY
[
0
],
forceZ
[
0
]);
FReal
*
const
phyValues
=
particles
->
getPhysicalValues
();
//Iteration over particles
for
(
int
i
=
0
;
i
<
nbPart
;
i
++
){
for
(
int
i
=
0
;
i
<
nbPart
;
++
i
){
FReal
dx
=
posX
[
i
]
-
locCenter
.
getX
();
FReal
dy
=
posY
[
i
]
-
locCenter
.
getY
();
...
...
@@ -628,12 +658,14 @@ public:
for
(
int
j
=
0
;
j
<
SizeVector
;
++
j
){
FReal
partPhyValue
=
phyValues
[
i
];
FReal
locForce
=
iterLocal
[
j
];
FReal
locForce
=
iterLocal
[
j
];
// compute the potential
targetsPotentials
[
i
]
+=
partPhyValue
*
iterLocal
[
j
]
*
arrayDX
[
a
+
1
]
*
arrayDY
[
b
+
1
]
*
arrayDZ
[
c
+
1
];
//Application of forces
forceX
[
i
]
+=
-
partPhyValue
*
FReal
(
a
)
*
locForce
*
arrayDX
[
a
]
*
arrayDY
[
b
+
1
]
*
arrayDZ
[
c
+
1
];
forceY
[
i
]
+=
-
partPhyValue
*
FReal
(
b
)
*
locForce
*
arrayDX
[
a
+
1
]
*
arrayDY
[
b
]
*
arrayDZ
[
c
+
1
];
forceZ
[
i
]
+=
-
partPhyValue
*
FReal
(
c
)
*
locForce
*
arrayDX
[
a
+
1
]
*
arrayDY
[
b
+
1
]
*
arrayDZ
[
c
];
forceX
[
i
]
-=
partPhyValue
*
FReal
(
a
)
*
locForce
*
arrayDX
[
a
]
*
arrayDY
[
b
+
1
]
*
arrayDZ
[
c
+
1
];
forceY
[
i
]
-=
partPhyValue
*
FReal
(
b
)
*
locForce
*
arrayDX
[
a
+
1
]
*
arrayDY
[
b
]
*
arrayDZ
[
c
+
1
];
forceZ
[
i
]
-=
partPhyValue
*
FReal
(
c
)
*
locForce
*
arrayDX
[
a
+
1
]
*
arrayDY
[
b
+
1
]
*
arrayDZ
[
c
];
//
incPowers
(
&
a
,
&
b
,
&
c
);
}
}
...
...
Tests/Kernels/testTaylorSimple.cpp
View file @
8cee40f2
...
...
@@ -58,7 +58,8 @@ int main(int argc,char* argv[]){
KernelClass
kernels
(
NbLevels
,
boxWidth
,
rootCenter
);
FmmClassThread
algo
(
&
tree
,
&
kernels
);
FmmClass
algo
(
&
tree
,
&
kernels
);
// FmmClassThread algo(&tree,&kernels);
algo
.
execute
();
{
// get sum forces&potential
...
...
@@ -82,7 +83,7 @@ int main(int argc,char* argv[]){
}
});
printf
(
"potential : %f
\n
"
,
potential
);
}
return
0
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment