Commit 34dd5b2f authored by Thomas Witkowski's avatar Thomas Witkowski
Browse files

Merged two AMDiS directories, no changes.

parent 99ad7c08
...@@ -180,10 +180,8 @@ namespace AMDiS { ...@@ -180,10 +180,8 @@ namespace AMDiS {
std::list<DOFIndexedBase*>::iterator di; std::list<DOFIndexedBase*>::iterator di;
for (di = dofIndexedList.begin(); di != dofIndexedList.end(); ++di) for (di = dofIndexedList.begin(); di != dofIndexedList.end(); ++di)
if ((*di)->getSize() < newval) { if ((*di)->getSize() < newval)
(*di)->resize(newval); (*di)->resize(newval);
std::cout << "RESIE WITH " << (*di)->getSize() << " " << newval << std::endl;
}
} }
void DOFAdmin::addDOFIndexed(DOFIndexedBase* dofIndexed) void DOFAdmin::addDOFIndexed(DOFIndexedBase* dofIndexed)
......
...@@ -71,10 +71,9 @@ namespace AMDiS { ...@@ -71,10 +71,9 @@ namespace AMDiS {
DOFVectorBase<T>::DOFVectorBase(const FiniteElemSpace *f, std::string n) DOFVectorBase<T>::DOFVectorBase(const FiniteElemSpace *f, std::string n)
: feSpace(f), : feSpace(f),
name(n), name(n),
// elementVector(f->getBasisFcts()->getNumber()), elementVector(f->getBasisFcts()->getNumber()),
boundaryManager(NULL) boundaryManager(NULL)
{ {
/*
nBasFcts = feSpace->getBasisFcts()->getNumber(); nBasFcts = feSpace->getBasisFcts()->getNumber();
dim = feSpace->getMesh()->getDim(); dim = feSpace->getMesh()->getDim();
...@@ -90,8 +89,7 @@ namespace AMDiS { ...@@ -90,8 +89,7 @@ namespace AMDiS {
grdPhis[i] = new DimVec<double>(dim, DEFAULT_VALUE, 0.0); grdPhis[i] = new DimVec<double>(dim, DEFAULT_VALUE, 0.0);
grdTmp[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); D2Phis[i] = new DimMat<double>(dim, NO_INIT);
} }
*/
} }
template<typename T> template<typename T>
...@@ -118,11 +116,11 @@ namespace AMDiS { ...@@ -118,11 +116,11 @@ namespace AMDiS {
template<typename T> template<typename T>
void DOFVector<T>::init(const FiniteElemSpace* f, std::string n) void DOFVector<T>::init(const FiniteElemSpace* f, std::string n)
{ {
// this->name = n; this->name = n;
// this->feSpace = f; this->feSpace = f;
// if (this->feSpace && this->feSpace->getAdmin()) if (this->feSpace && this->feSpace->getAdmin())
// (this->feSpace->getAdmin())->addDOFIndexed(this); (this->feSpace->getAdmin())->addDOFIndexed(this);
// this->boundaryManager = new BoundaryManager(f); this->boundaryManager = new BoundaryManager(f);
} }
template<typename T> template<typename T>
......
...@@ -1130,8 +1130,8 @@ namespace AMDiS { ...@@ -1130,8 +1130,8 @@ namespace AMDiS {
// If there is no value file which should be written, we can delete // If there is no value file which should be written, we can delete
// the information of the macro file. // the information of the macro file.
// if (!valueFilename.length()) if (!valueFilename.length())
// clearMacroFileInfo(); clearMacroFileInfo();
} }
initialized = true; initialized = true;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment