From 6fbe4865a0d5b9147e10800f99eeaf88551a926b Mon Sep 17 00:00:00 2001
From: Oliver Sander <oliver.sander@tu-dresden.de>
Date: Mon, 16 Apr 2018 17:24:12 +0200
Subject: [PATCH] Take TupleVector from dune-common, rather than from
dune-functions
It used to be in dune-functions originally, but got moved to
dune-common eventually. This patch updates the code to reflect
that move.
---
dune/gfe/mixedriemanniantrsolver.hh | 4 ++--
src/mixed-cosserat-continuum.cc | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dune/gfe/mixedriemanniantrsolver.hh b/dune/gfe/mixedriemanniantrsolver.hh
index d291e0e8..19738878 100644
--- a/dune/gfe/mixedriemanniantrsolver.hh
+++ b/dune/gfe/mixedriemanniantrsolver.hh
@@ -11,7 +11,7 @@
#include <dune/grid/utility/globalindexset.hh>
-#include <dune/functions/common/tuplevector.hh>
+#include <dune/common/tuplevector.hh>
#include <dune/solvers/common/boxconstraint.hh>
#include <dune/solvers/norms/h1seminorm.hh>
@@ -47,7 +47,7 @@ class MixedRiemannianTrustRegionSolver
typedef Dune::BlockVector<Dune::FieldVector<field_type, blocksize0> > CorrectionType0;
typedef Dune::BlockVector<Dune::FieldVector<field_type, blocksize1> > CorrectionType1;
typedef Dune::MultiTypeBlockVector<CorrectionType0, CorrectionType1> CorrectionType;
- typedef Dune::Functions::TupleVector<std::vector<TargetSpace0>, std::vector<TargetSpace1> > SolutionType;
+ typedef Dune::TupleVector<std::vector<TargetSpace0>, std::vector<TargetSpace1> > SolutionType;
public:
diff --git a/src/mixed-cosserat-continuum.cc b/src/mixed-cosserat-continuum.cc
index 6682be6d..f44f25d7 100644
--- a/src/mixed-cosserat-continuum.cc
+++ b/src/mixed-cosserat-continuum.cc
@@ -24,6 +24,7 @@ namespace Dune {
#include <dune/common/bitsetvector.hh>
#include <dune/common/parametertree.hh>
#include <dune/common/parametertreeparser.hh>
+#include <dune/common/tuplevector.hh>
#include <dune/grid/uggrid.hh>
#include <dune/grid/onedgrid.hh>
@@ -31,7 +32,6 @@ namespace Dune {
#include <dune/grid/io/file/gmshreader.hh>
-#include <dune/functions/common/tuplevector.hh>
#include <dune/functions/functionspacebases/pqknodalbasis.hh>
#include <dune/functions/functionspacebases/compositebasis.hh>
@@ -93,7 +93,7 @@ int main (int argc, char *argv[]) try
<< std::endl;
using namespace Dune::TypeTree::Indices;
- typedef Dune::Functions::TupleVector<std::vector<RealTuple<double,3> >,
+ typedef Dune::TupleVector<std::vector<RealTuple<double,3> >,
std::vector<Rotation<double,3> > > SolutionType;
// parse data file
--
GitLab