Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
solverstack
ScalFMM
Commits
2a8f6a22
Commit
2a8f6a22
authored
Mar 16, 2012
by
Matthias Messner
Browse files
bugfix: now with correct path for header includes
parent
f1a70d01
Changes
10
Hide whitespace changes
Inline
Side-by-side
Tests/Kernels/testChebAlgorithm.cpp
View file @
2a8f6a22
...
...
@@ -23,21 +23,21 @@
#include
<cstdio>
#include
<cstdlib>
#include
"../Src/Kernels/Chebyshev/FChebParticle.hpp"
#include
"../Src/Kernels/Chebyshev/FChebLeaf.hpp"
#include
"../Src/Kernels/Chebyshev/FChebCell.hpp"
#include
"../Src/Kernels/Chebyshev/FChebMatrixKernel.hpp"
#include
"../Src/Kernels/Chebyshev/FChebKernel.hpp"
#include
"../Src/Kernels/Chebyshev/FChebSymKernel.hpp"
#include
"../
../
Src/Kernels/Chebyshev/FChebParticle.hpp"
#include
"../
../
Src/Kernels/Chebyshev/FChebLeaf.hpp"
#include
"../
../
Src/Kernels/Chebyshev/FChebCell.hpp"
#include
"../
../
Src/Kernels/Chebyshev/FChebMatrixKernel.hpp"
#include
"../
../
Src/Kernels/Chebyshev/FChebKernel.hpp"
#include
"../
../
Src/Kernels/Chebyshev/FChebSymKernel.hpp"
//#include "../Src/Utils/FTic.hpp"
#include
"../Src/Utils/FParameters.hpp"
#include
"../
../
Src/Utils/FParameters.hpp"
#include
"../Src/Containers/FOctree.hpp"
#include
"../Src/Containers/FVector.hpp"
#include
"../
../
Src/Containers/FOctree.hpp"
#include
"../
../
Src/Containers/FVector.hpp"
#include
"../Src/Core/FFmmAlgorithm.hpp"
#include
"../Src/Core/FFmmAlgorithmThread.hpp"
#include
"../
../
Src/Core/FFmmAlgorithm.hpp"
#include
"../
../
Src/Core/FFmmAlgorithmThread.hpp"
/** This program show an example of use of
...
...
Tests/Kernels/testCompareKernels.cpp
View file @
2a8f6a22
...
...
@@ -23,33 +23,33 @@
#include
<cstdio>
#include
<cstdlib>
#include
"../Src/Utils/FTic.hpp"
#include
"../Src/Utils/FParameters.hpp"
#include
"../
../
Src/Utils/FTic.hpp"
#include
"../
../
Src/Utils/FParameters.hpp"
#include
"../Src/Files/FFmaScanfLoader.hpp"
#include
"../
../
Src/Files/FFmaScanfLoader.hpp"
#include
"../Src/Containers/FOctree.hpp"
#include
"../Src/Containers/FVector.hpp"
#include
"../
../
Src/Containers/FOctree.hpp"
#include
"../
../
Src/Containers/FVector.hpp"
#include
"../Src/Core/FFmmAlgorithm.hpp"
#include
"../Src/Core/FFmmAlgorithmThread.hpp"
#include
"../
../
Src/Core/FFmmAlgorithm.hpp"
#include
"../
../
Src/Core/FFmmAlgorithmThread.hpp"
// chebyshev kernel
#include
"../Src/Kernels/Chebyshev/FChebParticle.hpp"
#include
"../Src/Kernels/Chebyshev/FChebLeaf.hpp"
#include
"../Src/Kernels/Chebyshev/FChebCell.hpp"
#include
"../Src/Kernels/Chebyshev/FChebMatrixKernel.hpp"
#include
"../Src/Kernels/Chebyshev/FChebKernel.hpp"
#include
"../Src/Kernels/Chebyshev/FChebSymKernel.hpp"
#include
"../
../
Src/Kernels/Chebyshev/FChebParticle.hpp"
#include
"../
../
Src/Kernels/Chebyshev/FChebLeaf.hpp"
#include
"../
../
Src/Kernels/Chebyshev/FChebCell.hpp"
#include
"../
../
Src/Kernels/Chebyshev/FChebMatrixKernel.hpp"
#include
"../
../
Src/Kernels/Chebyshev/FChebKernel.hpp"
#include
"../
../
Src/Kernels/Chebyshev/FChebSymKernel.hpp"
// spherical kernel
#include
"../Src/Components/FSimpleLeaf.hpp"
#include
"../Src/Kernels/Spherical/FSphericalKernel.hpp"
#include
"../Src/Kernels/Spherical/FSphericalBlasKernel.hpp"
#include
"../Src/Kernels/Spherical/FSphericalBlockBlasKernel.hpp"
#include
"../Src/Kernels/Spherical/FSphericalRotationKernel.hpp"
#include
"../Src/Kernels/Spherical/FSphericalCell.hpp"
#include
"../Src/Kernels/Spherical/FSphericalParticle.hpp"
#include
"../
../
Src/Components/FSimpleLeaf.hpp"
#include
"../
../
Src/Kernels/Spherical/FSphericalKernel.hpp"
#include
"../
../
Src/Kernels/Spherical/FSphericalBlasKernel.hpp"
#include
"../
../
Src/Kernels/Spherical/FSphericalBlockBlasKernel.hpp"
#include
"../
../
Src/Kernels/Spherical/FSphericalRotationKernel.hpp"
#include
"../
../
Src/Kernels/Spherical/FSphericalCell.hpp"
#include
"../
../
Src/Kernels/Spherical/FSphericalParticle.hpp"
/**
...
...
@@ -96,7 +96,8 @@ public:
:
MatrixKernel
()
{}
unsigned
int
operator
()(
OctreeClass
&
tree
,
const
unsigned
int
NumTargetCells
,
FReal
*
&
p
,
FReal
*
&
f
)
const
unsigned
int
operator
()(
OctreeClass
&
tree
,
const
unsigned
int
NumTargetCells
,
FReal
*
&
p
,
FReal
*
&
f
)
const
{
// begin direct computation of first leaf cell
typename
OctreeClass
::
Iterator
iLeafs
(
&
tree
);
...
...
@@ -232,12 +233,14 @@ int main(int argc, char* argv[])
OctreeClass
tree
(
TreeHeight
,
SubTreeHeight
,
loader
.
getBoxWidth
(),
loader
.
getCenterOfBox
());
{
// -----------------------------------------------------
std
::
cout
<<
"Creating & Inserting "
<<
loader
.
getNumberOfParticles
()
<<
" particles ..."
<<
std
::
endl
;
std
::
cout
<<
"Creating & Inserting "
<<
loader
.
getNumberOfParticles
()
<<
" particles ..."
<<
std
::
endl
;
std
::
cout
<<
"
\t
Height : "
<<
TreeHeight
<<
"
\t
sub-height : "
<<
SubTreeHeight
<<
std
::
endl
;
time
.
tic
();
loader
.
fillTree
(
tree
);
time
.
tac
();
std
::
cout
<<
"Done "
<<
"(@Creating and Inserting Particles = "
<<
time
.
elapsed
()
<<
"s)."
<<
std
::
endl
;
std
::
cout
<<
"Done "
<<
"(@Creating and Inserting Particles = "
<<
time
.
elapsed
()
<<
"s)."
<<
std
::
endl
;
}
// -----------------------------------------------------
{
// -----------------------------------------------------
...
...
@@ -310,8 +313,8 @@ int main(int argc, char* argv[])
//typedef FSphericalBlasKernel<ParticleClass, CellClass, ContainerClass > KernelClass;
//typedef FSphericalBlockBlasKernel<ParticleClass, CellClass, ContainerClass > KernelClass;
//typedef FSphericalKernel<ParticleClass, CellClass, ContainerClass > KernelClass;
//
typedef FSphericalBlockBlasKernel<ParticleClass, CellClass, ContainerClass > KernelClass;
typedef
FSphericalRotationKernel
<
ParticleClass
,
CellClass
,
ContainerClass
>
KernelClass
;
typedef
FSphericalBlockBlasKernel
<
ParticleClass
,
CellClass
,
ContainerClass
>
KernelClass
;
//
typedef FSphericalRotationKernel<ParticleClass, CellClass, ContainerClass > KernelClass;
//typedef FFmmAlgorithm<OctreeClass, ParticleClass, CellClass, ContainerClass, KernelClass, LeafClass > FmmClass;
typedef
FFmmAlgorithmThread
<
OctreeClass
,
ParticleClass
,
CellClass
,
ContainerClass
,
KernelClass
,
LeafClass
>
FmmClass
;
...
...
@@ -325,12 +328,15 @@ int main(int argc, char* argv[])
OctreeClass
tree
(
TreeHeight
,
SubTreeHeight
,
loader
.
getBoxWidth
(),
loader
.
getCenterOfBox
());
{
// -----------------------------------------------------
std
::
cout
<<
"Creating & Inserting "
<<
loader
.
getNumberOfParticles
()
<<
" particles ..."
<<
std
::
endl
;
std
::
cout
<<
"
\t
Height : "
<<
TreeHeight
<<
"
\t
sub-height : "
<<
SubTreeHeight
<<
std
::
endl
;
std
::
cout
<<
"Creating & Inserting "
<<
loader
.
getNumberOfParticles
()
<<
" particles ..."
<<
std
::
endl
;
std
::
cout
<<
"
\t
Height : "
<<
TreeHeight
<<
"
\t
sub-height : "
<<
SubTreeHeight
<<
std
::
endl
;
time
.
tic
();
loader
.
fillTree
(
tree
);
time
.
tac
();
std
::
cout
<<
"Done "
<<
"(@Creating and Inserting Particles = "
<<
time
.
elapsed
()
<<
"s)."
<<
std
::
endl
;
std
::
cout
<<
"Done "
<<
"(@Creating and Inserting Particles = "
<<
time
.
elapsed
()
<<
"s)."
<<
std
::
endl
;
}
// -----------------------------------------------------
// -----------------------------------------------------
...
...
@@ -371,12 +377,16 @@ int main(int argc, char* argv[])
FBlas
::
scal
(
nt1
*
3
,
FReal
(
-
1.
),
f10
);
std
::
cout
<<
"
\n
Potential error:"
<<
std
::
endl
;
std
::
cout
<<
"Relative L2 error = "
<<
computeL2norm
(
nt1
,
p10
,
fmmParticlesPotential
)
<<
std
::
endl
;
std
::
cout
<<
"Relative Lmax error = "
<<
computeINFnorm
(
nt1
,
p10
,
fmmParticlesPotential
)
<<
std
::
endl
;
std
::
cout
<<
"Relative L2 error = "
<<
computeL2norm
(
nt1
,
p10
,
fmmParticlesPotential
)
<<
std
::
endl
;
std
::
cout
<<
"Relative Lmax error = "
<<
computeINFnorm
(
nt1
,
p10
,
fmmParticlesPotential
)
<<
std
::
endl
;
std
::
cout
<<
"
\n
Forces error:"
<<
std
::
endl
;
std
::
cout
<<
"Relative L2 error = "
<<
computeL2norm
(
nt1
*
3
,
f10
,
fmmParticlesForces
)
<<
std
::
endl
;
std
::
cout
<<
"Relative Lmax error = "
<<
computeINFnorm
(
nt1
*
3
,
f10
,
fmmParticlesForces
)
<<
std
::
endl
;
std
::
cout
<<
"Relative L2 error = "
<<
computeL2norm
(
nt1
*
3
,
f10
,
fmmParticlesForces
)
<<
std
::
endl
;
std
::
cout
<<
"Relative Lmax error = "
<<
computeINFnorm
(
nt1
*
3
,
f10
,
fmmParticlesForces
)
<<
std
::
endl
;
...
...
Tests/Kernels/testTuneSphericalBlockBlas.cpp
View file @
2a8f6a22
...
...
@@ -19,23 +19,23 @@
#include
<cstdio>
#include
<cstdlib>
#include
"../Src/Utils/FTic.hpp"
#include
"../Src/Utils/FParameters.hpp"
#include
"../
../
Src/Utils/FTic.hpp"
#include
"../
../
Src/Utils/FParameters.hpp"
#include
"../Src/Containers/FOctree.hpp"
#include
"../Src/Containers/FVector.hpp"
#include
"../
../
Src/Containers/FOctree.hpp"
#include
"../
../
Src/Containers/FVector.hpp"
#include
"../Src/Core/FFmmAlgorithm.hpp"
#include
"../Src/Core/FFmmAlgorithmThread.hpp"
#include
"../
../
Src/Core/FFmmAlgorithm.hpp"
#include
"../
../
Src/Core/FFmmAlgorithmThread.hpp"
#include
"../Src/Components/FSimpleLeaf.hpp"
#include
"../Src/Components/FBasicCell.hpp"
#include
"../
../
Src/Components/FSimpleLeaf.hpp"
#include
"../
../
Src/Components/FBasicCell.hpp"
#include
"../Src/Kernels/Spherical/FSphericalBlockBlasKernel.hpp"
#include
"../Src/Kernels/Spherical/FSphericalParticle.hpp"
#include
"../Src/Kernels/Spherical/FSphericalCell.hpp"
#include
"../
../
Src/Kernels/Spherical/FSphericalBlockBlasKernel.hpp"
#include
"../
../
Src/Kernels/Spherical/FSphericalParticle.hpp"
#include
"../
../
Src/Kernels/Spherical/FSphericalCell.hpp"
#include
"../Src/Files/FFmaScanfLoader.hpp"
#include
"../
../
Src/Files/FFmaScanfLoader.hpp"
/** This program find the best block blas size
*/
...
...
Tests/Utils/testChebBinaryM2L.cpp
View file @
2a8f6a22
...
...
@@ -25,12 +25,12 @@
#include
<stdlib.h>
#include
<time.h>
#include
"../Src/Utils/FGlobal.hpp"
#include
"../
../
Src/Utils/FGlobal.hpp"
#include
"../Src/Utils/FTic.hpp"
#include
"../Src/Utils/FMath.hpp"
#include
"../Src/Kernels/Chebyshev/FChebMatrixKernel.hpp"
#include
"../Src/Kernels/Chebyshev/FChebM2LHandler.hpp"
#include
"../
../
Src/Utils/FTic.hpp"
#include
"../
../
Src/Utils/FMath.hpp"
#include
"../
../
Src/Kernels/Chebyshev/FChebMatrixKernel.hpp"
#include
"../
../
Src/Kernels/Chebyshev/FChebM2LHandler.hpp"
...
...
Tests/Utils/testChebInterpolator.cpp
View file @
2a8f6a22
...
...
@@ -25,18 +25,18 @@
#include
<stdlib.h>
#include
<time.h>
#include
"../Src/Utils/FTic.hpp"
#include
"../Src/Utils/FMath.hpp"
#include
"../
../
Src/Utils/FTic.hpp"
#include
"../
../
Src/Utils/FMath.hpp"
#include
"../Src/Containers/FVector.hpp"
#include
"../
../
Src/Containers/FVector.hpp"
#include
"../Src/Utils/FAssertable.hpp"
#include
"../Src/Utils/F3DPosition.hpp"
#include
"../
../
Src/Utils/FAssertable.hpp"
#include
"../
../
Src/Utils/F3DPosition.hpp"
#include
"../Src/Kernels/Chebyshev/FChebParticle.hpp"
#include
"../Src/Kernels/Chebyshev/FChebLeaf.hpp"
#include
"../Src/Kernels/Chebyshev/FChebInterpolator.hpp"
#include
"../Src/Kernels/Chebyshev/FChebMatrixKernel.hpp"
#include
"../
../
Src/Kernels/Chebyshev/FChebParticle.hpp"
#include
"../
../
Src/Kernels/Chebyshev/FChebLeaf.hpp"
#include
"../
../
Src/Kernels/Chebyshev/FChebInterpolator.hpp"
#include
"../
../
Src/Kernels/Chebyshev/FChebMatrixKernel.hpp"
...
...
Tests/Utils/testChebM2Lprecomputation.cpp
View file @
2a8f6a22
...
...
@@ -24,15 +24,15 @@
#include
<stdexcept>
#include
"../Src/Utils/FGlobal.hpp"
#include
"../Src/Utils/F3DPosition.hpp"
#include
"../Src/Utils/FMath.hpp"
#include
"../Src/Utils/FTic.hpp"
#include
"../
../
Src/Utils/FGlobal.hpp"
#include
"../
../
Src/Utils/F3DPosition.hpp"
#include
"../
../
Src/Utils/FMath.hpp"
#include
"../
../
Src/Utils/FTic.hpp"
#include
"../Src/Kernels/Chebyshev/FChebTensor.hpp"
#include
"../Src/Kernels/Chebyshev/FChebM2LHandler.hpp"
#include
"../Src/Kernels/Chebyshev/FChebMatrixKernel.hpp"
#include
"../
../
Src/Kernels/Chebyshev/FChebTensor.hpp"
#include
"../
../
Src/Kernels/Chebyshev/FChebM2LHandler.hpp"
#include
"../
../
Src/Kernels/Chebyshev/FChebMatrixKernel.hpp"
...
...
Tests/Utils/testChebOctree.cpp
View file @
2a8f6a22
...
...
@@ -20,17 +20,17 @@
#include
<stdlib.h>
#include
<time.h>
#include
"../Src/Utils/FTic.hpp"
#include
"../
../
Src/Utils/FTic.hpp"
#include
"../Src/Containers/FOctree.hpp"
#include
"../Src/Containers/FVector.hpp"
#include
"../
../
Src/Containers/FOctree.hpp"
#include
"../
../
Src/Containers/FVector.hpp"
#include
"../Src/Utils/FAssertable.hpp"
#include
"../Src/Utils/F3DPosition.hpp"
#include
"../
../
Src/Utils/FAssertable.hpp"
#include
"../
../
Src/Utils/F3DPosition.hpp"
#include
"../Src/Kernels/Chebyshev/FChebParticle.hpp"
#include
"../Src/Kernels/Chebyshev/FChebCell.hpp"
#include
"../Src/Kernels/Chebyshev/FChebLeaf.hpp"
#include
"../
../
Src/Kernels/Chebyshev/FChebParticle.hpp"
#include
"../
../
Src/Kernels/Chebyshev/FChebCell.hpp"
#include
"../
../
Src/Kernels/Chebyshev/FChebLeaf.hpp"
/**
...
...
Tests/Utils/testChebSxUCBSy.cpp
View file @
2a8f6a22
...
...
@@ -24,19 +24,19 @@
#include
<stdlib.h>
#include
<time.h>
#include
"../Src/Utils/FTic.hpp"
#include
"../Src/Utils/FMath.hpp"
#include
"../
../
Src/Utils/FTic.hpp"
#include
"../
../
Src/Utils/FMath.hpp"
#include
"../Src/Containers/FVector.hpp"
#include
"../
../
Src/Containers/FVector.hpp"
#include
"../Src/Utils/FAssertable.hpp"
#include
"../Src/Utils/F3DPosition.hpp"
#include
"../
../
Src/Utils/FAssertable.hpp"
#include
"../
../
Src/Utils/F3DPosition.hpp"
#include
"../Src/Kernels/Chebyshev/FChebParticle.hpp"
#include
"../Src/Kernels/Chebyshev/FChebLeaf.hpp"
#include
"../Src/Kernels/Chebyshev/FChebInterpolator.hpp"
#include
"../Src/Kernels/Chebyshev/FChebM2LHandler.hpp"
#include
"../Src/Kernels/Chebyshev/FChebMatrixKernel.hpp"
#include
"../
../
Src/Kernels/Chebyshev/FChebParticle.hpp"
#include
"../
../
Src/Kernels/Chebyshev/FChebLeaf.hpp"
#include
"../
../
Src/Kernels/Chebyshev/FChebInterpolator.hpp"
#include
"../
../
Src/Kernels/Chebyshev/FChebM2LHandler.hpp"
#include
"../
../
Src/Kernels/Chebyshev/FChebMatrixKernel.hpp"
...
...
Tests/Utils/testChebSymmetries.cpp
View file @
2a8f6a22
...
...
@@ -26,11 +26,11 @@
#include
"../Src/Utils/FTic.hpp"
#include
"../
../
Src/Utils/FTic.hpp"
#include
"../Src/Kernels/Chebyshev/FChebTensor.hpp"
#include
"../Src/Kernels/Chebyshev/FChebMatrixKernel.hpp"
#include
"../Src/Kernels/Chebyshev/FChebSymmetries.hpp"
#include
"../
../
Src/Kernels/Chebyshev/FChebTensor.hpp"
#include
"../
../
Src/Kernels/Chebyshev/FChebMatrixKernel.hpp"
#include
"../
../
Src/Kernels/Chebyshev/FChebSymmetries.hpp"
...
...
Tests/Utils/testCompareIOTree.cpp
View file @
2a8f6a22
...
...
@@ -14,19 +14,19 @@
#include
<cstdio>
#include
<cstdlib>
#include
"../Src/Utils/FTic.hpp"
#include
"../Src/Utils/FParameters.hpp"
#include
"../
../
Src/Utils/FTic.hpp"
#include
"../
../
Src/Utils/FParameters.hpp"
#include
"../Src/Containers/FOctree.hpp"
#include
"../Src/Containers/FVector.hpp"
#include
"../
../
Src/Containers/FOctree.hpp"
#include
"../
../
Src/Containers/FVector.hpp"
#include
"../Src/Files/FFmaLoader.hpp"
#include
"../Src/Files/FTreeIO.hpp"
#include
"../
../
Src/Files/FFmaLoader.hpp"
#include
"../
../
Src/Files/FTreeIO.hpp"
#include
"../Src/Kernels/Spherical/FSphericalCell.hpp"
#include
"../Src/Kernels/Spherical/FSphericalParticle.hpp"
#include
"../Src/Components/FSimpleLeaf.hpp"
#include
"../
../
Src/Kernels/Spherical/FSphericalCell.hpp"
#include
"../
../
Src/Kernels/Spherical/FSphericalParticle.hpp"
#include
"../
../
Src/Components/FSimpleLeaf.hpp"
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment