Renaming: BasisHierarchical{Scalar,Vector,} becomes BasisHierarchical{0Form,1From,}

FunctionSpace/BasisHierarchicalScalar.cpp → FunctionSpace/BasisHierarchical0From.cpp

 #include <sstream>
 #include "Exception.h"
-#include "BasisHierarchicalScalar.h"
+#include "BasisHierarchical0From.h"
 
 using namespace std;
 
-BasisHierarchicalScalar::BasisHierarchicalScalar(void){
+BasisHierarchical0From::BasisHierarchical0From(void){
   // Scalar Basis ? //
   scalar = true;
 
@@ -20,7 +20,7 @@ BasisHierarchicalScalar::BasisHierarchicalScalar(void){
   preEvaluatedGradFunction = NULL;
 }
 
-BasisHierarchicalScalar::~BasisHierarchicalScalar(void){
+BasisHierarchical0From::~BasisHierarchical0From(void){
   // Grad Basis //
   if(hasGrad){
     for(unsigned int i = 0; i < nRefSpace; i++){
@@ -49,17 +49,17 @@ BasisHierarchicalScalar::~BasisHierarchicalScalar(void){
   }
 }
 
-unsigned int BasisHierarchicalScalar::
+unsigned int BasisHierarchical0From::
 getNOrientation(void) const{
   return refSpace->getNPermutation();
 }
 
-unsigned int BasisHierarchicalScalar::
+unsigned int BasisHierarchical0From::
 getOrientation(const MElement& element) const{
   return refSpace->getPermutation(element);
 }
 
-fullMatrix<double>* BasisHierarchicalScalar::
+fullMatrix<double>* BasisHierarchical0From::
 getFunctions(const MElement& element,
 	     double u, double v, double w) const{
 
@@ -77,7 +77,7 @@ getFunctions(const MElement& element,
   return values;
 }
 
-fullMatrix<double>* BasisHierarchicalScalar::
+fullMatrix<double>* BasisHierarchical0From::
 getFunctions(unsigned int orientation,
 	     double u, double v, double w) const{
 
@@ -92,7 +92,7 @@ getFunctions(unsigned int orientation,
   return values;
 }
 
-void BasisHierarchicalScalar::
+void BasisHierarchical0From::
 preEvaluateFunctions(const fullMatrix<double>& point) const{
   // Delete if older //
   if(preEvaluated){
@@ -123,7 +123,7 @@ preEvaluateFunctions(const fullMatrix<double>& point) const{
   preEvaluated = true;
 }
 
-void BasisHierarchicalScalar::
+void BasisHierarchical0From::
 preEvaluateDerivatives(const fullMatrix<double>& point) const{
   // Build Grad //
   if(!hasGrad)
@@ -168,17 +168,17 @@ preEvaluateDerivatives(const fullMatrix<double>& point) const{
   preEvaluatedGrad = true;
 }
 
-const fullMatrix<double>& BasisHierarchicalScalar::
+const fullMatrix<double>& BasisHierarchical0From::
 getPreEvaluatedFunctions(const MElement& element) const{
   return getPreEvaluatedFunctions(refSpace->getPermutation(element));
 }
 
-const fullMatrix<double>& BasisHierarchicalScalar::
+const fullMatrix<double>& BasisHierarchical0From::
 getPreEvaluatedDerivatives(const MElement& element) const{
   return getPreEvaluatedDerivatives(refSpace->getPermutation(element));
 }
 
-const fullMatrix<double>& BasisHierarchicalScalar::
+const fullMatrix<double>& BasisHierarchical0From::
 getPreEvaluatedFunctions(unsigned int orientation) const{
   if(!preEvaluated)
     throw Exception("getPreEvaluatedFunction: function has not been preEvaluated");
@@ -186,7 +186,7 @@ getPreEvaluatedFunctions(unsigned int orientation) const{
   return *preEvaluatedFunction[orientation];
 }
 
-const fullMatrix<double>& BasisHierarchicalScalar::
+const fullMatrix<double>& BasisHierarchical0From::
 getPreEvaluatedDerivatives(unsigned int orientation) const{
   if(!preEvaluatedGrad)
     throw Exception("getPreEvaluatedDerivative: gradient has not been preEvaluated");
@@ -194,7 +194,7 @@ getPreEvaluatedDerivatives(unsigned int orientation) const{
   return *preEvaluatedGradFunction[orientation];
 }
 
-void BasisHierarchicalScalar::getGrad(void) const{
+void BasisHierarchical0From::getGrad(void) const{
   // Alloc //
   grad = new vector<Polynomial>**[nRefSpace];
 
@@ -211,7 +211,7 @@ void BasisHierarchicalScalar::getGrad(void) const{
   hasGrad = true;
 }
 
-string BasisHierarchicalScalar::toString(void) const{
+string BasisHierarchical0From::toString(void) const{
   stringstream stream;
   unsigned int i = 0;
   const unsigned int refSpace = 0;

FunctionSpace/BasisHierarchicalScalar.h → FunctionSpace/BasisHierarchical0From.h

-#ifndef _BASISHIERARCHICALSCALAR_H_
-#define _BASISHIERARCHICALSCALAR_H_
+#ifndef _BASISHIERARCHICAL0FROM_H_
+#define _BASISHIERARCHICAL0FROM_H_
 
 #include <string>
 #include "BasisLocal.h"
@@ -7,13 +7,13 @@
 #include "ReferenceSpace.h"
 
 /**
-   @interface BasisHierarchicalScalar
-   @brief Interface for Hierarchical Scalar Local Basis
+   @interface BasisHierarchical0From
+   @brief Interface for Hierarchical 0-From Local Basis
 
-   This is an interface for Hierarchical Scalar Local Basis.@n
+   This is an interface for Hierarchical 0-From Local Basis.@n
 */
 
-class BasisHierarchicalScalar: public BasisLocal{
+class BasisHierarchical0From: public BasisLocal{
  protected:
   // Orientation //
   ReferenceSpace* refSpace;
@@ -34,7 +34,7 @@ class BasisHierarchicalScalar: public BasisLocal{
   mutable fullMatrix<double>** preEvaluatedGradFunction;
 
  public:
-  virtual ~BasisHierarchicalScalar(void);
+  virtual ~BasisHierarchical0From(void);
 
   virtual unsigned int getNOrientation(void) const;
   virtual unsigned int getOrientation(const MElement& element) const;
@@ -63,7 +63,7 @@ class BasisHierarchicalScalar: public BasisLocal{
   std::string toString(void) const;
 
  protected:
-  BasisHierarchicalScalar(void);
+  BasisHierarchical0From(void);
 
  private:
   void getGrad(void) const;
@@ -71,20 +71,20 @@ class BasisHierarchicalScalar: public BasisLocal{
 
 /**
    @internal
-   @fn BasisHierarchicalScalar::BasisHierarchicalScalar
+   @fn BasisHierarchical0From::BasisHierarchical0From
 
-   Instanciates an new BasisHierarchicalScalar
+   Instanciates an new BasisHierarchical0From
    @endinternal
    **
 
-   @fn BasisHierarchicalScalar::~BasisHierarchicalScalar
+   @fn BasisHierarchical0From::~BasisHierarchical0From
 
-   Deletes this BasisHierarchicalScalar
+   Deletes this BasisHierarchical0From
    **
 
-   @fn BasisHierarchicalScalar::toString
+   @fn BasisHierarchical0From::toString
    @return Returns a string describing this
-   BasisHierarchicalScalar
+   BasisHierarchical0From
  */
 
 #endif

FunctionSpace/BasisHierarchicalVector.cpp → FunctionSpace/BasisHierarchical1From.cpp

 #include <sstream>
 #include "Exception.h"
-#include "BasisHierarchicalVector.h"
+#include "BasisHierarchical1From.h"
 
 using namespace std;
 
-BasisHierarchicalVector::BasisHierarchicalVector(void){
+BasisHierarchical1From::BasisHierarchical1From(void){
   // Scalar Basis ?//
   scalar = false;
 
@@ -20,7 +20,7 @@ BasisHierarchicalVector::BasisHierarchicalVector(void){
   preEvaluatedCurlFunction = NULL;
 }
 
-BasisHierarchicalVector::~BasisHierarchicalVector(void){
+BasisHierarchical1From::~BasisHierarchical1From(void){
   // Curl Basis //
   if(hasCurl){
     for(unsigned int i = 0; i < nRefSpace; i++){
@@ -49,17 +49,17 @@ BasisHierarchicalVector::~BasisHierarchicalVector(void){
   }
 }
 
-unsigned int BasisHierarchicalVector::
+unsigned int BasisHierarchical1From::
 getNOrientation(void) const{
   return refSpace->getNPermutation();
 }
 
-unsigned int BasisHierarchicalVector::
+unsigned int BasisHierarchical1From::
 getOrientation(const MElement& element) const{
   return refSpace->getPermutation(element);
 }
 
-fullMatrix<double>* BasisHierarchicalVector::
+fullMatrix<double>* BasisHierarchical1From::
 getFunctions(const MElement& element,
 	     double u, double v, double w) const{
 
@@ -83,7 +83,7 @@ getFunctions(const MElement& element,
   return values;
 }
 
-fullMatrix<double>* BasisHierarchicalVector::
+fullMatrix<double>* BasisHierarchical1From::
 getFunctions(unsigned int orientation,
 	     double u, double v, double w) const{
 
@@ -104,7 +104,7 @@ getFunctions(unsigned int orientation,
   return values;
 }
 
-void BasisHierarchicalVector::
+void BasisHierarchical1From::
 preEvaluateFunctions(const fullMatrix<double>& point) const{
   // Delete if older //
   if(preEvaluated){
@@ -145,7 +145,7 @@ preEvaluateFunctions(const fullMatrix<double>& point) const{
   preEvaluated = true;
 }
 
-void BasisHierarchicalVector::
+void BasisHierarchical1From::
 preEvaluateDerivatives(const fullMatrix<double>& point) const{
   // Build Curl //
   if(!hasCurl)
@@ -190,17 +190,17 @@ preEvaluateDerivatives(const fullMatrix<double>& point) const{
   preEvaluatedCurl = true;
 }
 
-const fullMatrix<double>& BasisHierarchicalVector::
+const fullMatrix<double>& BasisHierarchical1From::
 getPreEvaluatedFunctions(const MElement& element) const{
   return getPreEvaluatedFunctions(refSpace->getPermutation(element));
 }
 
-const fullMatrix<double>& BasisHierarchicalVector::
+const fullMatrix<double>& BasisHierarchical1From::
 getPreEvaluatedDerivatives(const MElement& element) const{
   return getPreEvaluatedDerivatives(refSpace->getPermutation(element));
 }
 
-const fullMatrix<double>& BasisHierarchicalVector::
+const fullMatrix<double>& BasisHierarchical1From::
 getPreEvaluatedFunctions(unsigned int orientation) const{
   if(!preEvaluated)
     throw Exception("getPreEvaluatedFunction: function has not been preEvaluated");
@@ -208,7 +208,7 @@ getPreEvaluatedFunctions(unsigned int orientation) const{
   return *preEvaluatedFunction[orientation];
 }
 
-const fullMatrix<double>& BasisHierarchicalVector::
+const fullMatrix<double>& BasisHierarchical1From::
 getPreEvaluatedDerivatives(unsigned int orientation) const{
   if(!preEvaluatedCurl)
     throw Exception("getPreEvaluatedDerivative: curl has not been preEvaluated");
@@ -216,7 +216,7 @@ getPreEvaluatedDerivatives(unsigned int orientation) const{
   return *preEvaluatedCurlFunction[orientation];
 }
 
-void BasisHierarchicalVector::getCurl(void) const{
+void BasisHierarchical1From::getCurl(void) const{
   // Alloc //
   curl = new vector<Polynomial>**[nRefSpace];
 
@@ -233,7 +233,7 @@ void BasisHierarchicalVector::getCurl(void) const{
   hasCurl = true;
 }
 
-string BasisHierarchicalVector::toString(void) const{
+string BasisHierarchical1From::toString(void) const{
   stringstream stream;
   unsigned int i = 0;
   const unsigned int refSpace = 0;

FunctionSpace/BasisHierarchicalVector.h → FunctionSpace/BasisHierarchical1From.h

-#ifndef _BASISHIERARCHICALVECTOR_H_
-#define _BASISHIERARCHICALVECTOR_H_
+#ifndef _BASISHIERARCHICAL1FROM_H_
+#define _BASISHIERARCHICAL1FROM_H_
 
 #include <string>
 #include "BasisLocal.h"
@@ -7,13 +7,13 @@
 #include "ReferenceSpace.h"
 
 /**
-   @interface BasisHierarchicalVector
-   @brief Interface for Hierarchical Vectorial Local Basis
+   @interface BasisHierarchical1From
+   @brief Interface for Hierarchical 1-Froml Local Basis
 
-   This is an interface for Hierarchical Vectorial Local Basis.@n
+   This is an interface for Hierarchical 1-Froml Local Basis.@n
 */
 
-class BasisHierarchicalVector: public BasisLocal{
+class BasisHierarchical1From: public BasisLocal{
  protected:
   // Orientation //
   ReferenceSpace* refSpace;
@@ -34,7 +34,7 @@ class BasisHierarchicalVector: public BasisLocal{
   mutable fullMatrix<double>** preEvaluatedCurlFunction;
 
  public:
-  virtual ~BasisHierarchicalVector(void);
+  virtual ~BasisHierarchical1From(void);
 
   virtual unsigned int getNOrientation(void) const;
   virtual unsigned int getOrientation(const MElement& element) const;
@@ -63,7 +63,7 @@ class BasisHierarchicalVector: public BasisLocal{
   std::string toString(void) const;
 
  protected:
-  BasisHierarchicalVector(void);
+  BasisHierarchical1From(void);
 
  private:
   void getCurl(void) const;
@@ -71,20 +71,20 @@ class BasisHierarchicalVector: public BasisLocal{
 
 /**
    @internal
-   @fn BasisHierarchicalVector::BasisHierarchicalVector
+   @fn BasisHierarchical1From::BasisHierarchical1From
 
-   Instanciates an new BasisHierarchicalVector
+   Instanciates an new BasisHierarchical1From
    @endinternal
    **
 
-   @fn BasisHierarchicalVector::~BasisHierarchicalVector
+   @fn BasisHierarchical1From::~BasisHierarchical1From
 
-   Deletes this BasisHierarchicalVector
+   Deletes this BasisHierarchical1From
    **
 
-   @fn BasisHierarchicalVector::toString
+   @fn BasisHierarchical1From::toString
    @return Returns a string describing this
-   BasisHierarchicalVector
+   BasisHierarchical1From
  */
 
 #endif

FunctionSpace/CMakeLists.txt

@@ -17,8 +17,8 @@ set(SRC
   BasisGenerator.cpp
 
   BasisLagrange.cpp
-  BasisHierarchicalScalar.cpp
-  BasisHierarchicalVector.cpp
+  BasisHierarchical0From.cpp
+  BasisHierarchical1From.cpp
 
   LineNodeBasis.cpp
   LineEdgeBasis.cpp

FunctionSpace/HexEdgeBasis.h

 #ifndef _HEXEDGEBASIS_H_
 #define _HEXEDGEBASIS_H_
 
-#include "BasisHierarchicalVector.h"
+#include "BasisHierarchical1From.h"
 
 /**
    @class HexEdgeBasis
@@ -15,7 +15,7 @@
    Basis for @em high @em order Polynomial%s generation.@n
  */
 
-class HexEdgeBasis: public BasisHierarchicalVector{
+class HexEdgeBasis: public BasisHierarchical1From{
  public:
   //! @param order The order of the Basis
   //!

FunctionSpace/HexNodeBasis.h

 #ifndef _HEXNODEBASIS_H_
 #define _HEXNODEBASIS_H_
 
-#include "BasisHierarchicalScalar.h"
+#include "BasisHierarchical0From.h"
 
 /**
    @class HexNodeBasis
@@ -15,7 +15,7 @@
    Basis for @em high @em order Polynomial%s generation.@n
  */
 
-class HexNodeBasis: public BasisHierarchicalScalar{
+class HexNodeBasis: public BasisHierarchical0From{
  public:
   //! @param order The order of the Basis
   //!

FunctionSpace/LineEdgeBasis.h

 #ifndef _LINEEDGEBASIS_H_
 #define _LINEEDGEBASIS_H_
 
-#include "BasisHierarchicalVector.h"
+#include "BasisHierarchical1From.h"
 
 /**
    @class LineEdgeBasis
@@ -19,7 +19,7 @@
    It also uses the following mapping: @f$x = \frac{u + 1}{2}@f$.
 */
 
-class LineEdgeBasis: public BasisHierarchicalVector{
+class LineEdgeBasis: public BasisHierarchical1From{
  public:
   //! @param order The order of the Basis
   //!

FunctionSpace/LineNedelecBasis.h

 #ifndef _LINENEDELECBASIS_H_
 #define _LINENEDELECBASIS_H_
 
-#include "BasisHierarchicalVector.h"
+#include "BasisHierarchical1From.h"
 
 /**
    @class LineNedelecBasis
@@ -11,7 +11,7 @@
    for Lines.@n
 */
 
-class LineNedelecBasis: public BasisHierarchicalVector{
+class LineNedelecBasis: public BasisHierarchical1From{
  public:
   //! Returns a new Nedelec Basis for Lines
   //!

FunctionSpace/LineNodeBasis.h

 #ifndef _LINENODEBASIS_H_
 #define _LINENODEBASIS_H_
 
-#include "BasisHierarchicalScalar.h"
+#include "BasisHierarchical0From.h"
 
 /**
    @class LineNodeBasis
@@ -19,7 +19,7 @@
    It also uses the following mapping: @f$x = \frac{u + 1}{2}@f$.
  */
 
-class LineNodeBasis: public BasisHierarchicalScalar{
+class LineNodeBasis: public BasisHierarchical0From{
  public:
   //! @param order The order of the Basis
   //!

FunctionSpace/QuadEdgeBasis.h

 #ifndef _QUADEDGEBASIS_H_
 #define _QUADEDGEBASIS_H_
 
-#include "BasisHierarchicalVector.h"
+#include "BasisHierarchical1From.h"
 
 /**
    @class QuadEdgeBasis
@@ -19,7 +19,7 @@
    @li @f$y = \frac{v + 1}{2}@f$
 */
 
-class QuadEdgeBasis: public BasisHierarchicalVector{
+class QuadEdgeBasis: public BasisHierarchical1From{
  public:
   //! @param order The order of the Basis
   //!

FunctionSpace/QuadNodeBasis.h

 #ifndef _QUADNODEBASIS_H_
 #define _QUADNODEBASIS_H_
 
-#include "BasisHierarchicalScalar.h"
+#include "BasisHierarchical0From.h"
 
 /**
    @class QuadNodeBasis
@@ -19,7 +19,7 @@
    @li @f$y = \frac{v + 1}{2}@f$
 */
 
-class QuadNodeBasis: public BasisHierarchicalScalar{
+class QuadNodeBasis: public BasisHierarchical0From{
  public:
   //! @param order The order of the Basis
   //!

FunctionSpace/TetEdgeBasis.h

 #ifndef _TETEDGEBASIS_H_
 #define _TETEDGEBASIS_H_
 
-#include "BasisHierarchicalVector.h"
+#include "BasisHierarchical1From.h"
 
 /**
    @class TetEdgeBasis
@@ -15,7 +15,7 @@
    Basis for @em high @em order Polynomial%s generation.@n
 */
 
-class TetEdgeBasis: public BasisHierarchicalVector{
+class TetEdgeBasis: public BasisHierarchical1From{
  public:
   //! @param order The order of the Basis
   //!

FunctionSpace/TetNodeBasis.h

 #ifndef _TETNODEBASIS_H_
 #define _TETNODEBASIS_H_
 
-#include "BasisHierarchicalScalar.h"
+#include "BasisHierarchical0From.h"
 
 /**
    @class TetNodeBasis
@@ -15,7 +15,7 @@
    Basis for @em high @em order Polynomial%s generation.@n
  */
 
-class TetNodeBasis: public BasisHierarchicalScalar{
+class TetNodeBasis: public BasisHierarchical0From{
  public:
   //! @param order The order of the Basis
   //!

FunctionSpace/TriEdgeBasis.h

 #ifndef _TRIEDGEBASIS_H_
 #define _TRIEDGEBASIS_H_
 
-#include "BasisHierarchicalVector.h"
+#include "BasisHierarchical1From.h"
 
 /**
    @class TriEdgeBasis
@@ -15,7 +15,7 @@
    Basis for @em high @em order Polynomial%s generation.@n
 */
 
-class TriEdgeBasis: public BasisHierarchicalVector{
+class TriEdgeBasis: public BasisHierarchical1From{
  public:
   //! @param order The order of the Basis
   //!

FunctionSpace/TriNedelecBasis.h

 #ifndef _TRINEDELECBASIS_H_
 #define _TRINEDELECBASIS_H_
 
-#include "BasisHierarchicalVector.h"
+#include "BasisHierarchical1From.h"
 
 /**
    @class TriNedelecBasis
@@ -11,7 +11,7 @@
    for Triangles.@n
 */
 
-class TriNedelecBasis: public BasisHierarchicalVector{
+class TriNedelecBasis: public BasisHierarchical1From{
  public:
   //! Returns a new Nedelec Basis for Triangles
   //!

FunctionSpace/TriNodeBasis.h

 #ifndef _TRINODEBASIS_H_
 #define _TRINODEBASIS_H_
 
-#include "BasisHierarchicalScalar.h"
+#include "BasisHierarchical0From.h"
 
 /**
    @class TriNodeBasis
@@ -15,7 +15,7 @@
    Basis for @em high @em order Polynomial%s generation.@n
  */
 
-class TriNodeBasis: public BasisHierarchicalScalar{
+class TriNodeBasis: public BasisHierarchical0From{
  public:
   //! @param order The order of the Basis
   //!