From 2b9b2e9d105b7654dc8c688638b7441da9e89661 Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Fri, 28 Sep 2007 12:28:23 +0000
Subject: [PATCH] removed occurrences of Dune::Array and Dune::SimpleVector
[[Imported from SVN: r1648]]
---
staticrod.cc | 6 +++---
staticrod2.cc | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/staticrod.cc b/staticrod.cc
index 46190399..d7e1af80 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 0143b22c..8b7f7ed3 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++) {
--
GitLab