Skip to content
Snippets Groups Projects
Commit 6fbe4865 authored by Sander, Oliver's avatar Sander, Oliver
Browse files

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.
parent cda8985f
No related branches found
No related tags found
No related merge requests found
......@@ -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:
......
......@@ -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
......
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