From: David Wells <wellsd2@rpi.edu>
Date: Sat, 5 Nov 2016 14:16:45 +0000 (-0400)
Subject: Use different names for function arguments.
X-Git-Tag: v8.5.0-rc1~455^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df0e34a6493bf7bb1d32c63605fbcb2d0f40f623;p=dealii.git

Use different names for function arguments.

PreconditionBlock already has two members named 'permutation' and
'inverse_permutation' so this makes things a bit clearer.

I applied the same naming scheme to a separate function where previously
the variables were called 'p' and 'i'.
---

diff --git a/include/deal.II/lac/precondition_block.templates.h b/include/deal.II/lac/precondition_block.templates.h
index a8db1a5c9c..1ca117434f 100644
--- a/include/deal.II/lac/precondition_block.templates.h
+++ b/include/deal.II/lac/precondition_block.templates.h
@@ -104,11 +104,11 @@ void PreconditionBlock<MatrixType,inverse_type>::initialize
 template <typename MatrixType, typename inverse_type>
 void PreconditionBlock<MatrixType,inverse_type>::initialize
 (const MatrixType             &M,
- const std::vector<size_type> &permutation,
- const std::vector<size_type> &inverse_permutation,
+ const std::vector<size_type> &new_permutation,
+ const std::vector<size_type> &new_inverse_permutation,
  const AdditionalData          parameters)
 {
-  set_permutation(permutation, inverse_permutation);
+  set_permutation(new_permutation, new_inverse_permutation);
   initialize(M, parameters);
 }
 
@@ -515,23 +515,19 @@ void PreconditionBlock<MatrixType,inverse_type>::invert_diagblocks()
 
 template <typename MatrixType, typename inverse_type>
 void PreconditionBlock<MatrixType,inverse_type>::set_permutation
-(const std::vector<size_type> &p,
- const std::vector<size_type> &i)
+(const std::vector<size_type> &new_permutation,
+ const std::vector<size_type> &new_inverse_permutation)
 {
-  Assert (p.size() == i.size(), ExcDimensionMismatch(p.size(), i.size()));
+  AssertDimension (new_permutation.size(),
+                   new_inverse_permutation.size());
 
   if (this->inverses_ready())
     {
-      AssertDimension(p.size(), this->size());
+      AssertDimension(new_permutation.size(), this->size());
     }
 
-  permutation.resize(p.size());
-  inverse_permutation.resize(p.size());
-  for (unsigned int k=0; k<p.size(); ++k)
-    {
-      permutation[k] = p[k];
-      inverse_permutation[k] = i[k];
-    }
+  permutation = new_permutation;
+  inverse_permutation = new_inverse_permutation;
 }