Store hasObstacle information for each component now to increase flexibility.

dune/solvers/iterationsteps/mmgstep.cc

@@ -24,8 +24,8 @@ preprocess()
     hasObstacleHierarchy_.back() = hasObstacle_;
 
     for (int i=this->mgTransfer_.size()-1; i>=0; i--) {
-        hasObstacleHierarchy_[i] = new Dune::BitSetVector<1>();
-        this->mgTransfer_[i]->restrictScalarBitField(*hasObstacleHierarchy_[i+1], *hasObstacleHierarchy_[i]);
+        hasObstacleHierarchy_[i] = new Dune::BitSetVector<dim>();
+        this->mgTransfer_[i]->restrict(*hasObstacleHierarchy_[i+1], *hasObstacleHierarchy_[i]);
         for (size_t j=0; j<hasObstacleHierarchy_[i]->size(); j++)
             if ((*this->ignoreNodesHierarchy_[i])[j].any())
                 (*hasObstacleHierarchy_[i])[j][0]=false;

dune/solvers/iterationsteps/mmgstep.hh

@@ -51,7 +51,7 @@ public:
     ObstacleRestrictor<VectorType>* obstacleRestrictor_;
 
     //! Bitfield determining which fine grid nodes have an obstacle 
-    Dune::BitSetVector<1>* hasObstacle_;
+    Dune::BitSetVector<dim>* hasObstacle_;
 
     //! Vector containing the obstacle values of the fine grid nodes
     ObstacleVectorType * obstacles_;
@@ -62,7 +62,7 @@ public:
 
 protected:
     //! Bitfield hierarchy containing the coarse obstacle nodes
-    std::vector<Dune::BitSetVector<1>* > hasObstacleHierarchy_;
+    std::vector<Dune::BitSetVector<dim>* > hasObstacleHierarchy_;
 
     //! Hierarchy containing the obstacle values of the coarse obstacles
     std::vector<ObstacleVectorType*>  obstacleHierarchy_;