Skip to content
Snippets Groups Projects
Commit 2e20a1eb authored by Nicolas Marsic's avatar Nicolas Marsic
Browse files

Same Canva for all Basis -- Quads OK -- Hex ToBeDone

parent 58bedb0a
No related branches found
No related tags found
No related merge requests found
......@@ -25,9 +25,6 @@ class BasisScalar: public Basis{
std::vector<std::vector<Polynomial*>*>* face;
std::vector <Polynomial*>* cell;
std::vector<const Polynomial*>* basis;
std::vector<const Polynomial*>* revBasis;
public:
//! Deletes this BasisScalar
//!
......
......@@ -25,9 +25,6 @@ class BasisVector: public Basis{
std::vector<std::vector<std::vector<Polynomial>*>*>* face;
std::vector <std::vector<Polynomial>*>* cell;
std::vector<const std::vector<Polynomial>*>* basis;
std::vector<const std::vector<Polynomial>*>* revBasis;
public:
//! Deletes this BasisVector
//!
......
......@@ -4,7 +4,8 @@
using namespace std;
HexEdgeBasis::HexEdgeBasis(const int order){
HexEdgeBasis::HexEdgeBasis(int order){
/*
// Set Basis Type //
this->order = order;
......@@ -46,7 +47,7 @@ HexEdgeBasis::HexEdgeBasis(const int order){
Polynomial* liftingSub = new Polynomial[12];
// Integrated and classical Legendre Polynomial //
// Legendre Polynomial //
Legendre::integrated(intLegendre, orderPlus);
Legendre::legendre(legendre, order);
......@@ -452,11 +453,14 @@ HexEdgeBasis::HexEdgeBasis(const int order){
// Set Basis //
this->basis = new std::vector<const std::vector<Polynomial>*>
(basis.begin(), basis.end());
*/
}
HexEdgeBasis::~HexEdgeBasis(void){
/*
for(int i = 0; i < size; i++)
delete (*basis)[i];
delete basis;
*/
}
......@@ -20,7 +20,7 @@ class HexEdgeBasis: public BasisVector{
//! @param order The order of the Basis
//!
//! Returns a new Edge-Basis for Hexahedra of the given order
HexEdgeBasis(const int order);
HexEdgeBasis(int order);
//! Deletes this Basis
//!
......
......@@ -3,7 +3,8 @@
using namespace std;
HexNodeBasis::HexNodeBasis(const int order){
HexNodeBasis::HexNodeBasis(int order){
/*
// Set Basis Type //
this->order = order;
......@@ -90,7 +91,7 @@ HexNodeBasis::HexNodeBasis(const int order){
(Polynomial(1, 0, 1, 0)) +
Polynomial(1, 0, 0, 1);
/*
// Basis //
basis = new std::vector<const Polynomial*>(size);
......@@ -217,7 +218,7 @@ HexNodeBasis::HexNodeBasis(const int order){
}
}
*/
// Free Temporary Sapce //
delete[] legendre;
delete[] lifting;
......@@ -225,9 +226,11 @@ HexNodeBasis::HexNodeBasis(const int order){
delete[] xi;
delete[] eta;
delete[] lambda;
*/
}
HexNodeBasis::~HexNodeBasis(void){
/*
// Vertex Based //
for(int i = 0; i < nVertex; i++)
delete (*node)[i];
......@@ -262,4 +265,5 @@ HexNodeBasis::~HexNodeBasis(void){
delete (*cell)[i];
delete cell;
*/
}
......@@ -20,7 +20,7 @@ class HexNodeBasis: public BasisScalar{
//! @param order The order of the Basis
//!
//! Returns a new Node-Basis for Hexahedra of the given order
HexNodeBasis(const int order);
HexNodeBasis(int order);
//! @return Deletes this Basis
//!
......
......@@ -3,7 +3,7 @@
using namespace std;
QuadEdgeBasis::QuadEdgeBasis(const int order){
QuadEdgeBasis::QuadEdgeBasis(int order){
// Set Basis Type //
this->order = order;
......
......@@ -20,7 +20,7 @@ class QuadEdgeBasis: public BasisVector{
//! @param order The order of the Basis
//!
//! Returns a new Edge-Basis for Quads of the given order
QuadEdgeBasis(const int order);
QuadEdgeBasis(int order);
//! Deletes this Basis
//!
......
......@@ -3,7 +3,7 @@
using namespace std;
QuadNodeBasis::QuadNodeBasis(const int order){
QuadNodeBasis::QuadNodeBasis(int order){
// Set Basis Type //
this->order = order;
......
......@@ -20,7 +20,7 @@ class QuadNodeBasis: public BasisScalar{
//! @param order The order of the Basis
//!
//! Returns a new Node-Basis for Quads of the given order
QuadNodeBasis(const int order);
QuadNodeBasis(int order);
//! @return Deletes this Basis
//!
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment