From 34dd5b2fd8e4ded3b875d2803c1b2e7a00fc8b5c Mon Sep 17 00:00:00 2001
From: Thomas Witkowski <thomas.witkowski@gmx.de>
Date: Mon, 4 Jan 2010 09:31:42 +0000
Subject: [PATCH] Merged two AMDiS directories, no changes.
---
AMDiS/src/DOFAdmin.cc | 4 +---
AMDiS/src/DOFVector.hh | 18 ++++++++----------
AMDiS/src/Mesh.cc | 4 ++--
3 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/AMDiS/src/DOFAdmin.cc b/AMDiS/src/DOFAdmin.cc
index 4f1be2a0..d3007521 100755
--- a/AMDiS/src/DOFAdmin.cc
+++ b/AMDiS/src/DOFAdmin.cc
@@ -180,10 +180,8 @@ namespace AMDiS {
std::list<DOFIndexedBase*>::iterator di;
for (di = dofIndexedList.begin(); di != dofIndexedList.end(); ++di)
- if ((*di)->getSize() < newval) {
+ if ((*di)->getSize() < newval)
(*di)->resize(newval);
- std::cout << "RESIE WITH " << (*di)->getSize() << " " << newval << std::endl;
- }
}
void DOFAdmin::addDOFIndexed(DOFIndexedBase* dofIndexed)
diff --git a/AMDiS/src/DOFVector.hh b/AMDiS/src/DOFVector.hh
index 7b07936c..929946ea 100644
--- a/AMDiS/src/DOFVector.hh
+++ b/AMDiS/src/DOFVector.hh
@@ -71,10 +71,9 @@ namespace AMDiS {
DOFVectorBase<T>::DOFVectorBase(const FiniteElemSpace *f, std::string n)
: feSpace(f),
name(n),
- // elementVector(f->getBasisFcts()->getNumber()),
+ elementVector(f->getBasisFcts()->getNumber()),
boundaryManager(NULL)
- {
- /*
+ {
nBasFcts = feSpace->getBasisFcts()->getNumber();
dim = feSpace->getMesh()->getDim();
@@ -90,8 +89,7 @@ namespace AMDiS {
grdPhis[i] = new DimVec<double>(dim, DEFAULT_VALUE, 0.0);
grdTmp[i] = new DimVec<double>(dim, DEFAULT_VALUE, 0.0);
D2Phis[i] = new DimMat<double>(dim, NO_INIT);
- }
- */
+ }
}
template<typename T>
@@ -118,11 +116,11 @@ namespace AMDiS {
template<typename T>
void DOFVector<T>::init(const FiniteElemSpace* f, std::string n)
{
-// this->name = n;
-// this->feSpace = f;
-// if (this->feSpace && this->feSpace->getAdmin())
-// (this->feSpace->getAdmin())->addDOFIndexed(this);
-// this->boundaryManager = new BoundaryManager(f);
+ this->name = n;
+ this->feSpace = f;
+ if (this->feSpace && this->feSpace->getAdmin())
+ (this->feSpace->getAdmin())->addDOFIndexed(this);
+ this->boundaryManager = new BoundaryManager(f);
}
template<typename T>
diff --git a/AMDiS/src/Mesh.cc b/AMDiS/src/Mesh.cc
index b676d557..c6ad8174 100644
--- a/AMDiS/src/Mesh.cc
+++ b/AMDiS/src/Mesh.cc
@@ -1130,8 +1130,8 @@ namespace AMDiS {
// If there is no value file which should be written, we can delete
// the information of the macro file.
-// if (!valueFilename.length())
-// clearMacroFileInfo();
+ if (!valueFilename.length())
+ clearMacroFileInfo();
}
initialized = true;
--
GitLab