directory 'solver' merged into 'common'

[[Imported from SVN: r1680]]

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"

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"

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"

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"
 

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"

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"