diff --git a/dirneucoupling.cc b/dirneucoupling.cc index 15cc2092be5affcb5cf4d4e4054a4b7954fc2f7b..7344f59f39e541016e8067daff3bc1f7606540c4 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 c631c8b4a22cf0938404854111d817a63a59e6bd..72d853411b66d9f5e9680ed69a356a4af6eadf17 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 26d9b24cb8f2c7acd4a3f7199861aa594ea79910..f36db04986b3af12b54ba2daae25552f96066cc2 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 3dedf69e4231078fd6f220f7b9c3f8232731ecbf..134a73d6bc508f7f565fec56bb64caa52d0e01a8 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 ebf5d21dadfce924e419884a83a89998024a7975..f7be58deffd29659565c5ad72f502930260d963c 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 18d4b4fb77260a1db6d1243bb8b44339efb4a744..8de47d254148178cf586291db59d92319e73c1bd 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 c2faf7e66d81f4a07306d3d0e7e684e1f5f39ca3..0dae0134a23d19eb922041622596d9e9d17580e4 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 ebd42f1e3e9f7505cd95505043174f81c8ebccc5..67ac4d3b207de2a34ccaec3b5f520ec209c26ab5 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 34cdd910cd6e6169021755c4d898bce19894e2f0..cac1074ac248ada7cd8a09b3b4fc85f790dd8884 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 0d9e5116b599ee17fc9e6a74dc33126f3dedb047..c4d9522686e0f45d8633780ac90938e77a967a3c 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 7210319f22637914ff5eda2e9b31e755c1abaa70..cee788a9e62ad103ad2b7e4a4ad8bf925b05568c 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>