Skip to content
Snippets Groups Projects
Commit 2b9b2e9d authored by Oliver Sander's avatar Oliver Sander Committed by sander@PCPOOL.MI.FU-BERLIN.DE
Browse files

removed occurrences of Dune::Array and Dune::SimpleVector

[[Imported from SVN: r1648]]
parent bd8a598e
No related branches found
No related tags found
No related merge requests found
......@@ -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));
......
......@@ -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++) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment