diff --git a/AMDiS/src/DOFAdmin.cc b/AMDiS/src/DOFAdmin.cc index 4f1be2a04bf19a03b59a860491d75ad76d0c551b..d3007521b42e507acb79d6103ca72ecfd57fb348 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 7b07936c2f243040682aec9c29c1b694f737de7d..929946ea7723d348fb6b7ca2747b40bfb3316378 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 b676d557ca29ff2f4e1ccb8bc374fc075cc4104a..c6ad81748545e002e9b730c3e7780594506fb9c4 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;