From: Wolfgang Bangerth Date: Thu, 3 Nov 2016 01:51:17 +0000 (-0600) Subject: Rename local variables. X-Git-Tag: v8.5.0-rc1~498^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=832161cd3e3c2fa2fed91f3e7b040a0f566cb16c;p=dealii.git Rename local variables. The variables in question have the same name as a function argument, and are only used in a local block. They may as well be renamed. --- diff --git a/include/deal.II/algorithms/newton.templates.h b/include/deal.II/algorithms/newton.templates.h index 254563f2d3..4a95e74a02 100644 --- a/include/deal.II/algorithms/newton.templates.h +++ b/include/deal.II/algorithms/newton.templates.h @@ -1,6 +1,6 @@ // --------------------------------------------------------------------- // -// Copyright (C) 2006 - 2015 by the deal.II authors +// Copyright (C) 2006 - 2016 by the deal.II authors // // This file is part of the deal.II library. // @@ -93,7 +93,8 @@ namespace Algorithms template void - Newton::operator() (AnyData &out, const AnyData &in) + Newton::operator() (AnyData &out, + const AnyData &in) { Assert (out.size() == 1, ExcNotImplemented()); deallog.push ("Newton"); @@ -128,15 +129,15 @@ namespace Algorithms if (debug_vectors) { - AnyData out; + AnyData tmp; VectorType *p = &u; - out.add(p, "solution"); + tmp.add(p, "solution"); p = Du; - out.add(p, "update"); + tmp.add(p, "update"); p = res; - out.add(p, "residual"); + tmp.add(p, "residual"); *data_out << step; - *data_out << out; + *data_out << tmp; } while (control.check(step++, resnorm) == SolverControl::iterate) @@ -159,15 +160,15 @@ namespace Algorithms if (debug_vectors) { - AnyData out; + AnyData tmp; VectorType *p = &u; - out.add(p, "solution"); + tmp.add(p, "solution"); p = Du; - out.add(p, "update"); + tmp.add(p, "update"); p = res; - out.add(p, "residual"); + tmp.add(p, "residual"); *data_out << step; - *data_out << out; + *data_out << tmp; } u.add(-1., *Du);