From eed0078de7c29abdc5200d6e152490ed07612ca1 Mon Sep 17 00:00:00 2001
From: Nicolas Marsic <nicolas.marsic@gmail.com>
Date: Wed, 23 Jan 2013 15:47:19 +0000
Subject: [PATCH] GroupOfElement in FunctionSpace can be modified -- Reordering
---
FunctionSpace/FunctionSpace.cpp | 2 +-
FunctionSpace/FunctionSpace.h | 12 ++++++------
FunctionSpace/FunctionSpaceScalar.cpp | 2 +-
FunctionSpace/FunctionSpaceScalar.h | 2 +-
FunctionSpace/FunctionSpaceVector.cpp | 2 +-
FunctionSpace/FunctionSpaceVector.h | 2 +-
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/FunctionSpace/FunctionSpace.cpp b/FunctionSpace/FunctionSpace.cpp
index f19ded802a..0f7ca6d6bf 100644
--- a/FunctionSpace/FunctionSpace.cpp
+++ b/FunctionSpace/FunctionSpace.cpp
@@ -42,7 +42,7 @@ FunctionSpace::~FunctionSpace(void){
delete eToGod;
}
-void FunctionSpace::build(const GroupOfElement& goe,
+void FunctionSpace::build(GroupOfElement& goe,
const Basis& basis){
// Save GroupOfElement & Mesh //
diff --git a/FunctionSpace/FunctionSpace.h b/FunctionSpace/FunctionSpace.h
index 1978f54baf..2b513a4842 100644
--- a/FunctionSpace/FunctionSpace.h
+++ b/FunctionSpace/FunctionSpace.h
@@ -40,8 +40,8 @@
class FunctionSpace{
protected:
// Geometry //
- const Mesh* mesh;
- const GroupOfElement* goe;
+ const Mesh* mesh;
+ GroupOfElement* goe;
// Basis //
std::vector<const Basis*>* basis;
@@ -68,8 +68,8 @@ class FunctionSpace{
const Basis& getBasis(unsigned int i) const;
unsigned int getNBasis(void) const;
- const GroupOfElement& getSupport(void) const;
- bool isScalar(void) const;
+ GroupOfElement& getSupport(void) const;
+ bool isScalar(void) const;
std::vector<Dof> getKeys(const MElement& element) const;
std::vector<Dof> getKeys(const MVertex& vertex) const;
@@ -88,7 +88,7 @@ class FunctionSpace{
// Init
FunctionSpace(void);
- void build(const GroupOfElement& goe,
+ void build(GroupOfElement& goe,
const Basis& basis);
// Dof
@@ -187,7 +187,7 @@ inline unsigned int FunctionSpace::getNBasis(void) const{
return nBasis;
}
-inline const GroupOfElement& FunctionSpace::getSupport(void) const{
+inline GroupOfElement& FunctionSpace::getSupport(void) const{
return *goe;
}
diff --git a/FunctionSpace/FunctionSpaceScalar.cpp b/FunctionSpace/FunctionSpaceScalar.cpp
index c1fd8bcf0a..f65cd8a383 100644
--- a/FunctionSpace/FunctionSpaceScalar.cpp
+++ b/FunctionSpace/FunctionSpaceScalar.cpp
@@ -1,6 +1,6 @@
#include "FunctionSpaceScalar.h"
-FunctionSpaceScalar::FunctionSpaceScalar(const GroupOfElement& goe,
+FunctionSpaceScalar::FunctionSpaceScalar(GroupOfElement& goe,
const Basis& basis){
scalar = true;
build(goe, basis);
diff --git a/FunctionSpace/FunctionSpaceScalar.h b/FunctionSpace/FunctionSpaceScalar.h
index b4eca1b792..ec9979570b 100644
--- a/FunctionSpace/FunctionSpaceScalar.h
+++ b/FunctionSpace/FunctionSpaceScalar.h
@@ -18,7 +18,7 @@
class FunctionSpaceScalar : public FunctionSpace{
public:
- FunctionSpaceScalar(const GroupOfElement& goe, const Basis& basis);
+ FunctionSpaceScalar(GroupOfElement& goe, const Basis& basis);
virtual ~FunctionSpaceScalar(void);
double
diff --git a/FunctionSpace/FunctionSpaceVector.cpp b/FunctionSpace/FunctionSpaceVector.cpp
index 86fb96a70a..5cbb3657f4 100644
--- a/FunctionSpace/FunctionSpaceVector.cpp
+++ b/FunctionSpace/FunctionSpaceVector.cpp
@@ -1,7 +1,7 @@
#include "Mapper.h"
#include "FunctionSpaceVector.h"
-FunctionSpaceVector::FunctionSpaceVector(const GroupOfElement& goe,
+FunctionSpaceVector::FunctionSpaceVector(GroupOfElement& goe,
const Basis& basis){
scalar = false;
build(goe, basis);
diff --git a/FunctionSpace/FunctionSpaceVector.h b/FunctionSpace/FunctionSpaceVector.h
index 08efbd091e..df736855bb 100644
--- a/FunctionSpace/FunctionSpaceVector.h
+++ b/FunctionSpace/FunctionSpaceVector.h
@@ -19,7 +19,7 @@
class FunctionSpaceVector : public FunctionSpace{
public:
- FunctionSpaceVector(const GroupOfElement& goe, const Basis& basis);
+ FunctionSpaceVector(GroupOfElement& goe, const Basis& basis);
virtual ~FunctionSpaceVector(void);
fullVector<double>
--
GitLab