From: Wolfgang Bangerth Date: Fri, 4 Nov 2016 20:14:13 +0000 (-0600) Subject: Rename some variables. X-Git-Tag: v8.5.0-rc1~463^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30670c64f48e5a2e0cb5376b6e9d3b9d0aeeaa1a;p=dealii.git Rename some variables. There are variables of the same name in the base class. Avoid the confusion of having similarly named variables in the local scope. --- diff --git a/source/fe/fe_abf.cc b/source/fe/fe_abf.cc index b7ccb126bb..843310367d 100644 --- a/source/fe/fe_abf.cc +++ b/source/fe/fe_abf.cc @@ -328,10 +328,10 @@ FE_ABF::initialize_restriction() // Store shape values, since the // evaluation suffers if not // ordered by point - Table<2,double> cached_values(this->dofs_per_cell, q_face.size()); + Table<2,double> cached_values_face(this->dofs_per_cell, q_face.size()); for (unsigned int k=0; kdofs_per_cell; ++i) - cached_values(i,k) + cached_values_face(i,k) = this->shape_value_component(i, q_face.point(k), GeometryInfo::unit_normal_direction[face]); @@ -371,7 +371,7 @@ FE_ABF::initialize_restriction() this->restriction[iso][child](face*this->dofs_per_face+i_face, i_child) += Utilities::fixed_power(.5) * q_sub.weight(k) - * cached_values(i_child, k) + * cached_values_face(i_child, k) * this->shape_value_component(face*this->dofs_per_face+i_face, q_sub.point(k), GeometryInfo::unit_normal_direction[face]); @@ -402,11 +402,11 @@ FE_ABF::initialize_restriction() // Store shape values, since the // evaluation suffers if not // ordered by point - Table<3,double> cached_values(this->dofs_per_cell, q_cell.size(), dim); + Table<3,double> cached_values_cell(this->dofs_per_cell, q_cell.size(), dim); for (unsigned int k=0; kdofs_per_cell; ++i) for (unsigned int d=0; dshape_value_component(i, q_cell.point(k), d); + cached_values_cell(i,k,d) = this->shape_value_component(i, q_cell.point(k), d); for (unsigned int child=0; child::max_children_per_cell; ++child) { @@ -420,7 +420,7 @@ FE_ABF::initialize_restriction() this->restriction[iso][child](start_cell_dofs+i_weight*dim+d, i_child) += q_sub.weight(k) - * cached_values(i_child, k, d) + * cached_values_cell(i_child, k, d) * polynomials[d]->compute_value(i_weight, q_sub.point(k)); } }