From 930fa72765a1299f5be0eb9808a53896fbe226f1 Mon Sep 17 00:00:00 2001 From: Oliver Sander <sander@igpm.rwth-aachen.de> Date: Tue, 19 Jan 2010 10:14:17 +0000 Subject: [PATCH] dune-solvers --> dune/solvers [[Imported from SVN: r5347]] --- dirneucoupling.cc | 10 +++++----- harmonicmaps.cc | 4 ++-- neudircoupling.cc | 10 +++++----- rod-eoc.cc | 4 ++-- rod3d.cc | 4 ++-- rodobstacle.cc | 12 ++++++------ src/averageinterface.hh | 2 +- src/riemanniantrsolver.cc | 16 ++++++++-------- src/riemanniantrsolver.hh | 6 +++--- src/targetspacertrsolver.cc | 4 ++-- src/targetspacertrsolver.hh | 4 ++-- 11 files changed, 38 insertions(+), 38 deletions(-) diff --git a/dirneucoupling.cc b/dirneucoupling.cc index 15cc2092..7344f59f 100644 --- a/dirneucoupling.cc +++ b/dirneucoupling.cc @@ -10,14 +10,14 @@ #include <dune/common/bitsetvector.hh> #include <dune/common/configparser.hh> -#include <dune-solvers/iterationsteps/multigridstep.hh> -#include <dune-solvers/solvers/loopsolver.hh> -#include <dune-solvers/iterationsteps/projectedblockgsstep.hh> +#include <dune/solvers/iterationsteps/multigridstep.hh> +#include <dune/solvers/solvers/loopsolver.hh> +#include <dune/solvers/iterationsteps/projectedblockgsstep.hh> #ifdef HAVE_IPOPT -#include <dune-solvers/solvers/quadraticipopt.hh> +#include <dune/solvers/solvers/quadraticipopt.hh> #endif #include <dune/ag-common/readbitfield.hh> -#include <dune-solvers/norms/energynorm.hh> +#include <dune/solvers/norms/energynorm.hh> #include <dune/ag-common/boundarypatch.hh> #include <dune/ag-common/prolongboundarypatch.hh> #include <dune/ag-common/sampleonbitfield.hh> diff --git a/harmonicmaps.cc b/harmonicmaps.cc index c631c8b4..72d85341 100644 --- a/harmonicmaps.cc +++ b/harmonicmaps.cc @@ -7,8 +7,8 @@ #include <dune/grid/io/file/amirameshreader.hh> #include <dune/grid/io/file/amirameshwriter.hh> -#include <dune-solvers/solvers/iterativesolver.hh> -#include <dune-solvers/norms/energynorm.hh> +#include <dune/solvers/solvers/iterativesolver.hh> +#include <dune/solvers/norms/energynorm.hh> #include "src/geodesicdifference.hh" #include "src/rodwriter.hh" diff --git a/neudircoupling.cc b/neudircoupling.cc index 26d9b24c..f36db049 100644 --- a/neudircoupling.cc +++ b/neudircoupling.cc @@ -10,14 +10,14 @@ #include <dune/istl/solvers.hh> -#include <dune-solvers/iterationsteps/multigridstep.hh> -#include <dune-solvers/solvers/loopsolver.hh> -#include <dune-solvers/iterationsteps/projectedblockgsstep.hh> +#include <dune/solvers/iterationsteps/multigridstep.hh> +#include <dune/solvers/solvers/loopsolver.hh> +#include <dune/solvers/iterationsteps/projectedblockgsstep.hh> #ifdef HAVE_IPOPT -#include <dune-solvers/solvers/quadraticipopt.hh> +#include <dune/solvers/solvers/quadraticipopt.hh> #endif #include <dune/ag-common/readbitfield.hh> -#include <dune-solvers/norms/energynorm.hh> +#include <dune/solvers/norms/energynorm.hh> #include <dune/ag-common/boundarypatch.hh> #include <dune/ag-common/prolongboundarypatch.hh> #include <dune/ag-common/sampleonbitfield.hh> diff --git a/rod-eoc.cc b/rod-eoc.cc index 3dedf69e..134a73d6 100644 --- a/rod-eoc.cc +++ b/rod-eoc.cc @@ -12,8 +12,8 @@ #include <dune/ag-common/assemblers/localassemblers/laplaceassembler.hh> #include <dune/ag-common/assemblers/localassemblers/massassembler.hh> -#include <dune-solvers/solvers/iterativesolver.hh> -#include <dune-solvers/norms/energynorm.hh> +#include <dune/solvers/solvers/iterativesolver.hh> +#include <dune/solvers/norms/energynorm.hh> #include "src/rigidbodymotion.hh" #include "src/geodesicdifference.hh" diff --git a/rod3d.cc b/rod3d.cc index ebf5d21d..f7be58de 100644 --- a/rod3d.cc +++ b/rod3d.cc @@ -8,8 +8,8 @@ #include <dune/istl/io.hh> -#include <dune-solvers/solvers/iterativesolver.hh> -#include <dune-solvers/norms/energynorm.hh> +#include <dune/solvers/solvers/iterativesolver.hh> +#include <dune/solvers/norms/energynorm.hh> #include "src/rigidbodymotion.hh" #include "src/geodesicdifference.hh" diff --git a/rodobstacle.cc b/rodobstacle.cc index 18d4b4fb..8de47d25 100644 --- a/rodobstacle.cc +++ b/rodobstacle.cc @@ -9,12 +9,12 @@ #include <dune/disc/operators/p1operator.hh> -#include <dune-solvers/iterationsteps/projectedblockgsstep.hh> -#include <dune-solvers/iterationsteps/mmgstep.hh> -#include <dune-solvers/solvers/loopsolver.hh> -#include <dune-solvers/norms/energynorm.hh> -#include <dune-solvers/transferoperators/mandelobsrestrictor.hh> -#include <dune-solvers/transferoperators/truncatedcompressedmgtransfer.hh> +#include <dune/solvers/iterationsteps/projectedblockgsstep.hh> +#include <dune/solvers/iterationsteps/mmgstep.hh> +#include <dune/solvers/solvers/loopsolver.hh> +#include <dune/solvers/norms/energynorm.hh> +#include <dune/solvers/transferoperators/mandelobsrestrictor.hh> +#include <dune/solvers/transferoperators/truncatedcompressedmgtransfer.hh> #include <dune/ag-common/estimators/geometricmarking.hh> #include <dune/ag-common/boundarypatch.hh> diff --git a/src/averageinterface.hh b/src/averageinterface.hh index c2faf7e6..0dae0134 100644 --- a/src/averageinterface.hh +++ b/src/averageinterface.hh @@ -7,7 +7,7 @@ #include <dune/ag-common/dgindexset.hh> #include <dune/ag-common/crossproduct.hh> #include <dune/ag-common/surfmassmatrix.hh> -#include <dune-solvers/numproc.hh> +#include <dune/solvers/numproc.hh> #include "svd.hh" #include "rigidbodymotion.hh" diff --git a/src/riemanniantrsolver.cc b/src/riemanniantrsolver.cc index ebd42f1e..67ac4d3b 100644 --- a/src/riemanniantrsolver.cc +++ b/src/riemanniantrsolver.cc @@ -8,18 +8,18 @@ #include <dune/ag-common/assemblers/localassemblers/massassembler.hh> // For using a monotone multigrid as the inner solver -#include <dune-solvers/iterationsteps/trustregiongsstep.hh> -#include <dune-solvers/iterationsteps/mmgstep.hh> -#include <dune-solvers/transferoperators/truncatedcompressedmgtransfer.hh> -#include <dune-solvers/transferoperators/mandelobsrestrictor.hh> -#include <dune-solvers/solvers/iterativesolver.hh> +#include <dune/solvers/iterationsteps/trustregiongsstep.hh> +#include <dune/solvers/iterationsteps/mmgstep.hh> +#include <dune/solvers/transferoperators/truncatedcompressedmgtransfer.hh> +#include <dune/solvers/transferoperators/mandelobsrestrictor.hh> +#include <dune/solvers/solvers/iterativesolver.hh> #include "maxnormtrustregion.hh" // For using a truncated cg as the inner solver -#include <dune-solvers/solvers/tcgsolver.hh> +#include <dune/solvers/solvers/tcgsolver.hh> -#include <dune-solvers/norms/energynorm.hh> -#include <dune-solvers/norms/h1seminorm.hh> +#include <dune/solvers/norms/energynorm.hh> +#include <dune/solvers/norms/h1seminorm.hh> // for debugging diff --git a/src/riemanniantrsolver.hh b/src/riemanniantrsolver.hh index 34cdd910..cac1074a 100644 --- a/src/riemanniantrsolver.hh +++ b/src/riemanniantrsolver.hh @@ -8,9 +8,9 @@ #include <dune/istl/bcrsmatrix.hh> #include <dune/istl/bvector.hh> -#include <dune-solvers/boxconstraint.hh> -#include <dune-solvers/norms/h1seminorm.hh> -#include <dune-solvers/solvers/solver.hh> +#include <dune/solvers/boxconstraint.hh> +#include <dune/solvers/norms/h1seminorm.hh> +#include <dune/solvers/solvers/solver.hh> #include "geodesicfeassembler.hh" diff --git a/src/targetspacertrsolver.cc b/src/targetspacertrsolver.cc index 0d9e5116..c4d95226 100644 --- a/src/targetspacertrsolver.cc +++ b/src/targetspacertrsolver.cc @@ -1,7 +1,7 @@ // For using a monotone multigrid as the inner solver -#include <dune-solvers/iterationsteps/trustregiongsstep.hh> -#include <dune-solvers/solvers/iterativesolver.hh> +#include <dune/solvers/iterationsteps/trustregiongsstep.hh> +#include <dune/solvers/solvers/iterativesolver.hh> #include "maxnormtrustregion.hh" template <class TargetSpace> diff --git a/src/targetspacertrsolver.hh b/src/targetspacertrsolver.hh index 7210319f..cee788a9 100644 --- a/src/targetspacertrsolver.hh +++ b/src/targetspacertrsolver.hh @@ -3,8 +3,8 @@ #include <dune/istl/matrix.hh> -#include <dune-solvers/boxconstraint.hh> -#include <dune-solvers/solvers/loopsolver.hh> +#include <dune/solvers/boxconstraint.hh> +#include <dune/solvers/solvers/loopsolver.hh> /** \brief Riemannian trust-region solver for geodesic finite-element problems */ template <class TargetSpace> -- GitLab