From: Wolfgang Bangerth Date: Wed, 9 May 2012 15:24:18 +0000 (+0000) Subject: Use a common naming scheme: grad_phi_u instead of phi_grad_u. X-Git-Tag: v8.0.0~2614 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb24650eb2690073ee8f04953892fbe40ff2e6b2;p=dealii.git Use a common naming scheme: grad_phi_u instead of phi_grad_u. git-svn-id: https://svn.dealii.org/trunk@25504 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/examples/step-22/step-22.cc b/deal.II/examples/step-22/step-22.cc index 83a6f0cf26..3ccbb81e3a 100644 --- a/deal.II/examples/step-22/step-22.cc +++ b/deal.II/examples/step-22/step-22.cc @@ -851,7 +851,7 @@ namespace Step22 // not to dofs_per_cell, // but only up to i, // the index of the outer loop. - std::vector > phi_grads_u (dofs_per_cell); + std::vector > symgrad_phi_u (dofs_per_cell); std::vector div_phi_u (dofs_per_cell); std::vector phi_p (dofs_per_cell); @@ -871,16 +871,16 @@ namespace Step22 { for (unsigned int k=0; kphi_grad_u and + // grad_phi_u and // phi_p are going to hold the // values of the basis functions in order to // faster build up the local matrices, as was @@ -1349,7 +1349,7 @@ namespace Step31 FullMatrix local_matrix (dofs_per_cell, dofs_per_cell); std::vector local_dof_indices (dofs_per_cell); - std::vector > phi_grad_u (dofs_per_cell); + std::vector > grad_phi_u (dofs_per_cell); std::vector phi_p (dofs_per_cell); const FEValuesExtractors::Vector velocities (0); @@ -1387,14 +1387,14 @@ namespace Step31 { for (unsigned int k=0; k &elasticity_fe_face_values, const FEFaceValuesBase &stokes_fe_face_values, std::vector > &elasticity_phi, - std::vector > &stokes_phi_grads_u, + std::vector > &stokes_symgrad_phi_u, std::vector &stokes_phi_p, FullMatrix &local_interface_matrix) const; void solve (); @@ -622,12 +622,12 @@ namespace Step46 const FEValuesExtractors::Scalar pressure (dim); const FEValuesExtractors::Vector displacements (dim+1); - std::vector > stokes_phi_grads_u (stokes_dofs_per_cell); - std::vector stokes_div_phi_u (stokes_dofs_per_cell); - std::vector stokes_phi_p (stokes_dofs_per_cell); + std::vector > stokes_symgrad_phi_u (stokes_dofs_per_cell); + std::vector stokes_div_phi_u (stokes_dofs_per_cell); + std::vector stokes_phi_p (stokes_dofs_per_cell); - std::vector > elasticity_phi_grad (elasticity_dofs_per_cell); - std::vector elasticity_phi_div (elasticity_dofs_per_cell); + std::vector > elasticity_grad_phi (elasticity_dofs_per_cell); + std::vector elasticity_div_phi (elasticity_dofs_per_cell); std::vector > elasticity_phi (elasticity_dofs_per_cell); // Then comes the main loop over all cells @@ -682,14 +682,14 @@ namespace Step46 { for (unsigned int k=0; kneighbor_of_neighbor(f)); assemble_interface_term (elasticity_fe_face_values, stokes_fe_face_values, - elasticity_phi, stokes_phi_grads_u, stokes_phi_p, + elasticity_phi, stokes_symgrad_phi_u, stokes_phi_p, local_interface_matrix); cell->neighbor(f)->get_dof_indices (neighbor_dof_indices); @@ -872,7 +872,7 @@ namespace Step46 assemble_interface_term (elasticity_fe_subface_values, stokes_fe_face_values, elasticity_phi, - stokes_phi_grads_u, stokes_phi_p, + stokes_symgrad_phi_u, stokes_phi_p, local_interface_matrix); cell->neighbor_child_on_subface (f, subface) @@ -904,7 +904,7 @@ namespace Step46 assemble_interface_term (elasticity_fe_face_values, stokes_fe_subface_values, elasticity_phi, - stokes_phi_grads_u, stokes_phi_p, + stokes_symgrad_phi_u, stokes_phi_p, local_interface_matrix); cell->neighbor(f)->get_dof_indices (neighbor_dof_indices); @@ -945,7 +945,7 @@ namespace Step46 assemble_interface_term (const FEFaceValuesBase &elasticity_fe_face_values, const FEFaceValuesBase &stokes_fe_face_values, std::vector > &elasticity_phi, - std::vector > &stokes_phi_grads_u, + std::vector > &stokes_symgrad_phi_u, std::vector &stokes_phi_p, FullMatrix &local_interface_matrix) const { @@ -965,14 +965,14 @@ namespace Step46 const Tensor<1,dim> normal_vector = stokes_fe_face_values.normal_vector(q); for (unsigned int k=0; k