From: Daniel Arndt Date: Thu, 29 Nov 2018 14:09:20 +0000 (+0100) Subject: Readd some static_casts X-Git-Tag: v9.1.0-rc1~521^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f16ab02dc965fca6c5f11dd8f00511d434a2031;p=dealii.git Readd some static_casts --- diff --git a/source/grid/grid_out.cc b/source/grid/grid_out.cc index 1c68ce9644..543f400ebd 100644 --- a/source/grid/grid_out.cc +++ b/source/grid/grid_out.cc @@ -1454,8 +1454,8 @@ GridOut::write_xfig(const Triangulation<2> &tria, cell->vertex(GeometryInfo::ucd_to_deal[k % nv]); for (unsigned int d = 0; d < static_cast(dim); ++d) { - int val = - 1200 * xfig_flags.scaling(d) * (p(d) - xfig_flags.offset(d)); + int val = static_cast(1200 * xfig_flags.scaling(d) * + (p(d) - xfig_flags.offset(d))); out << '\t' << ((d == 0) ? val : -val); } out << std::endl; @@ -1498,8 +1498,9 @@ GridOut::write_xfig(const Triangulation<2> &tria, for (unsigned int d = 0; d < static_cast(dim); ++d) { - int val = 1200 * xfig_flags.scaling(d) * - (p(d) - xfig_flags.offset(d)); + int val = + static_cast(1200 * xfig_flags.scaling(d) * + (p(d) - xfig_flags.offset(d))); out << '\t' << ((d == 0) ? val : -val); } out << std::endl; @@ -3264,14 +3265,14 @@ GridOut::write_mesh_per_processor_as_vtu( patch.vertices[vertex] = cell->vertex(vertex); patch.data(0, vertex) = cell->level(); if (!cell->has_children()) - patch.data(1, vertex) = + patch.data(1, vertex) = static_cast( static_cast::type>( - cell->subdomain_id()); + cell->subdomain_id())); else patch.data(1, vertex) = -1.0; - patch.data(2, vertex) = + patch.data(2, vertex) = static_cast( static_cast::type>( - cell->level_subdomain_id()); + cell->level_subdomain_id())); patch.data(3, vertex) = tria.locally_owned_subdomain(); } diff --git a/source/grid/grid_tools.cc b/source/grid/grid_tools.cc index 2a85cf49a7..b9b1419c95 100644 --- a/source/grid/grid_tools.cc +++ b/source/grid/grid_tools.cc @@ -2812,7 +2812,7 @@ namespace GridTools if (cell->active()) { while (current_cell_idx >= - std::floor(static_cast(n_active_cells) * + std::floor(static_cast(n_active_cells) * (current_proc_idx + 1) / n_partitions)) ++current_proc_idx; cell->set_subdomain_id(current_proc_idx);