Fix LineEdgeBasis: went wrong way -- Add LineLagrangeBasis

FunctionSpace/BasisGenerator.cpp

@@ -5,6 +5,7 @@
 #include "LineNodeBasis.h"
 #include "LineEdgeBasis.h"
 #include "LineNedelecBasis.h"
+#include "LineLagrangeBasis.h"
 
 #include "QuadNodeBasis.h"
 #include "QuadEdgeBasis.h"
@@ -68,7 +69,7 @@ BasisLocal* BasisGenerator::generateLagrange(unsigned int elementType,
 		basisType);
 
   switch(elementType){
-  case TYPE_LIN: throw Exception("Lagrange Basis on Lines not Implemented");
+  case TYPE_LIN: return new LineLagrangeBasis(order);
   case TYPE_TRI: return new TriLagrangeBasis(order);
   case TYPE_QUA: throw Exception("Lagrange Basis on Quads not Implemented");
   case TYPE_TET: return new TetLagrangeBasis(order);

FunctionSpace/CMakeLists.txt

@@ -23,6 +23,7 @@ set(SRC
   LineNodeBasis.cpp
   LineEdgeBasis.cpp
   LineNedelecBasis.cpp
+  LineLagrangeBasis.cpp
 
 #  QuadNodeBasis.cpp
 #  QuadEdgeBasis.cpp

FunctionSpace/LineEdgeBasis.cpp

@@ -29,18 +29,18 @@ LineEdgeBasis::LineEdgeBasis(unsigned int order){
   Polynomial* intLegendre = new Polynomial[orderPlus];
 
   vector<Polynomial> first(3);
-  first[0] = Polynomial(+0.5, 0, 0, 0);
+  first[0] = Polynomial(-0.5, 0, 0, 0);
   first[1] = Polynomial( 0  , 0, 0, 0);
   first[2] = Polynomial( 0  , 0, 0, 0);
 
   vector<Polynomial> second(3);
-  second[0] = Polynomial(-0.5, 0, 0, 0);
+  second[0] = Polynomial(+0.5, 0, 0, 0);
   second[1] = Polynomial( 0  , 0, 0, 0);
   second[2] = Polynomial( 0  , 0, 0, 0);
 
   const Polynomial x[2] = {
-    Polynomial(+1, 1, 0, 0),
-    Polynomial(-1, 1, 0, 0)
+    Polynomial(-1, 1, 0, 0),
+    Polynomial(+1, 1, 0, 0)
   };
 
   // Legendre Polynomial //

FunctionSpace/LineLagrangeBasis.cpp

+#include "Exception.h"
+#include "LineLagrangeBasis.h"
+
+LineLagrangeBasis::LineLagrangeBasis(unsigned int order){
+  // If order 0 (Nedelec): use order 1
+  if(order == 0)
+    order = 1;
+
+  // Set Basis Type //
+  this->order = order;
+
+  type = 0;
+  dim  = 1;
+
+  nVertex   = 2;
+  nEdge     = (order - 1);
+  nFace     = 0;
+  nCell     = 0;
+  nFunction = nVertex + nEdge + nFace + nCell;
+
+  // Init polynomialBasis //
+  lBasis = new polynomialBasis(getTag(order));
+
+  // Init Lagrange Point //
+  lPoint = new fullMatrix<double>(linePoint(order));
+}
+
+LineLagrangeBasis::~LineLagrangeBasis(void){
+  delete lBasis;
+  delete lPoint;
+}
+
+unsigned int LineLagrangeBasis::getTag(unsigned int order){
+  unsigned int tag = nodalBasis::getTag(TYPE_LIN, order, false);
+
+  if(tag)
+    return tag;
+
+  else
+    throw Exception
+      ("Can't instanciate an order %d Lagrangian Basis for a Line",
+       order);
+}
+
+fullMatrix<double> LineLagrangeBasis::
+linePoint(unsigned int order){
+  fullMatrix<double> line(order + 1, 1);
+  line(0 ,0) = 0;
+
+  if(order > 0){
+    line(0, 0) = -1.;
+    line(1, 0) =  1.;
+
+    double dd = 2. / order;
+
+    for(unsigned int i = 2; i < order + 1; i++)
+      line(i, 0) = -1. + dd * (i - 1);
+  }
+
+  return line;
+}

FunctionSpace/LineLagrangeBasis.h

+#ifndef _LINELAGRANGEBASIS_H_
+#define _LINELAGRANGEBASIS_H_
+
+#include "BasisLagrange.h"
+
+/**
+   @class LineLagrangeBasis
+   @brief Lagrange Basis for Lines
+
+   This class can instantiate a @em Lagrange @em Basis
+   for a Line and for a given Order.@n
+
+   It uses
+   <a href="http://geuz.org/gmsh/">gmsh</a> Basis.
+ */
+
+class LineLagrangeBasis: public BasisLagrange{
+ public:
+  //! @param order A natural number
+  //!
+  //! Returns a new LineLagrangeBasis
+  //! of the given Order
+  LineLagrangeBasis(unsigned int order);
+
+  //! Deletes this Basis
+  //!
+  virtual ~LineLagrangeBasis(void);
+
+ private:
+  //! @param order A natural number
+  //! @return Returns the @em tag of a @em Line of
+  //! the given order
+  static unsigned int getTag(unsigned int order);
+
+  //! @param order A natural number
+  //! @return Returns Lagrangian Points on a Line
+  //! for the given Order
+  static fullMatrix<double> linePoint(unsigned int order);
+};
+
+#endif

FunctionSpace/LineNedelecBasis.cpp

@@ -23,12 +23,12 @@ LineNedelecBasis::LineNedelecBasis(void){
 
   // Alloc Temporary Space //
   vector<Polynomial> first(3);
-  first[0] = Polynomial(+0.5, 0, 0, 0);
+  first[0] = Polynomial(-0.5, 0, 0, 0);
   first[1] = Polynomial( 0  , 0, 0, 0);
   first[2] = Polynomial( 0  , 0, 0, 0);
 
   vector<Polynomial> second(3);
-  second[0] = Polynomial(-0.5, 0, 0, 0);
+  second[0] = Polynomial(+0.5, 0, 0, 0);
   second[1] = Polynomial( 0  , 0, 0, 0);
   second[2] = Polynomial( 0  , 0, 0, 0);
 

FunctionSpace/TriLagrangeBasis.cpp

@@ -14,8 +14,8 @@ TriLagrangeBasis::TriLagrangeBasis(unsigned int order){
 
   nVertex   = 3;
   nEdge     = 3 * (order - 1);
-  nFace     = 0;
-  nCell     =     (order - 1) * (order - 2) / 2;
+  nFace     =     (order - 1) * (order - 2) / 2;
+  nCell     = 0;
   nFunction = nVertex + nEdge + nFace + nCell;
 
   // Init polynomialBasis //