Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Atgeirr Flø Rasmussen 2012-08-14 15:27:30 +02:00
commit 6fb1078cba

View File

@ -30,6 +30,7 @@
#if HAVE_DUNE_ISTL
#include <opm/core/linalg/LinearSolverIstl.hpp>
#endif
#if HAVE_AGMG
#include <opm/core/linalg/LinearSolverAGMG.hpp>
#endif
@ -73,11 +74,13 @@ namespace Opm
solver_.reset(new LinearSolverIstl(param));
#endif
}
else if (ls == "agmg") {
#if HAVE_AGMG
solver_.reset(new LinearSolverAGMG(param));
#endif
}
else {
THROW("Linear solver " << ls << " is unknown.");
}