From: bangerth Date: Fri, 7 May 2010 03:08:31 +0000 (+0000) Subject: Remove a few unused variables. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54dfafed62083de09ef203b807431c79f4945784;p=dealii-svn.git Remove a few unused variables. git-svn-id: https://svn.dealii.org/trunk@21087 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/include/numerics/theta_timestepping.templates.h b/deal.II/deal.II/include/numerics/theta_timestepping.templates.h index 485fca03ae..ae188ba68f 100644 --- a/deal.II/deal.II/include/numerics/theta_timestepping.templates.h +++ b/deal.II/deal.II/include/numerics/theta_timestepping.templates.h @@ -69,7 +69,6 @@ namespace Algorithms control.restart(); - bool first = true; d_explicit.time = control.now(); // The data used to compute the diff --git a/deal.II/deal.II/source/grid/grid_tools.cc b/deal.II/deal.II/source/grid/grid_tools.cc index f4d50cd281..d845d538cd 100644 --- a/deal.II/deal.II/source/grid/grid_tools.cc +++ b/deal.II/deal.II/source/grid/grid_tools.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 by the deal.II authors +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -1573,7 +1573,6 @@ namespace internal // sure we go at most // step_length into this // direction - const Point old_point = object_mid_point; object_mid_point -= std::min(2 * current_value / (gradient*gradient), step_length / gradient.norm()) * gradient; diff --git a/deal.II/deal.II/source/grid/tria.cc b/deal.II/deal.II/source/grid/tria.cc index 225da640a2..bd765a18e9 100644 --- a/deal.II/deal.II/source/grid/tria.cc +++ b/deal.II/deal.II/source/grid/tria.cc @@ -5227,8 +5227,7 @@ namespace internal quad = triangulation.begin_quad(), endq = triangulation.end_quad(); typename Triangulation::raw_line_iterator - next_unused_line = triangulation.begin_raw_line (), - endl = triangulation.end_line(); + next_unused_line = triangulation.begin_raw_line (); typename Triangulation::raw_quad_iterator next_unused_quad = triangulation.begin_raw_quad (); @@ -6059,10 +6058,6 @@ namespace internal typename Triangulation::active_hex_iterator hex = triangulation.begin_active_hex(level), endh = triangulation.begin_active_hex(level+1); - typename Triangulation::raw_line_iterator - next_unused_line = triangulation.begin_raw_line (); - typename Triangulation::raw_quad_iterator - next_unused_quad = triangulation.begin_raw_quad (); typename Triangulation::raw_hex_iterator next_unused_hex = triangulation.begin_raw_hex (level+1); diff --git a/deal.II/deal.II/source/grid/tria_boundary.cc b/deal.II/deal.II/source/grid/tria_boundary.cc index d9582af507..f8809ce231 100644 --- a/deal.II/deal.II/source/grid/tria_boundary.cc +++ b/deal.II/deal.II/source/grid/tria_boundary.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009 by the deal.II authors +// Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -35,7 +35,7 @@ Boundary::~Boundary () template Point Boundary:: -get_new_point_on_quad (const typename Triangulation::quad_iterator &) const +get_new_point_on_quad (const typename Triangulation::quad_iterator &) const { Assert (false, ExcPureFunctionCalled()); return Point(); @@ -80,7 +80,7 @@ get_new_point_on_face (const typename Triangulation::face_iterator case 3: return get_new_point_on_quad (face); } - + return Point(); } @@ -224,7 +224,7 @@ StraightBoundary::StraightBoundary () template Point StraightBoundary:: -get_new_point_on_line (const typename Triangulation::line_iterator &line) const +get_new_point_on_line (const typename Triangulation::line_iterator &line) const { return (line->vertex(0) + line->vertex(1)) / 2; } @@ -315,7 +315,7 @@ namespace template Point StraightBoundary:: -get_new_point_on_quad (const typename Triangulation::quad_iterator &) const +get_new_point_on_quad (const typename Triangulation::quad_iterator &) const { Assert (false, ExcImpossibleInDim(dim)); return Point(); @@ -325,7 +325,7 @@ get_new_point_on_quad (const typename Triangulation::quad_iterato template <> Point<3> StraightBoundary<2,3>:: -get_new_point_on_quad (const Triangulation<2,3>::quad_iterator &quad) const +get_new_point_on_quad (const Triangulation<2,3>::quad_iterator &quad) const { return compute_new_point_on_quad<2> (quad); } @@ -336,7 +336,7 @@ get_new_point_on_quad (const Triangulation<2,3>::quad_iterator &quad) const template <> Point<3> StraightBoundary<3>:: -get_new_point_on_quad (const Triangulation<3>::quad_iterator &quad) const +get_new_point_on_quad (const Triangulation<3>::quad_iterator &quad) const { return compute_new_point_on_quad<3> (quad); } @@ -375,13 +375,13 @@ get_intermediate_points_on_line (const typename Triangulation::li { const unsigned int n=points.size(); Assert(n>0, ExcInternalError()); - + const double dx=1./(n+1); double x=dx; const Point vertices[2] = { line->vertex(0), line->vertex(1) }; - + for (unsigned int i=0; i::quad_iterator &quad, std::vector > &points) const { const unsigned int spacedim = 3; - + const unsigned int n=points.size(), m=static_cast(std::sqrt(static_cast(n))); // is n a square number @@ -622,7 +622,7 @@ namespace internal x_k += object->vertex(i) * GeometryInfo::d_linear_shape_function (xi, i); - do + do { Tensor<1,dim> F_k; for (unsigned int i=0; i::vertices_per_cell; ++i) @@ -643,7 +643,6 @@ namespace internal const Point delta_xi = - invert(H_k) * F_k; xi += delta_xi; - Point old_xk = x_k; x_k = Point(); for (unsigned int i=0; i::vertices_per_cell; ++i) x_k += object->vertex(i) * @@ -653,7 +652,7 @@ namespace internal break; } while (true); - + return x_k; } diff --git a/deal.II/deal.II/source/numerics/point_value_history.cc b/deal.II/deal.II/source/numerics/point_value_history.cc index d1b7c80d63..621f4f3179 100644 --- a/deal.II/deal.II/source/numerics/point_value_history.cc +++ b/deal.II/deal.II/source/numerics/point_value_history.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2009 by Michael Rapson and the deal.II authors +// Copyright (C) 2009, 2010 by Michael Rapson and the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -517,8 +517,6 @@ void PointValueHistory to_gnuplot << "# Data independent of mesh location\n"; // write column headings - std::map > >::iterator - data_store_begin = data_store.begin (); to_gnuplot << "# "; for (unsigned int component = 0; component < n_indep; component++) @@ -530,8 +528,6 @@ void PointValueHistory // write general data stored for (unsigned int key = 0; key < dataset_key.size (); key++) { - std::map > >::iterator - data_store_begin = data_store.begin (); to_gnuplot << dataset_key[key]; for (unsigned int component = 0; component < n_indep; component++) diff --git a/deal.II/lac/source/constraint_matrix.cc b/deal.II/lac/source/constraint_matrix.cc index 8485b6ea16..741f41ee00 100644 --- a/deal.II/lac/source/constraint_matrix.cc +++ b/deal.II/lac/source/constraint_matrix.cc @@ -1218,7 +1218,6 @@ void ConstraintMatrix::condense (CompressedSetSparsityPattern &sparsity) const if (distribute[column] != numbers::invalid_unsigned_int) { // row - unsigned int old_rowlength = sparsity.row_length(row); for (unsigned int q=0; q!=lines[distribute[column]].entries.size(); ++q)