fix usage of FieldTraits (similar to the PromotionTraits)

Bård Skaflestad authored 11 years ago and Markus Blatt committed 11 years ago

Inspired by commit fcff302d.

Arne Morten Kvarving authored 11 years ago and Markus Blatt committed 11 years ago

Previously memory was only releases in the case that the data
was copied. This resulted in a memory leak if no copying was
requested. This patch fixes this by moving the deallocation to
the correct scope and consequently closes flyspary #1326, see
http://www.dune-project.org/flyspray/index.php?do=details&task_id=1326

The patches that made copies of AMG usable form different threads
changed its internal interface. This patch adapts KAMG to these
changes and makes it compile and run again. While at it, I changed
from normal pointers to shared_ptr where it seemed suitable.

Jurgis Pods authored 11 years ago and Markus Blatt committed 11 years ago

This is essentially equivalent to Uli Sack's patch from Flyspray task FS#1202, ported to the current master.

Currently, GMRes is inconsistent when comparing current ('norm') and initial defect ('norm_0'). While the current residual is taken from the preconditioned residual, the initial defect - at least in the case the flag '_recalc_defect' is not set, which is the default - is taken from the unpreconditioned residual.

This causes the following problems:
1) The calculated reduction is wrong.
2) The solver might even exit in iteration 0 (without entering the iteration loop) because 'norm' and 'norm_0' differ by a factor greater than the requested reduction, returning a zero update 'x'.

By using the preconditioned residual in any case, the defect calculation is made consistent again.

To make future patches more readable the list of headers is now ordered
alphabetically with one header per line.

Storing the iterators over over the AMG hierarchies as class member
is a really bad idea if one wants to allow the reuse of theses AMG
hierarchies in different threads. This patch creates a private struct
for collecting the iterators over the hierachies. An instance of this
struct is created in apply and passed to the solution algorithms. Thus
each apply uses its own context of iterators.

Resolved conflicts:
	dune/istl/paamg/fastamg.hh

Replace it with	typename FieldTraits<field_type>::real_type

This fixes two problems:
- norms don't return complex number types when instantiated
  for complex coefficients
- You can now instantiate BlockVector for field_types that do not
  auto-convert to 'double'

A reference is an lvalue. Assigning to it later changes the state
of the rhe referencee (and not the reference). Therefore the code
actually stored references to the right hand and left hand side.
In the case where we did not want to reuse vectors we created two
dense SuperMatrices to used in this apply call and then assigned
them to the references. In fact we actually overwrote the right
and left hand side by doing this.

This patch uses pointers to accompish the intended behaviour, i.e.
point to the correct dense matrices, the ones stored in SuperLU
or the ones stored in SuperLU::apply.

Arne Morten Kvarving authored 11 years ago and Markus Blatt committed 11 years ago

A reference is an lvalue. Assigning to it later changes the state
of the rhe referencee (and not the reference). Therefore the code
actually stored references to the right hand and left hand side.
In the case where we did not want to reuse vectors we created two
dense SuperMatrices to used in this apply call and then assigned
them to the references. In fact we actually overwrote the right
and left hand side by doing this.

This patch uses pointers to accompish the intended behaviour, i.e.
point to the correct dense matrices, the ones stored in SuperLU
or the ones stored in SuperLU::apply.

Otherwise I get name clashes: DUNE_SOLVER_HH is used in dune-istl
and dune-solvers.

Andreas Dedner authored 11 years ago and Markus Blatt committed 11 years ago

removed again - sorry about that.

Unfortunately, SuperLU always overwrites the right hand side with
the solution. Therefore we now copy it if there is only one level
in the matrix hierarchy of AMG.

Christian Engwer authored 11 years ago and Markus Blatt committed 11 years ago

modify constructor with capacity to catch at least some of the
wrong invocations (see doxygen comment).

Oliver Sander authored 11 years ago and Markus Blatt committed 11 years ago

This fixes FS 1292, but with my own slightly different patch.

removed again - sorry about that.

Unfortunately, SuperLU always overwrites the right hand side with
the solution. Therefore we now copy it if there is only one level
in the matrix hierarchy of AMG.

modify constructor with capacity to catch at least some of the
wrong invocations (see doxygen comment).