From: turcksin Date: Thu, 7 Mar 2013 21:31:00 +0000 (+0000) Subject: Fixed some inconsitencies between unsigned int and types::global_dof_index. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5272de23851ce19e4db4e78f2bef574b04371773;p=dealii-svn.git Fixed some inconsitencies between unsigned int and types::global_dof_index. git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@28801 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/include/deal.II/base/table_handler.h b/deal.II/include/deal.II/base/table_handler.h index c760d35523..547a5e1b46 100644 --- a/deal.II/include/deal.II/base/table_handler.h +++ b/deal.II/include/deal.II/base/table_handler.h @@ -120,7 +120,7 @@ namespace internal /** * Abbreviation for the data type stored by this object. */ - typedef boost::variant value_type; + typedef boost::variant value_type; /** * Stored value. diff --git a/deal.II/include/deal.II/dofs/dof_accessor.templates.h b/deal.II/include/deal.II/dofs/dof_accessor.templates.h index ba46025ec9..7f15e6c287 100644 --- a/deal.II/include/deal.II/dofs/dof_accessor.templates.h +++ b/deal.II/include/deal.II/dofs/dof_accessor.templates.h @@ -1294,7 +1294,7 @@ namespace internal const unsigned int starting_offset = dof_handler.vertex_dofs_offsets[vertex_index]; const types::global_dof_index *pointer = &dof_handler.vertex_dofs[starting_offset]; - Assert (*pointer != numbers::invalid_unsigned_int, + Assert (*pointer != numbers::invalid_size_type, ExcInternalError()); unsigned int counter = 0; @@ -1302,7 +1302,7 @@ namespace internal { Assert (pointer <= &dof_handler.vertex_dofs.back(), ExcInternalError()); - Assert((*pointer)::max(), ExcInternalError()); + Assert((*pointer)::max(), ExcInternalError()); const unsigned int this_fe_index = static_cast(*pointer); if (this_fe_index == numbers::invalid_unsigned_int) 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 bbc15a0e9a..4455a2edb3 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 @@ -185,7 +185,7 @@ namespace internal dofs_per_cell[0] : dofs_per_cell[cell_active_fe_index[cell_number]]; for (unsigned int i=0; i > *entries_ptr = @@ -299,7 +299,7 @@ no_constraint: { for (unsigned int i=0; i 1 && (current_dof < first_owned || diff --git a/deal.II/include/deal.II/matrix_free/fe_evaluation.h b/deal.II/include/deal.II/matrix_free/fe_evaluation.h index ac602ea835..b667423167 100644 --- a/deal.II/include/deal.II/matrix_free/fe_evaluation.h +++ b/deal.II/include/deal.II/matrix_free/fe_evaluation.h @@ -1807,7 +1807,7 @@ FEEvaluationBase // loop over all local dofs. ind_local holds local number on cell, index // iterates over the elements of index_local_to_global and dof_indices // points to the global indices stored in index_local_to_global - const unsigned int *dof_indices = dof_info.begin_indices(cell); + const types::global_dof_index *dof_indices = dof_info.begin_indices(cell); const std::pair *indicators = dof_info.begin_indicators(cell); const std::pair *indicators_end = diff --git a/deal.II/include/deal.II/matrix_free/matrix_free.templates.h b/deal.II/include/deal.II/matrix_free/matrix_free.templates.h index 3c38036ffa..ecc9ab7eab 100644 --- a/deal.II/include/deal.II/matrix_free/matrix_free.templates.h +++ b/deal.II/include/deal.II/matrix_free/matrix_free.templates.h @@ -412,7 +412,7 @@ void MatrixFree::initialize_indices AssertDimension (n_fe, constraint.size()); std::vector local_dof_indices; - std::vector > ghost_dofs(n_fe); + std::vector > ghost_dofs(n_fe); std::vector > > lexicographic_inv(n_fe); internal::MatrixFreeFunctions::ConstraintValues constraint_values; @@ -519,10 +519,10 @@ void MatrixFree::initialize_indices // cache the constrained indices for use in matrix-vector products { - const unsigned int + const types::global_dof_index start_index = dof_info[no].vector_partitioner->local_range().first, end_index = dof_info[no].vector_partitioner->local_range().second; - for (unsigned int i=start_index; iis_constrained(i)==true) dof_info[no].constrained_dofs.push_back(i-start_index); } diff --git a/deal.II/source/dofs/dof_tools.cc b/deal.II/source/dofs/dof_tools.cc index ae3fb7e44c..c05918b005 100644 --- a/deal.II/source/dofs/dof_tools.cc +++ b/deal.II/source/dofs/dof_tools.cc @@ -2383,7 +2383,7 @@ namespace DoFTools subface->get_dof_indices (slave_dofs, subface_fe_index); for (unsigned int i=0; i