From 9d3ec927ae6c0954ac3b8f57503f4cdd8e997ae6 Mon Sep 17 00:00:00 2001 From: Oliver Sander <sander@igpm.rwth-aachen.de> Date: Wed, 8 Apr 2009 09:00:56 +0000 Subject: [PATCH] fix path to new module dune-solvers [[Imported from SVN: r3990]] --- dirneucoupling.cc | 8 ++++---- rod3d.cc | 4 ++-- src/rodsolver.cc | 16 ++++++++-------- src/rodsolver.hh | 6 +++--- staticrod.cc | 13 ++++++------- staticrod2.cc | 14 +++++++------- 6 files changed, 30 insertions(+), 31 deletions(-) diff --git a/dirneucoupling.cc b/dirneucoupling.cc index abb5b02e..aab88cb2 100644 --- a/dirneucoupling.cc +++ b/dirneucoupling.cc @@ -13,14 +13,14 @@ #include <dune/common/bitsetvector.hh> #include <dune/common/configparser.hh> -#include <dune/ag-common/multigridstep.hh> -#include <dune/ag-common/solvers/loopsolver.hh> -#include <dune/ag-common/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/ag-common/quadraticipopt.hh> #endif #include <dune/ag-common/readbitfield.hh> -#include <dune/ag-common/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/rod3d.cc b/rod3d.cc index 103ff2cb..b5eaa1aa 100644 --- a/rod3d.cc +++ b/rod3d.cc @@ -8,8 +8,8 @@ #include <dune/istl/io.hh> -#include <dune/ag-common/iterativesolver.hh> -#include <dune/ag-common/norms/energynorm.hh> +#include <dune-solvers/solvers/iterativesolver.hh> +#include <dune-solvers/norms/energynorm.hh> #include "src/configuration.hh" #include "src/roddifference.hh" diff --git a/src/rodsolver.cc b/src/rodsolver.cc index fc0cc387..48eaea69 100644 --- a/src/rodsolver.cc +++ b/src/rodsolver.cc @@ -6,14 +6,14 @@ #include <dune/disc/miscoperators/laplace.hh> #include <dune/disc/operators/p1operator.hh> -#include <dune/ag-common/trustregiongsstep.hh> -#include <dune/ag-common/solvers/mmgstep.hh> -#include <dune/ag-common/transferoperators/truncatedcompressedmgtransfer.hh> -#include <dune/ag-common/mandelobsrestrictor.hh> -#include <dune/ag-common/iterativesolver.hh> - -#include <dune/ag-common/norms/energynorm.hh> -#include <dune/ag-common/norms/h1seminorm.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 <dune-solvers/norms/energynorm.hh> +#include <dune-solvers/norms/h1seminorm.hh> #include "configuration.hh" #include "quaternion.hh" diff --git a/src/rodsolver.hh b/src/rodsolver.hh index f7f70601..6af9804b 100644 --- a/src/rodsolver.hh +++ b/src/rodsolver.hh @@ -8,9 +8,9 @@ #include <dune/istl/bcrsmatrix.hh> #include <dune/istl/bvector.hh> -#include <dune/ag-common/boxconstraint.hh> -#include <dune/ag-common/norms/h1seminorm.hh> -#include <dune/ag-common/solvers/loopsolver.hh> +#include <dune-solvers/boxconstraint.hh> +#include <dune-solvers/norms/h1seminorm.hh> +#include <dune-solvers/solvers/loopsolver.hh> #include "rodassembler.hh" diff --git a/staticrod.cc b/staticrod.cc index 8278528c..ce7308b1 100644 --- a/staticrod.cc +++ b/staticrod.cc @@ -8,13 +8,12 @@ #include <dune/istl/io.hh> #include <dune/ag-common/boundarypatch.hh> -#include <dune/ag-common/projectedblockgsstep.hh> -#include <dune/ag-common/solvers/mmgstep.hh> -#include <dune/ag-common/solvers/loopsolver.hh> -#include <dune/ag-common/geomestimator.hh> -#include <dune/ag-common/norms/energynorm.hh> -#include <dune/ag-common/mandelobsrestrictor.hh> -#include <dune/ag-common/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 "src/rodwriter.hh" #include "src/planarrodassembler.hh" diff --git a/staticrod2.cc b/staticrod2.cc index 0bc2250d..d75ec8dc 100644 --- a/staticrod2.cc +++ b/staticrod2.cc @@ -9,14 +9,14 @@ #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/ag-common/estimators/geometricmarking.hh> #include <dune/ag-common/boundarypatch.hh> -#include <dune/ag-common/projectedblockgsstep.hh> -#include <dune/ag-common/solvers/mmgstep.hh> -#include <dune/ag-common/solvers/loopsolver.hh> -#include <dune/ag-common/geomestimator.hh> -#include <dune/ag-common/norms/energynorm.hh> -#include <dune/ag-common/mandelobsrestrictor.hh> -#include <dune/ag-common/transferoperators/truncatedcompressedmgtransfer.hh> #include "src/rodwriter.hh" #include "src/planarrodassembler.hh" -- GitLab