Commit 22665920 authored by BRAMAS Berenger's avatar BRAMAS Berenger
Browse files

rename in block

parent d1431d95
......@@ -16,13 +16,13 @@
//
// @SCALFMM_PRIVATE
//
#ifndef FDENSEMATRIX_HPP
#define FDENSEMATRIX_HPP
#ifndef FDENSEBLOCK_HPP
#define FDENSEBLOCK_HPP
#include "Utils/FBlas.hpp"
template <class FReal>
class FDenseMatrix{
class FDenseBlock{
protected:
// members
FReal* block;
......@@ -30,11 +30,11 @@ protected:
int nbCols;
int level;
FDenseMatrix(const FDenseMatrix&) = delete;
FDenseMatrix& operator=(const FDenseMatrix&) = delete;
FDenseBlock(const FDenseBlock&) = delete;
FDenseBlock& operator=(const FDenseBlock&) = delete;
public:
FDenseMatrix()
FDenseBlock()
: block(nullptr), nbRows(0), nbCols(0), level(0) {
}
......@@ -56,7 +56,7 @@ public:
};
// dtor
~FDenseMatrix(){
~FDenseBlock(){
// Free memory
clear();
};
......@@ -78,6 +78,6 @@ public:
}
};
#endif // FDENSEMATRIX_HPP
#endif // FDENSEBLOCK_HPP
// [--END--]
......@@ -4,7 +4,7 @@
#include "../Src/Containers/FDiv2Bissection.hpp"
#include "../Src/Utils/FSvgRect.hpp"
#include "../Src/Viewers/FDenseBlockWrapper.hpp"
#include "../Src/Blocks/FDenseMatrix.hpp"
#include "../Src/Blocks/FDenseBlock.hpp"
#include "Utils/FParameters.hpp"
#include "Utils/FParameterNames.hpp"
......@@ -32,8 +32,8 @@ int main(int argc, char** argv){
std::cout << "Config : outputdir = " << outputdir << "\n";
typedef double FReal;
typedef FDenseMatrix<FReal> LeafClass;
typedef FDenseMatrix<FReal> CellClass;
typedef FDenseBlock<FReal> LeafClass;
typedef FDenseBlock<FReal> CellClass;
typedef FDiv2Bissection<FReal, LeafClass, CellClass> GridClass;
{
......
......@@ -3,7 +3,7 @@
#include "../Src/Containers/FDiv2Bissection.hpp"
#include "../Src/Viewers/FMatDense.hpp"
#include "../Src/Blocks/FDenseMatrix.hpp"
#include "../Src/Blocks/FDenseBlock.hpp"
#include "Utils/FParameters.hpp"
#include "Utils/FParameterNames.hpp"
......@@ -51,8 +51,8 @@ int main(int argc, char** argv){
}
{
typedef FDenseMatrix<FReal> LeafClass;
typedef FDenseMatrix<FReal> CellClass;
typedef FDenseBlock<FReal> LeafClass;
typedef FDenseBlock<FReal> CellClass;
typedef FDiv2Bissection<FReal, LeafClass, CellClass> GridClass;
GridClass grid(dim, height);
......@@ -69,8 +69,8 @@ int main(int argc, char** argv){
}
{
typedef FDenseMatrix<FReal> LeafClass;
typedef FDenseMatrix<FReal> CellClass;
typedef FDenseBlock<FReal> LeafClass;
typedef FDenseBlock<FReal> CellClass;
typedef FDiv2Bissection<FReal, LeafClass, CellClass> GridClass;
const int nbPartitions = FMath::pow2(height-1);
......
......@@ -3,7 +3,7 @@
#include "../Src/Containers/FDiv2Bissection.hpp"
#include "../Src/Viewers/FMatDense.hpp"
#include "../Src/Blocks/FDenseMatrix.hpp"
#include "../Src/Blocks/FDenseBlock.hpp"
#include "Utils/FParameters.hpp"
#include "Utils/FParameterNames.hpp"
......@@ -42,8 +42,8 @@ int main(int argc, char** argv){
}
{
typedef FDenseMatrix<FReal> LeafClass;
typedef FDenseMatrix<FReal> CellClass;
typedef FDenseBlock<FReal> LeafClass;
typedef FDenseBlock<FReal> CellClass;
typedef FDiv2Bissection<FReal, LeafClass, CellClass> GridClass;
GridClass grid(dim, height);
......@@ -60,8 +60,8 @@ int main(int argc, char** argv){
}
{
typedef FDenseMatrix<FReal> LeafClass;
typedef FDenseMatrix<FReal> CellClass;
typedef FDenseBlock<FReal> LeafClass;
typedef FDenseBlock<FReal> CellClass;
typedef FDiv2Bissection<FReal, LeafClass, CellClass> GridClass;
const int nbPartitions = FMath::pow2(height-1);
......
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