Skip to content
Snippets Groups Projects
Commit d9d96de1 authored by Arne Morten Kvarving's avatar Arne Morten Kvarving Committed by Markus Blatt
Browse files

[release,amg] Corrected log which coarse direct solver is used in the AMG

After adding UMFPack support, the printed log message was "Using DIRECTSOLVER"
which irritated users. With this path the actual direct solver will be
printed.
parent 5f6b4f41
No related branches found
No related tags found
No related merge requests found
......@@ -506,8 +506,6 @@ namespace Dune
|| (matrices_->parallelInformation().coarsest().isRedistributed()
&& matrices_->parallelInformation().coarsest().getRedistributed().communicator().size()==1
&& matrices_->parallelInformation().coarsest().getRedistributed().communicator().size()>0)) { // redistribute and 1 proc
if(verbosity_>0 && matrices_->parallelInformation().coarsest()->communicator().rank()==0)
std::cout<<"Using DIRECTSOLVER"<<std::endl;
if(matrices_->parallelInformation().coarsest().isRedistributed())
{
if(matrices_->matrices().coarsest().getRedistributed().getmat().N()>0)
......@@ -517,6 +515,8 @@ namespace Dune
solver_.reset();
}else
solver_.reset(new DIRECTSOLVER<typename M::matrix_type>(matrices_->matrices().coarsest()->getmat(), false, false));
if(verbosity_>0 && matrices_->parallelInformation().coarsest()->communicator().rank()==0)
std::cout<< "Using a direct coarse solver (" << static_cast< DIRECTSOLVER<typename M::matrix_type>* >(solver_.get())->name() << ")" << std::endl;
}else
#undef DIRECTSOLVER
#endif
......
......@@ -362,6 +362,8 @@ namespace Dune
* @warning later calling apply will result in an error.
*/
void free();
const char* name() { return "SuperLU"; }
private:
friend class std::mem_fun_ref_t<void,SuperLU>;
template<class M,class X, class TM, class TD, class T1>
......
......@@ -407,6 +407,8 @@ namespace Dune {
mat_is_loaded = false;
}
const char* name() { return "UMFPACK"; }
private:
typedef typename Dune::UMFPackMethodChooser<T> Caller;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment