From cc349ab12144d4882473578e5aa3fca7bf548dc4 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Mon, 2 Jul 2001 16:09:51 +0000 Subject: [PATCH] Explicitely convert an arg to the vector constructor to avoid that it tries to take the constructor that uses two input iterators. git-svn-id: https://svn.dealii.org/trunk@4791 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/source/fe/fe_dgq.cc | 2 +- deal.II/deal.II/source/fe/fe_values.cc | 8 ++++---- deal.II/deal.II/source/fe/mapping_c1.cc | 16 ++++++++-------- deal.II/deal.II/source/fe/mapping_q1.cc | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/deal.II/deal.II/source/fe/fe_dgq.cc b/deal.II/deal.II/source/fe/fe_dgq.cc index cd2c125821..6bcbee6405 100644 --- a/deal.II/deal.II/source/fe/fe_dgq.cc +++ b/deal.II/deal.II/source/fe/fe_dgq.cc @@ -252,7 +252,7 @@ template std::vector FE_DGQ::get_dpo_vector(unsigned int deg) { - std::vector dpo(dim+1, 0); + std::vector dpo(dim+1, static_cast(0)); dpo[dim] = ++deg; for (unsigned int i=1;i::get_function_values (const InputVector &fe_fu present_cell->get_interpolated_dof_values(fe_function, dof_values); // initialize with zero - fill_n (values.begin(), n_quadrature_points, 0); + std::fill_n (values.begin(), n_quadrature_points, 0); // add up contributions of trial // functions @@ -265,7 +265,7 @@ get_function_grads (const InputVector &fe_function, present_cell->get_interpolated_dof_values(fe_function, dof_values); // initialize with zero - fill_n (gradients.begin(), n_quadrature_points, Tensor<1,dim>()); + std::fill_n (gradients.begin(), n_quadrature_points, Tensor<1,dim>()); // add up contributions of trial // functions @@ -306,7 +306,7 @@ get_function_grads (const InputVector // initialize with zero for (unsigned i=0;i()); + std::fill_n (gradients[i].begin(), gradients[i].size(), Tensor<1,dim>()); // add up contributions of trial // functions @@ -387,7 +387,7 @@ get_function_2nd_derivatives (const InputVector // initialize with zero for (unsigned i=0;i()); + std::fill_n (second_derivs[i].begin(), second_derivs[i].size(), Tensor<2,dim>()); // add up contributions of trial // functions diff --git a/deal.II/deal.II/source/fe/mapping_c1.cc b/deal.II/deal.II/source/fe/mapping_c1.cc index cc20ddb6f3..797d0fe3c0 100644 --- a/deal.II/deal.II/source/fe/mapping_c1.cc +++ b/deal.II/deal.II/source/fe/mapping_c1.cc @@ -142,14 +142,14 @@ MappingC1<2>::add_line_support_points (const Triangulation<2>::cell_iterator &ce coordinate_axis /= h; const double alpha = std::atan2(coordinate_axis[1], coordinate_axis[0]); - const double b = ((face_vertex_normals[0][1] * sin(alpha) - +face_vertex_normals[0][0] * cos(alpha)) / - (face_vertex_normals[0][1] * cos(alpha) - -face_vertex_normals[0][0] * sin(alpha))), - c = ((face_vertex_normals[1][1] * sin(alpha) - +face_vertex_normals[1][0] * cos(alpha)) / - (face_vertex_normals[1][1] * cos(alpha) - -face_vertex_normals[1][0] * sin(alpha))); + const double b = ((face_vertex_normals[0][1] * std::sin(alpha) + +face_vertex_normals[0][0] * std::cos(alpha)) / + (face_vertex_normals[0][1] * std::cos(alpha) + -face_vertex_normals[0][0] * std::sin(alpha))), + c = ((face_vertex_normals[1][1] * std::sin(alpha) + +face_vertex_normals[1][0] * std::cos(alpha)) / + (face_vertex_normals[1][1] * std::cos(alpha) + -face_vertex_normals[1][0] * std::sin(alpha))); // next evaluate the so // determined cubic diff --git a/deal.II/deal.II/source/fe/mapping_q1.cc b/deal.II/deal.II/source/fe/mapping_q1.cc index e992094f51..78873e1739 100644 --- a/deal.II/deal.II/source/fe/mapping_q1.cc +++ b/deal.II/deal.II/source/fe/mapping_q1.cc @@ -679,8 +679,8 @@ MappingQ1::compute_fill_face (const typename DoFHandler::cell_iterator | update_JxW_values)) for (unsigned int i=0;i