[dune-pdelab] [dune-pdelab-commit] [Commit] dune-pdelab - feea953: [Bugfix][Newton] put methods "setKeepMatrix" and "keepMatrix" to public

[Christian Engwer]

Hi Marian,

the keep_matrix parameter (in the ParameterTree) is a bit awkward. You
already added a TODO note, thus I assume it slipped through your
latest cleanups. Do you change this. I'd rather not have this
parameter in the release to avoid incompatible changes in the future.

Christian

On Thu, Jun 11, 2015 at 08:33:03AM +0200, Marian Piatkowski wrote:
> New commit, appeared at Thu Jun 11 08:33:03 2015 +0200
> as part of the following ref changes:
> 
>     branch refs/heads/master    updated from 8fc5e7d -> 263a9ef
> 
> Browsable version: http://cgit.dune-project.org/repositories/dune-pdelab/commit/?id=feea9539b8da80dee1f995388ba6a560b895d290
> 
> ======================================================================
> 
> commit feea9539b8da80dee1f995388ba6a560b895d290
> Author: Marian Piatkowski <marian.piatkowski at iwr.uni-heidelberg.de>
> Date:   Tue May 19 15:57:14 2015 +0200
> 
>     [Bugfix][Newton] put methods "setKeepMatrix" and "keepMatrix" to public
> 
>  dune/pdelab/newton/newton.hh | 24 ++++++++++++------------
>  1 file changed, 12 insertions(+), 12 deletions(-)
> 
> 
> 
> diff --git a/dune/pdelab/newton/newton.hh b/dune/pdelab/newton/newton.hh
> index 58da04f..36a388c 100644
> --- a/dune/pdelab/newton/newton.hh
> +++ b/dune/pdelab/newton/newton.hh
> @@ -65,6 +65,18 @@ namespace Dune
>            verbosity_level = verbosity_level_;
>        }
>  
> +      //! Set whether the jacobian matrix should be kept across calls to apply().
> +      void setKeepMatrix(bool b)
> +      {
> +        keep_matrix = b;
> +      }
> +
> +      //! Return whether the jacobian matrix is kept across calls to apply().
> +      bool keepMatrix() const
> +      {
> +        return keep_matrix;
> +      }
> +
>      protected:
>        const GridOperator& gridoperator;
>        TrialVector *u;
> @@ -106,18 +118,6 @@ namespace Dune
>        virtual void prepare_step(Matrix& A, TestVector& r) = 0;
>        virtual void line_search(TrialVector& z, TestVector& r) = 0;
>        virtual void defect(TestVector& r) = 0;
> -
> -      //! Set whether the jacobian matrix should be kept across calls to apply().
> -      void setKeepMatrix(bool b)
> -      {
> -        keep_matrix = b;
> -      }
> -
> -      //! Return whether the jacobian matrix is kept across calls to apply().
> -      bool keepMatrix() const
> -      {
> -        return keep_matrix;
> -      }
>      }; // end class NewtonBase
>  
>      template<class GOS, class S, class TrlV, class TstV>
> 
> _______________________________________________
> dune-pdelab-commit mailing list
> dune-pdelab-commit at dune-project.org
> http://lists.dune-project.org/mailman/listinfo/dune-pdelab-commit
> 

-- 
Prof. Dr. Christian Engwer 
Institut für Numerische und Angewandte Mathematik
Fachbereich Mathematik und Informatik der Universität Münster
Einsteinstrasse 62
48149 Münster

E-Mail	christian.engwer at uni-muenster.de
Telefon	+49 251 83-35067
FAX		+49 251 83-32729