diff --git a/staticrod.cc b/staticrod.cc index 46190399f1cd14d1402ec5949d60f90af787a1ab..d7e1af8015b0b0849e73a0b9db22ef97d32b26fc 100644 --- a/staticrod.cc +++ b/staticrod.cc @@ -149,15 +149,15 @@ int main (int argc, char *argv[]) try // Create obstacles // ////////////////////////////////////////////////////////// - Array<BitField> hasObstacle; + std::vector<BitField> hasObstacle; hasObstacle.resize(maxLevel+1); for (int i=0; i<hasObstacle.size(); i++) { hasObstacle[i].resize(rod.size(i, 1)); hasObstacle[i].setAll(); } - Array<std::vector<BoxConstraint<3> > > trueObstacles(maxlevel+1); - Array<std::vector<BoxConstraint<3> > > trustRegionObstacles(maxlevel+1); + std::vector<std::vector<BoxConstraint<3> > > trueObstacles(maxlevel+1); + std::vector<std::vector<BoxConstraint<3> > > trustRegionObstacles(maxlevel+1); for (int i=0; i<maxlevel+1; i++) { trueObstacles[i].resize(rod.size(i,1)); diff --git a/staticrod2.cc b/staticrod2.cc index 0143b22c8b75e9cc645eea73f6cce06c0e709ebd..8b7f7ed30cadd6a7caa0ed98287ba0ce1ceec99c 100644 --- a/staticrod2.cc +++ b/staticrod2.cc @@ -32,7 +32,7 @@ using std::string; void setTrustRegionObstacles(double trustRegionRadius, std::vector<BoxConstraint<blocksize> >& trustRegionObstacles, - const SimpleVector<BoxConstraint<blocksize> >& trueObstacles, + const std::vector<BoxConstraint<blocksize> >& trueObstacles, const BitField& dirichletNodes) { //std::cout << "True obstacles\n" << trueObstacles << std::endl; @@ -100,8 +100,8 @@ int main (int argc, char *argv[]) try typedef OneDGrid GridType; GridType grid(numRodBaseElements, 0, 1); - Array<std::vector<BoxConstraint<3> > > trustRegionObstacles(1); - Array<BitField> hasObstacle(1); + std::vector<std::vector<BoxConstraint<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(); } - Array<SimpleVector<BoxConstraint<3> > > trueObstacles(toplevel+1); + std::vector<std::vector<BoxConstraint<3> > > trueObstacles(toplevel+1); trustRegionObstacles.resize(toplevel+1); for (int i=0; i<toplevel+1; i++) {