From 8b46ce6e8db88e1e004795c0816c147fff85d6bf Mon Sep 17 00:00:00 2001 From: Oliver Sander <sander@igpm.rwth-aachen.de> Date: Fri, 12 Oct 2007 08:49:09 +0000 Subject: [PATCH] directory 'solver' merged into 'common' [[Imported from SVN: r1680]] --- dirneucoupling.cc | 2 +- rod3d.cc | 3 +-- src/rodsolver.cc | 2 +- src/rodsolver.hh | 2 +- staticrod.cc | 2 +- staticrod2.cc | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dirneucoupling.cc b/dirneucoupling.cc index 2176c806..160ff8b4 100644 --- a/dirneucoupling.cc +++ b/dirneucoupling.cc @@ -16,7 +16,7 @@ #include <dune/common/configparser.hh> #include "../common/multigridstep.hh" -#include "../solver/iterativesolver.hh" +#include "../common/iterativesolver.hh" #include "../common/projectedblockgsstep.hh" #include "../common/linearipopt.hh" #include "../common/readbitfield.hh" diff --git a/rod3d.cc b/rod3d.cc index 14143d87..c2bb42f3 100644 --- a/rod3d.cc +++ b/rod3d.cc @@ -8,8 +8,7 @@ #include <dune/istl/io.hh> -#include "../solver/iterativesolver.hh" - +#include "../common/iterativesolver.hh" #include "../common/energynorm.hh" #include "src/configuration.hh" diff --git a/src/rodsolver.cc b/src/rodsolver.cc index b27f70dc..f2ea5ee5 100644 --- a/src/rodsolver.cc +++ b/src/rodsolver.cc @@ -9,7 +9,7 @@ #include "../common/trustregiongsstep.hh" #include "../contact/src/contactmmgstep.hh" -#include "../solver/iterativesolver.hh" +#include "../common/iterativesolver.hh" #include "../common/energynorm.hh" #include "../common/h1seminorm.hh" diff --git a/src/rodsolver.hh b/src/rodsolver.hh index 34adef10..35acd570 100644 --- a/src/rodsolver.hh +++ b/src/rodsolver.hh @@ -8,7 +8,7 @@ #include "../../common/boxconstraint.hh" #include "../common/h1seminorm.hh" -#include "../../solver/iterativesolver.hh" +#include "../../common/iterativesolver.hh" #include "rodassembler.hh" diff --git a/staticrod.cc b/staticrod.cc index d7e1af80..b59d539f 100644 --- a/staticrod.cc +++ b/staticrod.cc @@ -12,7 +12,7 @@ #include "../common/projectedblockgsstep.hh" #include "../contact/src/contactmmgstep.hh" -#include "../solver/iterativesolver.hh" +#include "../common/iterativesolver.hh" #include "../common/geomestimator.hh" #include "../common/energynorm.hh" diff --git a/staticrod2.cc b/staticrod2.cc index 8b7f7ed3..707aca31 100644 --- a/staticrod2.cc +++ b/staticrod2.cc @@ -15,7 +15,7 @@ #include "../common/projectedblockgsstep.hh" #include "../contact/src/contactmmgstep.hh" -#include "../solver/iterativesolver.hh" +#include "../common/iterativesolver.hh" #include "../common/geomestimator.hh" #include "../common/energynorm.hh" -- GitLab