From: wolf Date: Thu, 30 Oct 2003 17:19:12 +0000 (+0000) Subject: Use deal_II_numbers::invalid_unsigned_int instead of static_cast(-1) X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8a30494ffaefbe31b994cd564ba36fb54f33d86;p=dealii-svn.git Use deal_II_numbers::invalid_unsigned_int instead of static_cast(-1) git-svn-id: https://svn.dealii.org/trunk@8178 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/base/include/base/data_out_base.h b/deal.II/base/include/base/data_out_base.h index 186077192f..fd3b12f12d 100644 --- a/deal.II/base/include/base/data_out_base.h +++ b/deal.II/base/include/base/data_out_base.h @@ -516,7 +516,7 @@ class DataOutBase /** * Value for no neighbor. */ - static const unsigned int no_neighbor = static_cast(-1); + static const unsigned int no_neighbor = deal_II_numbers::invalid_unsigned_int; /** * Exception diff --git a/deal.II/base/include/base/function_lib.h b/deal.II/base/include/base/function_lib.h index 376f165471..46dfc95e0a 100644 --- a/deal.II/base/include/base/function_lib.h +++ b/deal.II/base/include/base/function_lib.h @@ -852,7 +852,7 @@ namespace Functions * that no component is * selected. */ - static const unsigned int no_component = static_cast(-1); + static const unsigned int no_component = deal_II_numbers::invalid_unsigned_int; /** * Constructor. Arguments are the diff --git a/deal.II/base/source/parameter_handler.cc b/deal.II/base/source/parameter_handler.cc index fc59c9403a..2ac469f97f 100644 --- a/deal.II/base/source/parameter_handler.cc +++ b/deal.II/base/source/parameter_handler.cc @@ -289,7 +289,7 @@ namespace Patterns #ifdef HAVE_STD_NUMERIC_LIMITS std::numeric_limits::max(); #else - static_cast(-1); + deal_II_numbers::invalid_unsigned_int; #endif diff --git a/deal.II/base/source/quadrature.cc b/deal.II/base/source/quadrature.cc index b591d3c5c5..f076967f3b 100644 --- a/deal.II/base/source/quadrature.cc +++ b/deal.II/base/source/quadrature.cc @@ -920,7 +920,7 @@ face (const unsigned int face_no, default: Assert (false, ExcInternalError()); } - return static_cast(-1); + return deal_II_numbers::invalid_unsigned_int; } @@ -963,7 +963,7 @@ sub_face (const unsigned int face_no, default: Assert (false, ExcInternalError()); } - return static_cast(-1); + return deal_II_numbers::invalid_unsigned_int; } @@ -987,7 +987,7 @@ template QProjector::DataSetDescriptor:: DataSetDescriptor () : - dataset_offset (static_cast(-1)) + dataset_offset (deal_II_numbers::invalid_unsigned_int) {} diff --git a/deal.II/deal.II/include/dofs/dof_handler.h b/deal.II/deal.II/include/dofs/dof_handler.h index 3c23e96a13..d7583e7d78 100644 --- a/deal.II/deal.II/include/dofs/dof_handler.h +++ b/deal.II/deal.II/include/dofs/dof_handler.h @@ -273,7 +273,7 @@ class DoFHandler : public Subscriptor, * certain value, but rather take * its symbolic name. */ - static const unsigned int invalid_dof_index = static_cast(-1); + static const unsigned int invalid_dof_index = deal_II_numbers::invalid_unsigned_int; /** * Constructor. Take @p{tria} as the diff --git a/deal.II/deal.II/include/fe/fe_system.h b/deal.II/deal.II/include/fe/fe_system.h index fc642ca8d5..29ffd66bf7 100644 --- a/deal.II/deal.II/include/fe/fe_system.h +++ b/deal.II/deal.II/include/fe/fe_system.h @@ -538,7 +538,7 @@ class FESystem : public FiniteElement * face or subface number is * invalid. */ - static const unsigned int invalid_face_number = static_cast(-1); + static const unsigned int invalid_face_number = deal_II_numbers::invalid_unsigned_int; /** * Pairs of multiplicity and diff --git a/deal.II/deal.II/include/fe/mapping_cartesian.h b/deal.II/deal.II/include/fe/mapping_cartesian.h index 832fcec868..c6a947f65d 100644 --- a/deal.II/deal.II/include/fe/mapping_cartesian.h +++ b/deal.II/deal.II/include/fe/mapping_cartesian.h @@ -246,7 +246,7 @@ class MappingCartesian : public Mapping * face or subface number is * invalid. */ - static const unsigned int invalid_face_number = static_cast(-1); + static const unsigned int invalid_face_number = deal_II_numbers::invalid_unsigned_int; }; /*@}*/ diff --git a/deal.II/deal.II/source/dofs/dof_tools.cc b/deal.II/deal.II/source/dofs/dof_tools.cc index aaa7d1aaea..36be5668be 100644 --- a/deal.II/deal.II/source/dofs/dof_tools.cc +++ b/deal.II/deal.II/source/dofs/dof_tools.cc @@ -1380,7 +1380,7 @@ DoFTools::extract_boundary_dofs (const DoFHandler &dof_handler, : i+4*fe.dofs_per_vertex+8*fe.dofs_per_line)) : - static_cast(-1)))); + deal_II_numbers::invalid_unsigned_int))); if (fe.is_primitive (cell_index)) selected_dofs[face_dof_indices[i]] = (component_select[fe.face_system_to_component_index(i).first] @@ -2044,7 +2044,7 @@ compute_intergrid_transfer_representation (const DoFHandler &c const unsigned int parameter_dof = weight_mapping[i]; // if this global dof is a // parameter - if (parameter_dof != static_cast(-1)) + if (parameter_dof != deal_II_numbers::invalid_unsigned_int) { Assert (parameter_dof < n_global_parm_dofs, ExcInternalError()); Assert (inverse_weight_mapping[parameter_dof] == DoFHandler::invalid_dof_index, diff --git a/deal.II/deal.II/source/fe/fe.cc b/deal.II/deal.II/source/fe/fe.cc index 7b9b389887..117c8d32d7 100644 --- a/deal.II/deal.II/source/fe/fe.cc +++ b/deal.II/deal.II/source/fe/fe.cc @@ -324,8 +324,8 @@ FiniteElementBase::interface_constraints_size () const default: Assert (false, ExcNotImplemented()); }; - return TableIndices<2> (static_cast(-1), - static_cast(-1)); + return TableIndices<2> (deal_II_numbers::invalid_unsigned_int, + deal_II_numbers::invalid_unsigned_int); } diff --git a/deal.II/deal.II/source/fe/fe_dgq.cc b/deal.II/deal.II/source/fe/fe_dgq.cc index 27162f0cca..7e1d50b4c4 100644 --- a/deal.II/deal.II/source/fe/fe_dgq.cc +++ b/deal.II/deal.II/source/fe/fe_dgq.cc @@ -51,7 +51,7 @@ namespace if (i*i == N) return i; Assert (false, ExcInternalError()); - return static_cast(-1); + return deal_II_numbers::invalid_unsigned_int; } @@ -64,7 +64,7 @@ namespace if (i*i*i == N) return i; Assert (false, ExcInternalError()); - return static_cast(-1); + return deal_II_numbers::invalid_unsigned_int; } diff --git a/deal.II/deal.II/source/fe/fe_q.cc b/deal.II/deal.II/source/fe/fe_q.cc index 35ce0dd89f..fc325f592b 100644 --- a/deal.II/deal.II/source/fe/fe_q.cc +++ b/deal.II/deal.II/source/fe/fe_q.cc @@ -65,7 +65,7 @@ namespace if (i*i == N) return i; Assert (false, ExcInternalError()); - return static_cast(-1); + return deal_II_numbers::invalid_unsigned_int; } @@ -78,7 +78,7 @@ namespace if (i*i*i == N) return i; Assert (false, ExcInternalError()); - return static_cast(-1); + return deal_II_numbers::invalid_unsigned_int; } @@ -279,7 +279,7 @@ namespace } Assert (false, ExcInternalError()); - return static_cast(-1); + return deal_II_numbers::invalid_unsigned_int; } @@ -310,7 +310,7 @@ namespace { Assert (false, ExcNotImplemented()); // const unsigned int N1d = 2+fe_data.dofs_per_line; - return static_cast(-1); + return deal_II_numbers::invalid_unsigned_int; } diff --git a/deal.II/deal.II/source/fe/fe_system.cc b/deal.II/deal.II/source/fe/fe_system.cc index d110f6de85..6aac1b39ff 100644 --- a/deal.II/deal.II/source/fe/fe_system.cc +++ b/deal.II/deal.II/source/fe/fe_system.cc @@ -1009,8 +1009,8 @@ FESystem::build_cell_tables() // non-primitive shape functions, // have a special invalid index. const std::pair - non_primitive_index (static_cast(-1), - static_cast(-1)); + non_primitive_index (deal_II_numbers::invalid_unsigned_int, + deal_II_numbers::invalid_unsigned_int); // First enumerate vertex indices, // where we first enumerate all @@ -1183,8 +1183,8 @@ FESystem::build_face_tables() // functions, have a special // invalid index const std::pair - non_primitive_index (static_cast(-1), - static_cast(-1)); + non_primitive_index (deal_II_numbers::invalid_unsigned_int, + deal_II_numbers::invalid_unsigned_int); // 1. Vertices unsigned int total_index = 0; diff --git a/deal.II/deal.II/source/fe/fe_tools.cc b/deal.II/deal.II/source/fe/fe_tools.cc index 7b9efaeb96..3214ad68c9 100644 --- a/deal.II/deal.II/source/fe/fe_tools.cc +++ b/deal.II/deal.II/source/fe/fe_tools.cc @@ -141,11 +141,11 @@ namespace else { Assert (false, ExcNotImplemented()); - return std::make_pair (-1, static_cast(-1)); + return std::make_pair (-1, deal_II_numbers::invalid_unsigned_int); } } else - return std::make_pair (-1, static_cast(-1)); + return std::make_pair (-1, deal_II_numbers::invalid_unsigned_int); } diff --git a/deal.II/deal.II/source/grid/grid_in.cc b/deal.II/deal.II/source/grid/grid_in.cc index 060e970347..f65b079cf5 100644 --- a/deal.II/deal.II/source/grid/grid_in.cc +++ b/deal.II/deal.II/source/grid/grid_in.cc @@ -591,7 +591,7 @@ GridIn::delete_unused_vertices (std::vector > &vertices, // then renumber the vertices that // are actually used in the same // order as they were beforehand - const unsigned int invalid_vertex = static_cast(-1); + const unsigned int invalid_vertex = deal_II_numbers::invalid_unsigned_int; std::vector new_vertex_numbers (vertices.size(), invalid_vertex); unsigned int next_free_number = 0; for (unsigned int i=0; i(-1)), - Q1(static_cast(-1)), - lsn0(static_cast(-1)), - lsn1(static_cast(-1)), + Q0(deal_II_numbers::invalid_unsigned_int), + Q1(deal_II_numbers::invalid_unsigned_int), + lsn0(deal_II_numbers::invalid_unsigned_int), + lsn1(deal_II_numbers::invalid_unsigned_int), Oriented(false) {} @@ -336,12 +336,12 @@ namespace internal for (unsigned int i = 0;i<4;++i) { MSide &ss = sides[(*it).side[i]]; - if (ss.Q0 == static_cast(-1)) + if (ss.Q0 == deal_II_numbers::invalid_unsigned_int) { ss.Q0 = qctr; ss.lsn0 = i; } - else if (ss.Q1 == static_cast(-1)) + else if (ss.Q1 == deal_II_numbers::invalid_unsigned_int) { ss.Q1 = qctr; ss.lsn1 = i; @@ -503,7 +503,7 @@ namespace internal lsn = s.lsn0; } - if (opquad != static_cast(-1)) + if (opquad != deal_II_numbers::invalid_unsigned_int) { qnum = opquad; return true; @@ -708,12 +708,12 @@ namespace internal { for (unsigned int i=0; i::lines_per_cell; ++i) { - edges[i] = static_cast(-1); + edges[i] = deal_II_numbers::invalid_unsigned_int; local_orientation_flags[i] = 1; } for (unsigned int i=0; i::vertices_per_cell; ++i) - nodes[i] = static_cast(-1); + nodes[i] = deal_II_numbers::invalid_unsigned_int; waiting_to_be_processed = false; } @@ -1323,7 +1323,7 @@ namespace internal // Here the number of // incoming edges is // tallied for each node. - unsigned int perm_num = static_cast(-1); + unsigned int perm_num = deal_II_numbers::invalid_unsigned_int; for (unsigned int node_num=0; node_num<8; ++node_num) { // The local edge @@ -1351,7 +1351,7 @@ namespace internal if (total == 3) { - Assert (perm_num == static_cast(-1), + Assert (perm_num == deal_II_numbers::invalid_unsigned_int, ExcGridOrientError("More than one node with 3 incoming " "edges found in curent hex.")); perm_num = node_num; @@ -1359,7 +1359,7 @@ namespace internal } // We should now have a // valid permutation number - Assert (perm_num != static_cast(-1), + Assert (perm_num != deal_II_numbers::invalid_unsigned_int, ExcGridOrientError("No node having 3 incoming edges found in curent hex.")); // So use the apropriate diff --git a/deal.II/deal.II/source/grid/tria_accessor.cc b/deal.II/deal.II/source/grid/tria_accessor.cc index e453c62305..e196570c04 100644 --- a/deal.II/deal.II/source/grid/tria_accessor.cc +++ b/deal.II/deal.II/source/grid/tria_accessor.cc @@ -1729,8 +1729,8 @@ std::pair CellAccessor<1>::neighbor_of_coarser_neighbor (const unsigned int) const { Assert(false, ExcImpossibleInDim(1)); - return std::make_pair (static_cast(-1), - static_cast(-1)); + return std::make_pair (deal_II_numbers::invalid_unsigned_int, + deal_II_numbers::invalid_unsigned_int); } @@ -2017,7 +2017,7 @@ unsigned int CellAccessor::neighbor_of_neighbor (const unsigned int neighbo // since then we did not find // our way back... Assert (false, ExcInternalError()); - return static_cast(-1); + return deal_II_numbers::invalid_unsigned_int; }; } @@ -2082,8 +2082,8 @@ CellAccessor::neighbor_of_coarser_neighbor (const unsigned int neighbor) co // since then we did not find // our way back... Assert (false, ExcInternalError()); - return std::make_pair (static_cast(-1), - static_cast(-1)); + return std::make_pair (deal_II_numbers::invalid_unsigned_int, + deal_II_numbers::invalid_unsigned_int); } diff --git a/deal.II/deal.II/source/numerics/time_dependent.cc b/deal.II/deal.II/source/numerics/time_dependent.cc index 641746e35b..f028c308b6 100644 --- a/deal.II/deal.II/source/numerics/time_dependent.cc +++ b/deal.II/deal.II/source/numerics/time_dependent.cc @@ -37,7 +37,7 @@ TimeDependent::TimeSteppingData::TimeSteppingData (const unsigned int look_ahead TimeDependent::TimeDependent (const TimeSteppingData &data_primal, const TimeSteppingData &data_dual, const TimeSteppingData &data_postprocess): - sweep_no (static_cast(-1)), + sweep_no (deal_II_numbers::invalid_unsigned_int), timestepping_data_primal (data_primal), timestepping_data_dual (data_dual), timestepping_data_postprocess (data_postprocess) @@ -252,8 +252,8 @@ unsigned int TimeDependent::memory_consumption () const TimeStepBase::TimeStepBase (const double time) : previous_timestep(0), next_timestep (0), - sweep_no (static_cast(-1)), - timestep_no (static_cast(-1)), + sweep_no (deal_II_numbers::invalid_unsigned_int), + timestep_no (deal_II_numbers::invalid_unsigned_int), time (time) {} diff --git a/deal.II/deal.II/source/numerics/vectors.cc b/deal.II/deal.II/source/numerics/vectors.cc index c77dbca0f5..80dbf8dac3 100644 --- a/deal.II/deal.II/source/numerics/vectors.cc +++ b/deal.II/deal.II/source/numerics/vectors.cc @@ -922,7 +922,7 @@ interpolate_boundary_values (const Mapping &mapping, : i+4*fe.dofs_per_vertex+8*fe.dofs_per_line)) : - static_cast(-1)))); + deal_II_numbers::invalid_unsigned_int))); Assert (cell_i < fe.dofs_per_cell, ExcInternalError()); // make sure diff --git a/deal.II/lac/include/lac/block_vector.templates.h b/deal.II/lac/include/lac/block_vector.templates.h index 66061cf4a8..84c494fb2d 100644 --- a/deal.II/lac/include/lac/block_vector.templates.h +++ b/deal.II/lac/include/lac/block_vector.templates.h @@ -622,7 +622,7 @@ namespace internal current_block = parent.n_blocks(); index_within_block = 0; next_break_backward = global_index; - next_break_forward = static_cast(-1); + next_break_forward = deal_II_numbers::invalid_unsigned_int; }; } @@ -654,7 +654,7 @@ namespace internal // then move the next // boundary arbitrarily far // away - next_break_forward = static_cast(-1); + next_break_forward = deal_II_numbers::invalid_unsigned_int; }; ++global_index; @@ -689,7 +689,7 @@ namespace internal // get into unspecified terrain { --current_block; - index_within_block = static_cast(-1); + index_within_block = deal_II_numbers::invalid_unsigned_int; next_break_forward = 0; next_break_backward = 0; }; diff --git a/deal.II/lac/include/lac/matrix_lib.h b/deal.II/lac/include/lac/matrix_lib.h index 4864cf92e2..a252820127 100644 --- a/deal.II/lac/include/lac/matrix_lib.h +++ b/deal.II/lac/include/lac/matrix_lib.h @@ -101,7 +101,7 @@ class MeanValueFilter : public Subscriptor * Constructor, optionally * selecting a component. */ - MeanValueFilter(unsigned int component = static_cast(-1)); + MeanValueFilter(unsigned int component = deal_II_numbers::invalid_unsigned_int); /** * Subtract mean value from @p{v}. diff --git a/deal.II/lac/include/lac/matrix_lib.templates.h b/deal.II/lac/include/lac/matrix_lib.templates.h index f2115fce1a..c318b9e9a3 100644 --- a/deal.II/lac/include/lac/matrix_lib.templates.h +++ b/deal.II/lac/include/lac/matrix_lib.templates.h @@ -66,7 +66,7 @@ template void MeanValueFilter::filter(BlockVector& v) const { - Assert (component != static_cast(-1), + Assert (component != deal_II_numbers::invalid_unsigned_int, ExcNotInitialized()); for (unsigned int i=0;i& dst, const BlockVector& src) const { - Assert (component != static_cast(-1), + Assert (component != deal_II_numbers::invalid_unsigned_int, ExcNotInitialized()); Assert (dst.n_blocks() == src.n_blocks(), @@ -103,7 +103,7 @@ void MeanValueFilter::vmult_add(BlockVector& dst, const BlockVector& src) const { - Assert (component != static_cast(-1), + Assert (component != deal_II_numbers::invalid_unsigned_int, ExcNotInitialized()); Assert (dst.n_blocks() == src.n_blocks(), diff --git a/deal.II/lac/include/lac/sparse_matrix_ez.h b/deal.II/lac/include/lac/sparse_matrix_ez.h index ebd4faa72b..b2c029dc80 100644 --- a/deal.II/lac/include/lac/sparse_matrix_ez.h +++ b/deal.II/lac/include/lac/sparse_matrix_ez.h @@ -135,7 +135,7 @@ class SparseMatrixEZ : public Subscriptor /** * Non-existent column number. */ - static const unsigned int invalid = static_cast(-1); + static const unsigned int invalid = deal_II_numbers::invalid_unsigned_int; }; /** diff --git a/deal.II/lac/include/lac/sparsity_pattern.h b/deal.II/lac/include/lac/sparsity_pattern.h index 93ae1522f5..e63692be9e 100644 --- a/deal.II/lac/include/lac/sparsity_pattern.h +++ b/deal.II/lac/include/lac/sparsity_pattern.h @@ -135,7 +135,7 @@ class SparsityPattern : public Subscriptor * but the actual value of the * variable may change over time. */ - static const unsigned int invalid_entry = static_cast(-1); + static const unsigned int invalid_entry = deal_II_numbers::invalid_unsigned_int; /** * Initialize the matrix empty,