class BoxConstraint has two template parameters now

[[Imported from SVN: r1771]]

staticrod.cc

@@ -28,8 +28,8 @@ using namespace Dune;
 using std::string;
 
 void setTrustRegionObstacles(double trustRegionRadius,
-                             std::vector<BoxConstraint<blocksize> >& trustRegionObstacles,
-                             const std::vector<BoxConstraint<blocksize> >& trueObstacles,
+                             std::vector<BoxConstraint<double,blocksize> >& trustRegionObstacles,
+                             const std::vector<BoxConstraint<double,blocksize> >& trueObstacles,
                              const BitField& dirichletNodes)
 {
     //std::cout << "True obstacles\n" << trueObstacles << std::endl;
@@ -156,8 +156,8 @@ int main (int argc, char *argv[]) try
         hasObstacle[i].setAll();
     }
 
-    std::vector<std::vector<BoxConstraint<3> > > trueObstacles(maxlevel+1);
-    std::vector<std::vector<BoxConstraint<3> > > trustRegionObstacles(maxlevel+1);
+    std::vector<std::vector<BoxConstraint<double,3> > > trueObstacles(maxlevel+1);
+    std::vector<std::vector<BoxConstraint<double,3> > > trustRegionObstacles(maxlevel+1);
 
     for (int i=0; i<maxlevel+1; i++) {
         trueObstacles[i].resize(rod.size(i,1));

staticrod2.cc

@@ -31,8 +31,8 @@ using namespace Dune;
 using std::string;
 
 void setTrustRegionObstacles(double trustRegionRadius,
-                             std::vector<BoxConstraint<blocksize> >& trustRegionObstacles,
-                             const std::vector<BoxConstraint<blocksize> >& trueObstacles,
+                             std::vector<BoxConstraint<double,blocksize> >& trustRegionObstacles,
+                             const std::vector<BoxConstraint<double,blocksize> >& trueObstacles,
                              const BitField& dirichletNodes)
 {
     //std::cout << "True obstacles\n" << trueObstacles << std::endl;
@@ -100,7 +100,7 @@ int main (int argc, char *argv[]) try
     typedef OneDGrid GridType;
     GridType grid(numRodBaseElements, 0, 1);
 
-    std::vector<std::vector<BoxConstraint<3> > > trustRegionObstacles(1);
+    std::vector<std::vector<BoxConstraint<double,3> > > trustRegionObstacles(1);
     std::vector<BitField> hasObstacle(1);
     std::vector<BitField> dirichletNodes(1);
 
@@ -206,7 +206,7 @@ int main (int argc, char *argv[]) try
             hasObstacle[i].setAll();
         }
         
-        std::vector<std::vector<BoxConstraint<3> > > trueObstacles(toplevel+1);
+        std::vector<std::vector<BoxConstraint<double,3> > > trueObstacles(toplevel+1);
         trustRegionObstacles.resize(toplevel+1);
         
         for (int i=0; i<toplevel+1; i++) {