Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
solverstack
ScalFMM
Commits
ffe7feeb
Commit
ffe7feeb
authored
Apr 15, 2015
by
Quentin Khan
Browse files
Renamed FChebBalanceSymKernel to FChebSymCostKernel
parent
e7811591
Changes
3
Hide whitespace changes
Inline
Side-by-side
Src/BalanceTree/FCheb
BalanceSym
Kernel.hpp
→
Src/BalanceTree/FCheb
SymCost
Kernel.hpp
View file @
ffe7feeb
...
...
@@ -53,8 +53,7 @@ class FTreeCoordinate;
* \tparam ORDER Chebyshev interpolation order
*/
template
<
typename
FReal
,
class
CellClass
,
class
ContainerClass
,
class
MatrixKernelClass
,
int
ORDER
,
class
OctreeClass
>
class
FChebBalanceSymKernel
:
public
FAbstractKernels
<
CellClass
,
ContainerClass
>
class
FChebSymCostKernel
:
public
FAbstractKernels
<
CellClass
,
ContainerClass
>
{
enum
{
nnodes
=
TensorTraits
<
ORDER
>::
nnodes
};
public:
...
...
@@ -131,7 +130,7 @@ public:
* precomputed and compressed M2L operators from a binary file (an
* runtime_error is thrown if the required file is not valid).
*/
FCheb
BalanceSym
Kernel
(
OctreeClass
*
tree
,
FCheb
SymCost
Kernel
(
OctreeClass
*
tree
,
const
FReal
Epsilon
)
:
MatrixKernel
(
new
MatrixKernelClass
()),
SymHandler
(
new
SymmetryHandler
(
MatrixKernel
.
getPtr
(),
Epsilon
)),
...
...
@@ -144,7 +143,7 @@ public:
/** Copy constructor */
FCheb
BalanceSym
Kernel
(
const
FCheb
BalanceSym
Kernel
&
other
)
:
FCheb
SymCost
Kernel
(
const
FCheb
SymCost
Kernel
&
other
)
:
SymHandler
(
other
.
SymHandler
),
_tree
(
other
.
_tree
),
_treeHeight
(
other
.
_treeHeight
)
...
...
@@ -153,7 +152,7 @@ public:
}
/** Destructor */
~
FCheb
BalanceSym
Kernel
()
{
~
FCheb
SymCost
Kernel
()
{
delete
[]
countExp
;
}
...
...
@@ -318,7 +317,7 @@ public:
*/
template
<
typename
FReal
,
class
CellClass
,
class
ContainerClass
,
class
MatrixKernelClass
,
int
ORDER
,
class
OctreeClass
>
struct
FCheb
BalanceSym
Kernel
<
FReal
,
CellClass
,
ContainerClass
,
MatrixKernelClass
,
ORDER
,
OctreeClass
>
struct
FCheb
SymCost
Kernel
<
FReal
,
CellClass
,
ContainerClass
,
MatrixKernelClass
,
ORDER
,
OctreeClass
>
::
SymmetryHandler
{
// M2L operators
...
...
Tests/noDist/BalancePerfTest.cpp
View file @
ffe7feeb
...
...
@@ -39,7 +39,7 @@
#include "Kernels/Chebyshev/FChebSymKernel.hpp"
#ifdef BALANCED_PERF
#include "BalanceTree/FCheb
BalanceSym
Kernel.hpp"
#include "BalanceTree/FCheb
SymCost
Kernel.hpp"
#include "BalanceTree/FCostZones.hpp"
#endif
...
...
@@ -137,12 +137,12 @@ int main(int argc, char* argv[])
omp_set_num_threads
(
NbThreads
);
std
::
cout
<<
"
\n
>> Using "
<<
omp_get_max_threads
()
<<
" threads.
\n
"
<<
std
::
endl
;
//
std
::
cout
<<
"Parameters "
<<
std
::
endl
<<
"
\t
Octree Depth :"
<<
TreeHeight
<<
std
::
endl
<<
"
\t
SubOctree depth :"
<<
SubTreeHeight
<<
std
::
endl
<<
"
\t
Input file name :"
<<
filename
<<
std
::
endl
<<
"
\t
Thread number :"
<<
NbThreads
<<
std
::
endl
<<
std
::
endl
;
std
::
cout
<<
"Parameters "
<<
std
::
endl
<<
"
\t
Octree Depth :"
<<
TreeHeight
<<
std
::
endl
<<
"
\t
SubOctree depth :"
<<
SubTreeHeight
<<
std
::
endl
<<
"
\t
Input file name :"
<<
filename
<<
std
::
endl
<<
"
\t
Thread number :"
<<
NbThreads
<<
std
::
endl
<<
std
::
endl
;
////////////////////////////////////////////////////////////////////
// init timer
...
...
Tests/noDist/testFmmAlgorithmBalanced.cpp
View file @
ffe7feeb
...
...
@@ -40,7 +40,7 @@
// Kernel
//#include "Kernels/Chebyshev/FChebSymKernel.hpp"
#include "Components/FTestKernels.hpp"
#include "BalanceTree/FCheb
BalanceSym
Kernel.hpp"
#include "BalanceTree/FCheb
SymCost
Kernel.hpp"
// Algorithm
#include "Core/FFmmAlgorithm.hpp"
...
...
@@ -61,7 +61,7 @@ using LeafClass = FSimpleLeaf< FReal, ContainerClass >;
using
OctreeClass
=
FOctree
<
FReal
,
CellClass
,
ContainerClass
,
LeafClass
>
;
using
MatrixKernelClass
=
FInterpMatrixKernelR
<
FReal
>
;
using
BalanceKernelClass
=
FCheb
BalanceSym
Kernel
<
FReal
,
CellClass
,
ContainerClass
,
using
BalanceKernelClass
=
FCheb
SymCost
Kernel
<
FReal
,
CellClass
,
ContainerClass
,
MatrixKernelClass
,
ORDER
,
OctreeClass
>
;
...
...
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