Merged two AMDiS directories, no changes.

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) 

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>

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;