From a945d1920b5b7f5ab97bb510677f8909638e555f Mon Sep 17 00:00:00 2001 From: Jonathan Robey Date: Thu, 3 Nov 2016 14:26:55 -0700 Subject: [PATCH] Fix FE_QHier static analysis warning Fix to #3406 --- source/fe/fe_q_hierarchical.cc | 41 +++++++++++++++++----------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/source/fe/fe_q_hierarchical.cc b/source/fe/fe_q_hierarchical.cc index d52124f377..59e0bd630b 100644 --- a/source/fe/fe_q_hierarchical.cc +++ b/source/fe/fe_q_hierarchical.cc @@ -502,7 +502,6 @@ FE_Q_Hierarchical:: initialize_constraints (const std::vector > &dofs_subcell) { const unsigned int dofs_1d = 2*this->dofs_per_vertex + this->dofs_per_line; - const unsigned int degree=this->degree; this->interface_constraints .TableBase<2,double>::reinit (this->interface_constraints_size()); @@ -524,7 +523,7 @@ initialize_constraints (const std::vector > &dofs_subcell) for (unsigned int c=0; c::max_children_per_cell; ++c) for (unsigned int i=0; iinterface_constraints(1 + c*(degree-1) + j - 2,i) = + this->interface_constraints(1 + c*(this->degree-1) + j - 2,i) = dofs_subcell[c](j,i); break; } @@ -553,73 +552,73 @@ initialize_constraints (const std::vector > &dofs_subcell) dofs_subcell[1](1, (i - (i % dofs_1d)) / dofs_1d); // interior edges - for (unsigned int j=0; j<(degree-1); j++) + for (unsigned int j=0; j<(this->degree-1); j++) { this->interface_constraints(5 + j,face_renumber[i]) = dofs_subcell[0](1, i % dofs_1d) * dofs_subcell[0](2 + j, (i - (i % dofs_1d)) / dofs_1d); - this->interface_constraints(5 + (degree-1) + j,face_renumber[i]) = + this->interface_constraints(5 + (this->degree-1) + j,face_renumber[i]) = dofs_subcell[0](1,i % dofs_1d) * dofs_subcell[1](2 + j, (i - (i % dofs_1d)) / dofs_1d); - this->interface_constraints(5 + 2*(degree-1) + j,face_renumber[i]) = + this->interface_constraints(5 + 2*(this->degree-1) + j,face_renumber[i]) = dofs_subcell[0](2 + j,i % dofs_1d) * dofs_subcell[1](0, (i - (i % dofs_1d)) / dofs_1d); - this->interface_constraints(5 + 3*(degree-1) + j,face_renumber[i]) = + this->interface_constraints(5 + 3*(this->degree-1) + j,face_renumber[i]) = dofs_subcell[1](2 + j, i % dofs_1d) * dofs_subcell[0](1, (i - (i % dofs_1d)) / dofs_1d); } // boundary edges - for (unsigned int j=0; j<(degree-1); j++) + for (unsigned int j=0; j<(this->degree-1); j++) { // left edge - this->interface_constraints(5 + 4*(degree-1) + j,face_renumber[i]) = + this->interface_constraints(5 + 4*(this->degree-1) + j,face_renumber[i]) = dofs_subcell[0](0, i % dofs_1d) * dofs_subcell[0](2 + j, (i - (i % dofs_1d)) / dofs_1d); - this->interface_constraints(5 + 4*(degree-1) + (degree-1) + j,face_renumber[i]) = + this->interface_constraints(5 + 4*(this->degree-1) + (this->degree-1) + j,face_renumber[i]) = dofs_subcell[0](0, i % dofs_1d) * dofs_subcell[1](2 + j, (i - (i % dofs_1d)) / dofs_1d); // right edge - this->interface_constraints(5 + 4*(degree-1) + 2*(degree-1) + j,face_renumber[i]) = + this->interface_constraints(5 + 4*(this->degree-1) + 2*(this->degree-1) + j,face_renumber[i]) = dofs_subcell[1](1, i % dofs_1d) * dofs_subcell[0](2 + j, (i - (i % dofs_1d)) / dofs_1d); - this->interface_constraints(5 + 4*(degree-1) + 3*(degree-1) + j,face_renumber[i]) = + this->interface_constraints(5 + 4*(this->degree-1) + 3*(this->degree-1) + j,face_renumber[i]) = dofs_subcell[1](1, i % dofs_1d) * dofs_subcell[1](2 + j, (i - (i % dofs_1d)) / dofs_1d); // bottom edge - this->interface_constraints(5 + 4*(degree-1) + 4*(degree-1) + j,face_renumber[i]) = + this->interface_constraints(5 + 4*(this->degree-1) + 4*(this->degree-1) + j,face_renumber[i]) = dofs_subcell[0](2 + j, i % dofs_1d) * dofs_subcell[0](0, (i - (i % dofs_1d)) / dofs_1d); - this->interface_constraints(5 + 4*(degree-1) + 5*(degree-1) + j,face_renumber[i]) = + this->interface_constraints(5 + 4*(this->degree-1) + 5*(this->degree-1) + j,face_renumber[i]) = dofs_subcell[1](2 + j, i % dofs_1d) * dofs_subcell[0](0, (i - (i % dofs_1d)) / dofs_1d); // top edge - this->interface_constraints(5 + 4*(degree-1) + 6*(degree-1) + j,face_renumber[i]) = + this->interface_constraints(5 + 4*(this->degree-1) + 6*(this->degree-1) + j,face_renumber[i]) = dofs_subcell[0](2 + j, i % dofs_1d) * dofs_subcell[1](1, (i - (i % dofs_1d)) / dofs_1d); - this->interface_constraints(5 + 4*(degree-1) + 7*(degree-1) + j,face_renumber[i]) = + this->interface_constraints(5 + 4*(this->degree-1) + 7*(this->degree-1) + j,face_renumber[i]) = dofs_subcell[1](2 + j, i % dofs_1d) * dofs_subcell[1](1, (i - (i % dofs_1d)) / dofs_1d); } // interior faces - for (unsigned int j=0; j<(degree-1); j++) - for (unsigned int k=0; k<(degree-1); k++) + for (unsigned int j=0; j<(this->degree-1); j++) + for (unsigned int k=0; k<(this->degree-1); k++) { // subcell 0 - this->interface_constraints(5 + 12*(degree-1) + j + k*(degree-1),face_renumber[i]) = + this->interface_constraints(5 + 12*(this->degree-1) + j + k*(this->degree-1),face_renumber[i]) = dofs_subcell[0](2 + j, i % dofs_1d) * dofs_subcell[0](2 + k, (i - (i % dofs_1d)) / dofs_1d); // subcell 1 - this->interface_constraints(5 + 12*(degree-1) + j + k*(degree-1) + (degree-1)*(degree-1),face_renumber[i]) = + this->interface_constraints(5 + 12*(this->degree-1) + j + k*(this->degree-1) + (this->degree-1)*(this->degree-1),face_renumber[i]) = dofs_subcell[1](2 + j, i % dofs_1d) * dofs_subcell[0](2 + k, (i - (i % dofs_1d)) / dofs_1d); // subcell 2 - this->interface_constraints(5 + 12*(degree-1) + j + k*(degree-1) + 2*(degree-1)*(degree-1),face_renumber[i]) = + this->interface_constraints(5 + 12*(this->degree-1) + j + k*(this->degree-1) + 2*(this->degree-1)*(this->degree-1),face_renumber[i]) = dofs_subcell[0](2 + j, i % dofs_1d) * dofs_subcell[1](2 + k, (i - (i % dofs_1d)) / dofs_1d); // subcell 3 - this->interface_constraints(5 + 12*(degree-1) + j + k*(degree-1) + 3*(degree-1)*(degree-1),face_renumber[i]) = + this->interface_constraints(5 + 12*(this->degree-1) + j + k*(this->degree-1) + 3*(this->degree-1)*(this->degree-1),face_renumber[i]) = dofs_subcell[1](2 + j, i % dofs_1d) * dofs_subcell[1](2 + k, (i - (i % dofs_1d)) / dofs_1d); } -- 2.39.5