From: Bruno Turcksin Date: Fri, 6 Sep 2013 15:57:57 +0000 (+0000) Subject: Make 64bit compile again. X-Git-Tag: v8.1.0~867 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85f7e4179ae277144c6bdc5c834cdd5b2621ddbc;p=dealii.git Make 64bit compile again. git-svn-id: https://svn.dealii.org/trunk@30631 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/include/deal.II/distributed/tria.h b/deal.II/include/deal.II/distributed/tria.h index a1088fba3b..3494a50885 100644 --- a/deal.II/include/deal.II/distributed/tria.h +++ b/deal.II/include/deal.II/distributed/tria.h @@ -696,7 +696,7 @@ namespace parallel * in hierarchical ordering is the ith deal cell starting * from begin(0). */ - const std::vector & + const std::vector & get_p4est_tree_to_coarse_cell_permutation() const; @@ -867,8 +867,8 @@ namespace parallel * by p4est is located on geometrically * close coarse grid cells. */ - std::vector coarse_cell_to_p4est_tree_permutation; - std::vector p4est_tree_to_coarse_cell_permutation; + std::vector coarse_cell_to_p4est_tree_permutation; + std::vector p4est_tree_to_coarse_cell_permutation; /** * Return a pointer to the p4est @@ -983,7 +983,7 @@ namespace parallel * in hierarchical ordering is the ith deal cell starting * from begin(0). */ - const std::vector & + const std::vector & get_p4est_tree_to_coarse_cell_permutation() const; /** @@ -1007,8 +1007,8 @@ namespace parallel * these variables at a * couple places anyway. */ - std::vector coarse_cell_to_p4est_tree_permutation; - std::vector p4est_tree_to_coarse_cell_permutation; + std::vector coarse_cell_to_p4est_tree_permutation; + std::vector p4est_tree_to_coarse_cell_permutation; /** * dummy settings diff --git a/deal.II/source/distributed/tria.cc b/deal.II/source/distributed/tria.cc index e4d7bfd274..4f6b7c3c70 100644 --- a/deal.II/source/distributed/tria.cc +++ b/deal.II/source/distributed/tria.cc @@ -837,7 +837,7 @@ namespace const std::vector::active_cell_iterator,unsigned int> > > & vertex_to_cell, - const std::vector &coarse_cell_to_p4est_tree_permutation, + const std::vector &coarse_cell_to_p4est_tree_permutation, const bool set_vertex_info, typename internal::p4est::types::connectivity *connectivity) { @@ -1582,7 +1582,7 @@ namespace { public: RefineAndCoarsenList (const Triangulation &triangulation, - const std::vector &p4est_tree_to_coarse_cell_permutation, + const std::vector &p4est_tree_to_coarse_cell_permutation, const types::subdomain_id my_subdomain, typename internal::p4est::types::forest &forest); @@ -1656,7 +1656,7 @@ namespace template RefineAndCoarsenList:: RefineAndCoarsenList (const Triangulation &triangulation, - const std::vector &p4est_tree_to_coarse_cell_permutation, + const std::vector &p4est_tree_to_coarse_cell_permutation, const types::subdomain_id my_subdomain, typename internal::p4est::types::forest &forest) : @@ -3303,7 +3303,7 @@ namespace parallel template - const std::vector & + const std::vector & Triangulation::get_p4est_tree_to_coarse_cell_permutation() const { return p4est_tree_to_coarse_cell_permutation; @@ -3870,8 +3870,8 @@ namespace parallel { int i, l = quad.level; int child_id; - const std::vector perm = triangulation->get_p4est_tree_to_coarse_cell_permutation (); - unsigned int dealii_index = perm[treeidx]; + const std::vector perm = triangulation->get_p4est_tree_to_coarse_cell_permutation (); + types::global_dof_index dealii_index = perm[treeidx]; for (i = 0; i < l; i++) { typename dealii::Triangulation::cell_iterator cell (triangulation, i, dealii_index); @@ -3939,10 +3939,10 @@ namespace parallel } template <> - const std::vector & + const std::vector & Triangulation<1,1>::get_p4est_tree_to_coarse_cell_permutation() const { - static std::vector a; + static std::vector a; return a; }