Commit ffe7feeb authored by Quentin Khan's avatar Quentin Khan

Renamed FChebBalanceSymKernel to FChebSymCostKernel

parent e7811591
......@@ -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).
*/
FChebBalanceSymKernel(OctreeClass* tree,
FChebSymCostKernel(OctreeClass* tree,
const FReal Epsilon)
: MatrixKernel(new MatrixKernelClass()),
SymHandler(new SymmetryHandler(MatrixKernel.getPtr(), Epsilon)),
......@@ -144,7 +143,7 @@ public:
/** Copy constructor */
FChebBalanceSymKernel(const FChebBalanceSymKernel& other) :
FChebSymCostKernel(const FChebSymCostKernel& other) :
SymHandler(other.SymHandler),
_tree(other._tree),
_treeHeight(other._treeHeight)
......@@ -153,7 +152,7 @@ public:
}
/** Destructor */
~FChebBalanceSymKernel() {
~FChebSymCostKernel() {
delete [] countExp;
}
......@@ -318,7 +317,7 @@ public:
*/
template < typename FReal, class CellClass, class ContainerClass,
class MatrixKernelClass, int ORDER, class OctreeClass>
struct FChebBalanceSymKernel<FReal, CellClass, ContainerClass, MatrixKernelClass, ORDER, OctreeClass>
struct FChebSymCostKernel<FReal, CellClass, ContainerClass, MatrixKernelClass, ORDER, OctreeClass>
::SymmetryHandler
{
// M2L operators
......
......@@ -39,7 +39,7 @@
#include "Kernels/Chebyshev/FChebSymKernel.hpp"
#ifdef BALANCED_PERF
#include "BalanceTree/FChebBalanceSymKernel.hpp"
#include "BalanceTree/FChebSymCostKernel.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
<< "\tOctree Depth :" << TreeHeight <<std::endl
<< "\tSubOctree depth :" << SubTreeHeight <<std::endl
<< "\tInput file name :" << filename <<std::endl
<< "\tThread number :" << NbThreads <<std::endl
<<std::endl;
std::cout << "Parameters "<< std::endl
<< "\tOctree Depth :" << TreeHeight <<std::endl
<< "\tSubOctree depth :" << SubTreeHeight <<std::endl
<< "\tInput file name :" << filename <<std::endl
<< "\tThread number :" << NbThreads <<std::endl
<< std::endl;
////////////////////////////////////////////////////////////////////
// init timer
......
......@@ -40,7 +40,7 @@
// Kernel
//#include "Kernels/Chebyshev/FChebSymKernel.hpp"
#include "Components/FTestKernels.hpp"
#include "BalanceTree/FChebBalanceSymKernel.hpp"
#include "BalanceTree/FChebSymCostKernel.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= FChebBalanceSymKernel<FReal, CellClass, ContainerClass,
using BalanceKernelClass= FChebSymCostKernel<FReal, CellClass, ContainerClass,
MatrixKernelClass, ORDER,
OctreeClass>;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment