From 10eaadf1de6d5022cd6a6e3e6f8cdf3be580c92f Mon Sep 17 00:00:00 2001 From: Martin Kronbichler Date: Mon, 27 Jul 2009 10:28:28 +0000 Subject: [PATCH] Avoid a compiler warning by setting the values of old_min_product directly and not within an if statement. git-svn-id: https://svn.dealii.org/trunk@19118 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/source/grid/grid_tools.cc | 77 ++++++++++++----------- 1 file changed, 40 insertions(+), 37 deletions(-) diff --git a/deal.II/deal.II/source/grid/grid_tools.cc b/deal.II/deal.II/source/grid/grid_tools.cc index 7367f06b98..0d255e3163 100644 --- a/deal.II/deal.II/source/grid/grid_tools.cc +++ b/deal.II/deal.II/source/grid/grid_tools.cc @@ -1459,49 +1459,52 @@ namespace internal [GeometryInfo::vertices_per_cell]; GeometryInfo::alternating_form_at_vertices (parent_vertices, parent_alternating_forms); - - for (unsigned int test=0; test<2; ++test) - { - Point child_vertices - [GeometryInfo::max_children_per_cell] - [GeometryInfo::vertices_per_cell]; - for (unsigned int c=0; cn_children(); ++c) - for (unsigned int i=0; i::vertices_per_cell; ++i) - child_vertices[c][i] = object->child(c)->vertex(i); + Point child_vertices + [GeometryInfo::max_children_per_cell] + [GeometryInfo::vertices_per_cell]; + + for (unsigned int c=0; cn_children(); ++c) + for (unsigned int i=0; i::vertices_per_cell; ++i) + child_vertices[c][i] = object->child(c)->vertex(i); + + Tensor child_alternating_forms + [GeometryInfo::max_children_per_cell] + [GeometryInfo::vertices_per_cell]; + + for (unsigned int c=0; cn_children(); ++c) + GeometryInfo::alternating_form_at_vertices (child_vertices[c], + child_alternating_forms[c]); + + old_min_product = child_alternating_forms[0][0] * parent_alternating_forms[0]; + for (unsigned int c=0; cn_children(); ++c) + for (unsigned int i=0; i::vertices_per_cell; ++i) + for (unsigned int j=0; j::vertices_per_cell; ++j) + old_min_product = std::min (old_min_product, + child_alternating_forms[c][i] * + parent_alternating_forms[j]); + // for the new minimum value, // replace mid-object - // vertex. note that for - // child i, the mid-object - // vertex happens to have the - // number + // vertex. note that for child + // i, the mid-object vertex + // happens to have the number // max_children_per_cell-i - if (test == 1) - for (unsigned int c=0; cn_children(); ++c) - child_vertices[c][GeometryInfo::max_children_per_cell-c-1] - = object_mid_point; - - Tensor child_alternating_forms - [GeometryInfo::max_children_per_cell] - [GeometryInfo::vertices_per_cell]; + for (unsigned int c=0; cn_children(); ++c) + child_vertices[c][GeometryInfo::max_children_per_cell-c-1] + = object_mid_point; - for (unsigned int c=0; cn_children(); ++c) - GeometryInfo::alternating_form_at_vertices (child_vertices[c], - child_alternating_forms[c]); + for (unsigned int c=0; cn_children(); ++c) + GeometryInfo::alternating_form_at_vertices (child_vertices[c], + child_alternating_forms[c]); - double min = child_alternating_forms[0][0] * parent_alternating_forms[0]; - for (unsigned int c=0; cn_children(); ++c) - for (unsigned int i=0; i::vertices_per_cell; ++i) - for (unsigned int j=0; j::vertices_per_cell; ++j) - min = std::min (min, - child_alternating_forms[c][i] * - parent_alternating_forms[j]); - - if (test == 0) - old_min_product = min; - else - new_min_product = min; - } + new_min_product = child_alternating_forms[0][0] * parent_alternating_forms[0]; + for (unsigned int c=0; cn_children(); ++c) + for (unsigned int i=0; i::vertices_per_cell; ++i) + for (unsigned int j=0; j::vertices_per_cell; ++j) + new_min_product = std::min (new_min_product, + child_alternating_forms[c][i] * + parent_alternating_forms[j]); // if new minimum value is // better than before, and if -- 2.39.5