From: Wolfgang Bangerth Date: Fri, 22 Mar 2013 15:09:48 +0000 (+0000) Subject: Make a few variable have their correct type. X-Git-Tag: v8.0.0~316^2~112 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c77c9f4fe9caad1eed6c586bcdc6f63931df99d5;p=dealii.git Make a few variable have their correct type. git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@28988 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/include/deal.II/matrix_free/dof_info.templates.h b/deal.II/include/deal.II/matrix_free/dof_info.templates.h index af421b9993..ee57724793 100644 --- a/deal.II/include/deal.II/matrix_free/dof_info.templates.h +++ b/deal.II/include/deal.II/matrix_free/dof_info.templates.h @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2011, 2012 by the deal.II authors +// Copyright (C) 2011, 2012, 2013 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -280,7 +280,7 @@ no_constraint: constraint_iterator.first++; } } - row_starts[cell_number+1] = std_cxx1x::tuple (dof_indices.size(), constraint_indicator.size(), 0); @@ -349,7 +349,7 @@ no_constraint: ghost_origin[i].second = i; } std::sort (ghost_origin.begin(), ghost_origin.end()); - + types::global_dof_index last_contiguous_start = ghost_origin[0].first; ghost_numbering[ghost_origin[0].second] = 0; for (size_dof i=1; ilocal_range().second- vector_partitioner->local_range().first) + vector_partitioner->ghost_indices().n_elements(); @@ -1874,8 +1874,8 @@ not_connect: vector_partitioner->size()); const unsigned int local_size = vector_partitioner->local_size(); renumbering.resize (0); - renumbering.resize (local_size, numbers::invalid_unsigned_int); - + renumbering.resize (local_size, numbers::invalid_dof_index); + types::global_dof_index counter = 0; std::vector::iterator dof_ind = dof_indices.begin(), end_ind = dof_indices.end(); @@ -1883,7 +1883,7 @@ not_connect: { if (*dof_ind < local_size) { - if (renumbering[*dof_ind] == numbers::invalid_unsigned_int) + if (renumbering[*dof_ind] == numbers::invalid_dof_index) renumbering[*dof_ind] = counter++; *dof_ind = renumbering[*dof_ind]; } @@ -1891,7 +1891,7 @@ not_connect: AssertIndexRange (counter, local_size+1); for (size_dof i=0; i