From fa09e8a5813c7e15f720daea05fa9db25c3122fd Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Fri, 27 Nov 2009 16:02:05 +0000
Subject: [PATCH] pp
---
Solver/functionSpace.h | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/Solver/functionSpace.h b/Solver/functionSpace.h
index e413f902f3..cc7ea643c9 100644
--- a/Solver/functionSpace.h
+++ b/Solver/functionSpace.h
@@ -59,8 +59,6 @@ template<> struct TensorialTraits<SVector3>
typedef SVector3 CurlType;
};
-
-
template<class T>
class FunctionSpace {
protected:
@@ -71,7 +69,6 @@ class FunctionSpace {
typedef typename TensorialTraits<T>::CurlType CurlType;*/
public:
-
virtual int f(MElement *ele, double u, double v, double w, std::vector<ValType> &vals)=0;
virtual int gradf(MElement *ele, double u, double v, double w,std::vector<GradType> &grads)=0;
// virtual int gradf(MElement *ele, double u, double v, double w,std::vector<GradType> &grads, STensor3 &invjac)=0;// on passe le jacobien que l'on veut ...
@@ -83,13 +80,9 @@ class FunctionSpace {
virtual int getKeys(MElement *ele, std::vector<Dof> &keys)=0;
};
-
-
-
class ScalarLagrangeFunctionSpace : public FunctionSpace<double>
{
-
-protected:
+ protected:
typedef TensorialTraits<double>::ValType ValType;
typedef TensorialTraits<double>::GradType GradType;
typedef TensorialTraits<double>::HessType HessType;
@@ -103,11 +96,10 @@ protected:
{
// int iComp = i / ele->getNumVertices();
// int ithLocalVertex = i % ele->getNumVertices();
- return Dof(ele->getVertex(i)->getNum(),_iField);
+ return Dof(ele->getVertex(i)->getNum(), _iField);
}
-
- public:
+ public:
ScalarLagrangeFunctionSpace(int i=0):_iField(i) {}
virtual int getId(void) const {return _iField;};
virtual int f(MElement *ele, double u, double v, double w, std::vector<ValType> &vals)
--
GitLab