No commit message

No commit message

Solver/functionSpace.h

@@ -79,6 +79,7 @@ class ScalarLagrangeFunctionSpace : public FunctionSpace<double>
   virtual int getId(void) const {return _iField;};
   virtual void f(MElement *ele, double u, double v, double w, std::vector<ValType> &vals)
   {
+    if (ele->getParent()) ele = ele->getParent();
     int ndofs= ele->getNumVertices();
     int curpos=vals.size();
     vals.resize(curpos+ndofs);
@@ -87,6 +88,7 @@ class ScalarLagrangeFunctionSpace : public FunctionSpace<double>
 
   virtual void gradf(MElement *ele, double u, double v, double w,std::vector<GradType> &grads)
   {
+    if (ele->getParent()) ele = ele->getParent();
     int ndofs= ele->getNumVertices();
     grads.reserve(grads.size()+ndofs);
     double gradsuvw[256][3];
@@ -105,6 +107,7 @@ class ScalarLagrangeFunctionSpace : public FunctionSpace<double>
 
   virtual void gradfuvw(MElement *ele, double u, double v, double w,std::vector<GradType> &grads)
   {
+    if (ele->getParent()) ele = ele->getParent();
     int ndofs= ele->getNumVertices();
     grads.reserve(grads.size()+ndofs);
     double gradsuvw[256][3];
@@ -117,10 +120,11 @@ class ScalarLagrangeFunctionSpace : public FunctionSpace<double>
                       ));
   }
 
-  virtual int getNumKeys(MElement *ele) {return ele->getNumVertices();}
+  virtual int getNumKeys(MElement *ele) {if (ele->getParent()) ele = ele->getParent();return ele->getNumVertices();}
 
   virtual void getKeys(MElement *ele, std::vector<Dof> &keys) // appends ...
   {
+      if (ele->getParent()) ele = ele->getParent();
       int ndofs= ele->getNumVertices();
       keys.reserve(keys.size()+ndofs);
       for (int i=0;i<ndofs;++i)
@@ -276,9 +280,9 @@ class CompositeFunctionSpace : public FunctionSpace<T>
   std::vector<FunctionSpace<T>* > _spaces;
  public:
   template <class T1> CompositeFunctionSpace(const T1& t) { _spaces.push_back(new T1(t));}
-  template <class T1, class T2> CompositeFunctionSpace(const T1& t1, const T2& t2)   
-  { _spaces.push_back(new T1(t1));
-    _spaces.push_back(new T2(t2)); } 
+  template <class T1, class T2> CompositeFunctionSpace(T1& t1, T2& t2)
+  { _spaces.push_back(&t1);
+    _spaces.push_back(&t2); }
   template <class T1, class T2, class T3> CompositeFunctionSpace(const T1& t1, const T2& t2, const T3& t3)
   { _spaces.push_back(new T1(t1));
     _spaces.push_back(new T2(t2));
@@ -330,32 +334,40 @@ class xFemFunctionSpace : public FunctionSpace<T>
  public:
   typedef typename TensorialTraits<T>::ValType ValType;
   typedef typename TensorialTraits<T>::GradType GradType;
- private:
+ protected:
   FunctionSpace<T>* _spacebase;
-//  Function<double>* enrichment;
+  //Function<double>* _enrichment;
  public:
-
-  virtual void f(MElement *ele, double u, double v, double w,std::vector<ValType> &vals);
-  virtual void gradf(MElement *ele, double u, double v, double w,std::vector<GradType> &grads);
-  virtual int getNumKeys(MElement *ele);
-  virtual void getKeys(MElement *ele, std::vector<Dof> &keys);
+  xFemFunctionSpace(FunctionSpace<T>* spacebase) : _spacebase(spacebase) {};
+  virtual void f(MElement *ele, double u, double v, double w,std::vector<ValType> &vals){};
+  virtual void gradf(MElement *ele, double u, double v, double w,std::vector<GradType> &grads){};
+  virtual int getNumKeys(MElement *ele){};
+  virtual void getKeys(MElement *ele, std::vector<Dof> &keys){};
 };
 
 
 template<class T,class F>
 class FilteredFunctionSpace : public FunctionSpace<T>
 {
+
+ public :
+
   typedef typename TensorialTraits<T>::ValType ValType;
   typedef typename TensorialTraits<T>::GradType GradType;
- private:
+
+ protected:
+
   FunctionSpace<T>* _spacebase;
-  F &_filter;
+  F *_filter;
 
  public:
-  virtual void f(MElement *ele, double u, double v, double w,std::vector<ValType> &vals);
-  virtual void gradf(MElement *ele, double u, double v, double w,std::vector<GradType> &grads);
-  virtual int getNumKeys(MElement *ele);
-  virtual void getKeys(MElement *ele, std::vector<Dof> &keys);
+  FilteredFunctionSpace<T,F>(FunctionSpace<T>* spacebase,F * filter) : _spacebase(spacebase),_filter(filter)
+  {};
+  virtual void f(MElement *ele, double u, double v, double w,std::vector<ValType> &vals){};;
+  virtual void gradf(MElement *ele, double u, double v, double w,std::vector<GradType> &grads){};;
+  virtual int getNumKeys(MElement *ele){};;
+  virtual void getKeys(MElement *ele, std::vector<Dof> &keys){};
 };
 
+
 #endif