From 041772c4f68628eabbdc9e19bc53ed813f844c88 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Sun, 25 Nov 2018 23:42:38 +0100 Subject: [PATCH] Avoid C-style cast in numerics --- .../numerics/fe_field_function.templates.h | 6 ++--- .../numerics/matrix_creator.templates.h | 8 +++---- .../deal.II/numerics/vector_tools.templates.h | 2 +- source/numerics/point_value_history.cc | 24 +++++++++---------- source/numerics/time_dependent.cc | 12 +++++----- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/include/deal.II/numerics/fe_field_function.templates.h b/include/deal.II/numerics/fe_field_function.templates.h index 6da62da896..b80d1bffd9 100644 --- a/include/deal.II/numerics/fe_field_function.templates.h +++ b/include/deal.II/numerics/fe_field_function.templates.h @@ -282,7 +282,7 @@ namespace Functions // Number of quadrature points on this cell unsigned int nq = qpoints[i].size(); // Construct a quadrature formula - std::vector ww(nq, 1. / ((double)nq)); + std::vector ww(nq, 1. / nq); quadrature_collection.push_back(Quadrature(qpoints[i], ww)); } @@ -352,7 +352,7 @@ namespace Functions // Number of quadrature points on this cell unsigned int nq = qpoints[i].size(); // Construct a quadrature formula - std::vector ww(nq, 1. / ((double)nq)); + std::vector ww(nq, 1. / nq); quadrature_collection.push_back(Quadrature(qpoints[i], ww)); } @@ -428,7 +428,7 @@ namespace Functions // Number of quadrature points on this cell unsigned int nq = qpoints[i].size(); // Construct a quadrature formula - std::vector ww(nq, 1. / ((double)nq)); + std::vector ww(nq, 1. / nq); quadrature_collection.push_back(Quadrature(qpoints[i], ww)); } diff --git a/include/deal.II/numerics/matrix_creator.templates.h b/include/deal.II/numerics/matrix_creator.templates.h index 092507fc84..6e1d143aaa 100644 --- a/include/deal.II/numerics/matrix_creator.templates.h +++ b/include/deal.II/numerics/matrix_creator.templates.h @@ -746,7 +746,7 @@ namespace MatrixCreator copy_local_to_global, Vector>, std::placeholders::_1, &matrix, - (Vector *)nullptr), + static_cast *>(nullptr)), assembler_data, copy_data); } @@ -896,7 +896,7 @@ namespace MatrixCreator copy_local_to_global, Vector>, std::placeholders::_1, &matrix, - (Vector *)nullptr), + static_cast *>(nullptr)), assembler_data, copy_data); } @@ -1988,7 +1988,7 @@ namespace MatrixCreator copy_local_to_global, Vector>, std::placeholders::_1, &matrix, - (Vector *)(nullptr)), + static_cast *>(nullptr)), assembler_data, copy_data); } @@ -2136,7 +2136,7 @@ namespace MatrixCreator copy_local_to_global, Vector>, std::placeholders::_1, &matrix, - (Vector *)nullptr), + static_cast *>(nullptr)), assembler_data, copy_data); } diff --git a/include/deal.II/numerics/vector_tools.templates.h b/include/deal.II/numerics/vector_tools.templates.h index bc04a68fcf..5fc5378e52 100644 --- a/include/deal.II/numerics/vector_tools.templates.h +++ b/include/deal.II/numerics/vector_tools.templates.h @@ -3531,7 +3531,7 @@ namespace VectorTools boundary_functions, rhs, dof_to_boundary_mapping, - (const Function *)nullptr, + static_cast *>(nullptr), component_mapping); // For certain weird elements, diff --git a/source/numerics/point_value_history.cc b/source/numerics/point_value_history.cc index d082043b61..8c3cbdeda9 100644 --- a/source/numerics/point_value_history.cc +++ b/source/numerics/point_value_history.cc @@ -600,8 +600,8 @@ PointValueHistory::evaluate_field(const std::string &vector_name, if (n_indep != 0) // hopefully this will get optimized, can't test // independent_values[0] unless n_indep > 0 { - Assert(std::abs((int)dataset_key.size() - - (int)independent_values[0].size()) < 2, + Assert(std::abs(static_cast(dataset_key.size()) - + static_cast(independent_values[0].size())) < 2, ExcDataLostSync()); } // Look up the field name and get an @@ -669,8 +669,8 @@ PointValueHistory::evaluate_field( if (n_indep != 0) // hopefully this will get optimized, can't test // independent_values[0] unless n_indep > 0 { - Assert(std::abs((int)dataset_key.size() - - (int)independent_values[0].size()) < 2, + Assert(std::abs(static_cast(dataset_key.size()) - + static_cast(independent_values[0].size())) < 2, ExcDataLostSync()); } @@ -912,8 +912,8 @@ PointValueHistory::evaluate_field_at_requested_location( if (n_indep != 0) // hopefully this will get optimized, can't test // independent_values[0] unless n_indep > 0 { - Assert(std::abs((int)dataset_key.size() - - (int)independent_values[0].size()) < 2, + Assert(std::abs(static_cast(dataset_key.size()) - + static_cast(independent_values[0].size())) < 2, ExcDataLostSync()); } // Look up the field name and get an @@ -992,8 +992,8 @@ PointValueHistory::push_back_independent( Assert(indep_values.size() == n_indep, ExcDimensionMismatch(indep_values.size(), n_indep)); Assert(n_indep != 0, ExcNoIndependent()); - Assert(std::abs((int)dataset_key.size() - (int)independent_values[0].size()) < - 2, + Assert(std::abs(static_cast(dataset_key.size()) - + static_cast(independent_values[0].size())) < 2, ExcDataLostSync()); for (unsigned int component = 0; component < n_indep; component++) @@ -1482,8 +1482,8 @@ PointValueHistory::deep_check(const bool strict) } if (n_indep != 0) { - if (std::abs((int)dataset_key.size() - - (int)independent_values[0].size()) >= 2) + if (std::abs(static_cast(dataset_key.size()) - + static_cast(independent_values[0].size())) >= 2) { return false; } @@ -1497,8 +1497,8 @@ PointValueHistory::deep_check(const bool strict) { Assert(data_store_begin->second.size() > 0, ExcInternalError()); - if (std::abs((int)(data_store_begin->second)[0].size() - - (int)dataset_key.size()) >= 2) + if (std::abs(static_cast((data_store_begin->second)[0].size()) - + static_cast(dataset_key.size())) >= 2) return false; // this loop only tests one member // for each name, i.e. checks the diff --git a/source/numerics/time_dependent.cc b/source/numerics/time_dependent.cc index ad5f8fecd4..deaffe2504 100644 --- a/source/numerics/time_dependent.cc +++ b/source/numerics/time_dependent.cc @@ -888,9 +888,9 @@ TimeStepBase_Tria::refine_grid(const RefinementData refinement_data) if (cell->refine_flag_set()) previous_cells += (GeometryInfo::max_children_per_cell - 1); else if (cell->coarsen_flag_set()) - previous_cells -= - (double)(GeometryInfo::max_children_per_cell - 1) / - GeometryInfo::max_children_per_cell; + previous_cells -= static_cast( + GeometryInfo::max_children_per_cell - 1) / + GeometryInfo::max_children_per_cell; // @p{previous_cells} now gives the // number of cells which would result @@ -915,9 +915,9 @@ TimeStepBase_Tria::refine_grid(const RefinementData refinement_data) if (cell->refine_flag_set()) estimated_cells += (GeometryInfo::max_children_per_cell - 1); else if (cell->coarsen_flag_set()) - estimated_cells -= - (double)(GeometryInfo::max_children_per_cell - 1) / - GeometryInfo::max_children_per_cell; + estimated_cells -= static_cast( + GeometryInfo::max_children_per_cell - 1) / + GeometryInfo::max_children_per_cell; // calculate the allowed delta in // cell numbers; be more lenient -- 2.39.5