From 57c0db6e796a95ee392088d3c498f32e5a49b9fc Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Thu, 15 Nov 2007 09:26:26 +0000
Subject: [PATCH] class BoxConstraint has two template parameters now
[[Imported from SVN: r1771]]
---
staticrod.cc | 8 ++++----
staticrod2.cc | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/staticrod.cc b/staticrod.cc
index b59d539f..829571f8 100644
--- a/staticrod.cc
+++ b/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));
diff --git a/staticrod2.cc b/staticrod2.cc
index 707aca31..f3661088 100644
--- a/staticrod2.cc
+++ b/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++) {
--
GitLab