From d279002a9f1ff1f00b352e848a38222f1d974400 Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Tue, 4 Mar 2008 17:01:30 +0000
Subject: [PATCH] new path to ag-common
[[Imported from SVN: r2015]]
---
src/averageinterface.hh | 4 ++--
src/rodassembler.hh | 2 +-
src/rodsolver.cc | 15 ++++++++-------
src/rodsolver.hh | 6 +++---
4 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/averageinterface.hh b/src/averageinterface.hh
index 47a4d2a0..e82d0800 100644
--- a/src/averageinterface.hh
+++ b/src/averageinterface.hh
@@ -4,8 +4,8 @@
#include <dune/common/fmatrix.hh>
#include <dune/disc/shapefunctions/lagrangeshapefunctions.hh>
-#include "../../contact/src/dgindexset.hh"
-#include "../../common/crossproduct.hh"
+#include <dune/ag-common/dgindexset.hh>
+#include <dune/ag-common/crossproduct.hh>
#include "svd.hh"
#include "lapackpp.h"
#undef max
diff --git a/src/rodassembler.hh b/src/rodassembler.hh
index fde97cb2..4da84973 100644
--- a/src/rodassembler.hh
+++ b/src/rodassembler.hh
@@ -7,7 +7,7 @@
#include <dune/istl/matrix.hh>
#include <dune/disc/operators/localstiffness.hh>
-#include "../../common/boundarypatch.hh"
+#include <dune/ag-common/boundarypatch.hh>
#include "configuration.hh"
template<class GridType, class RT>
diff --git a/src/rodsolver.cc b/src/rodsolver.cc
index e23a1f8a..dace1c50 100644
--- a/src/rodsolver.cc
+++ b/src/rodsolver.cc
@@ -6,13 +6,14 @@
#include <dune/disc/miscoperators/laplace.hh>
#include <dune/disc/operators/p1operator.hh>
-#include "../common/trustregiongsstep.hh"
-#include "../contact/src/contactmmgstep.hh"
+#include <dune/ag-common/trustregiongsstep.hh>
+/** \todo Don't hardwire the absolute path here! */
+#include "/home/haile/sander/dune/contact/src/contactmmgstep.hh"
-#include "../common/iterativesolver.hh"
+#include <dune/ag-common/iterativesolver.hh>
-#include "../common/energynorm.hh"
-#include "../common/h1seminorm.hh"
+#include <dune/ag-common/energynorm.hh>
+#include <dune/ag-common/h1seminorm.hh>
#include "configuration.hh"
#include "quaternion.hh"
@@ -33,8 +34,8 @@ setTrustRegionObstacles(double trustRegionRadius,
for (int k=0; k<blocksize; k++) {
- trustRegionObstacles[j].val[2*k] = -trustRegionRadius;
- trustRegionObstacles[j].val[2*k+1] = trustRegionRadius;
+ trustRegionObstacles[j].lower(k) = -trustRegionRadius;
+ trustRegionObstacles[j].upper(k) = trustRegionRadius;
}
diff --git a/src/rodsolver.hh b/src/rodsolver.hh
index 85249b42..4c0721c5 100644
--- a/src/rodsolver.hh
+++ b/src/rodsolver.hh
@@ -6,9 +6,9 @@
#include <dune/istl/bcrsmatrix.hh>
#include <dune/istl/bvector.hh>
-#include "../../common/boxconstraint.hh"
-#include "../common/h1seminorm.hh"
-#include "../../common/iterativesolver.hh"
+#include <dune/ag-common/boxconstraint.hh>
+#include <dune/ag-common/h1seminorm.hh>
+#include <dune/ag-common/iterativesolver.hh>
#include "rodassembler.hh"
--
GitLab