From: Daniel Arndt Date: Wed, 13 Sep 2017 16:00:16 +0000 (+0200) Subject: Fix warnings for clang-5.0.0 X-Git-Tag: v9.0.0-rc1~1080^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4444cc6c482e2b72da89930a8e67c4908870436b;p=dealii.git Fix warnings for clang-5.0.0 --- diff --git a/source/base/data_out_base.cc b/source/base/data_out_base.cc index 3ec7dbf731..75f5f01363 100644 --- a/source/base/data_out_base.cc +++ b/source/base/data_out_base.cc @@ -645,7 +645,8 @@ namespace case 1: Assert (xstepvertices[1] * xfrac) + (patch->vertices[0] * (1-xfrac)); - if (dim>1) + if (dim==0) + node = patch->vertices[0]; + else { - const double yfrac=ystep*stepsize; - node*= 1-yfrac; - node += ((patch->vertices[3] * xfrac) + (patch->vertices[2] * (1-xfrac))) * yfrac; - if (dim>2) + // perform a dim-linear interpolation + const double stepsize=1./n_subdivisions, + xfrac=xstep*stepsize; + + node = (patch->vertices[1] * xfrac) + (patch->vertices[0] * (1-xfrac)); + if (dim>1) { - const double zfrac=zstep*stepsize; - node *= (1-zfrac); - node += (((patch->vertices[5] * xfrac) + (patch->vertices[4] * (1-xfrac))) - * (1-yfrac) + - ((patch->vertices[7] * xfrac) + (patch->vertices[6] * (1-xfrac))) - * yfrac) * zfrac; + const double yfrac=ystep*stepsize; + node*= 1-yfrac; + node += ((patch->vertices[3] * xfrac) + (patch->vertices[2] * (1-xfrac))) * yfrac; + if (dim>2) + { + const double zfrac=zstep*stepsize; + node *= (1-zfrac); + node += (((patch->vertices[5] * xfrac) + (patch->vertices[4] * (1-xfrac))) + * (1-yfrac) + + ((patch->vertices[7] * xfrac) + (patch->vertices[6] * (1-xfrac))) + * yfrac) * zfrac; + } } } } diff --git a/source/dofs/dof_handler_policy.cc b/source/dofs/dof_handler_policy.cc index 90ac2e3db6..a5f72babf3 100644 --- a/source/dofs/dof_handler_policy.cc +++ b/source/dofs/dof_handler_policy.cc @@ -1040,22 +1040,29 @@ namespace internal { Threads::TaskGroup<> tasks; - tasks += Threads::new_task ([&]() + unsigned int i=0; + tasks += Threads::new_task ([ &,i] () { - all_constrained_indices[0] = compute_vertex_dof_identities (dof_handler); + all_constrained_indices[i] = compute_vertex_dof_identities (dof_handler); }); if (dim > 1) - tasks += Threads::new_task ([&]() { - all_constrained_indices[1] = compute_line_dof_identities (dof_handler); - }); + ++i; + tasks += Threads::new_task ([ &,i] () + { + all_constrained_indices[i] = compute_line_dof_identities (dof_handler); + }); + } if (dim > 2) - tasks += Threads::new_task ([&]() { - all_constrained_indices[2] = compute_quad_dof_identities (dof_handler); - }); + ++i; + tasks += Threads::new_task ([ &,i] () + { + all_constrained_indices[i] = compute_quad_dof_identities (dof_handler); + }); + } tasks.join_all (); }