From: Ralf Hartmann Date: Fri, 23 Sep 2005 12:04:02 +0000 (+0000) Subject: Make it compile with gcc3.2 X-Git-Tag: v8.0.0~13081 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6e669ea2123754ffb583a1c23cda723f7ccbf2a;p=dealii.git Make it compile with gcc3.2 git-svn-id: https://svn.dealii.org/trunk@11522 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/source/grid/grid_in.cc b/deal.II/deal.II/source/grid/grid_in.cc index d40b56f498..7fe4bfd0cf 100644 --- a/deal.II/deal.II/source/grid/grid_in.cc +++ b/deal.II/deal.II/source/grid/grid_in.cc @@ -822,16 +822,18 @@ void GridIn<2>::read_netcdf (const std::string &filename) AssertThrow(static_cast( marker_var->get_dim(0)->size())==n_markers, ExcIO()); - vector marker(n_markers); - marker_var->get(marker.begin(), n_markers); + std::vector marker(n_markers); + // use &* to convert + // vector::iterator to int * + marker_var->get(&*marker.begin(), n_markers); if (output) { - cout << "n_cell=" << n_cells << endl; - cout << "marker: "; + std::cout << "n_cell=" << n_cells << std::endl; + std::cout << "marker: "; for (unsigned int i=0; i::read_netcdf (const std::string &filename) AssertThrow(static_cast( bmarker_var->get_dim(0)->size())==n_bquads, ExcIO()); - vector bmarker(n_bquads); - bmarker_var->get(bmarker.begin(), n_bquads); + std::vector bmarker(n_bquads); + bmarker_var->get(&*bmarker.begin(), n_bquads); // for each marker count the // number of boundary quads // which carry this marker - map n_bquads_per_bmarker; + std::map n_bquads_per_bmarker; for (unsigned int i=0; i::read_netcdf (const std::string &filename) // with e.g. constant=1 or -1 if (output) { - cout << "n_bquads_per_bmarker: " << endl; - map::const_iterator + std::cout << "n_bquads_per_bmarker: " << std::endl; + std::map::const_iterator iter=n_bquads_per_bmarker.begin(); for (; iter!=n_bquads_per_bmarker.end(); ++iter) - cout << " n_bquads_per_bmarker[" << iter->first - << "]=" << iter->second << endl; + std::cout << " n_bquads_per_bmarker[" << iter->first + << "]=" << iter->second << std::endl; } // next we read @@ -903,20 +905,20 @@ void GridIn<2>::read_netcdf (const std::string &filename) AssertThrow(static_cast( vertex_indices_var->get_dim(1)->size())==vertices_per_quad, ExcIO()); - vector vertex_indices(n_bquads*vertices_per_quad); - vertex_indices_var->get(vertex_indices.begin(), n_bquads, vertices_per_quad); + std::vector vertex_indices(n_bquads*vertices_per_quad); + vertex_indices_var->get(&*vertex_indices.begin(), n_bquads, vertices_per_quad); for (unsigned int i=0; i=0, ExcInternalError()); if (output) { - cout << "vertex_indices:" << endl; + std::cout << "vertex_indices:" << std::endl; for (unsigned int i=0, v=0; i::read_netcdf (const std::string &filename) AssertThrow(vertices_dim->is_valid(), ExcIO()); const unsigned int n_vertices=vertices_dim->size(); if (output) - cout << "n_vertices=" << n_vertices << endl; + std::cout << "n_vertices=" << n_vertices << std::endl; NcVar *points_xc=nc.get_var("points_xc"); NcVar *points_yc=nc.get_var("points_yc"); @@ -945,10 +947,11 @@ void GridIn<2>::read_netcdf (const std::string &filename) static_cast(n_vertices), ExcIO()); AssertThrow(points_xc->get_dim(0)->size()== static_cast(n_vertices), ExcIO()); - vector > point_values(3, vector (n_vertices)); - points_xc->get(point_values[0].begin(), n_vertices); - points_yc->get(point_values[1].begin(), n_vertices); - points_zc->get(point_values[2].begin(), n_vertices); + std::vector > point_values( + 3, std::vector (n_vertices)); + points_xc->get(&*point_values[0].begin(), n_vertices); + points_yc->get(&*point_values[1].begin(), n_vertices); + points_zc->get(&*point_values[2].begin(), n_vertices); // and fill the vertices std::vector > vertices (n_vertices); @@ -977,7 +980,7 @@ void GridIn<2>::read_netcdf (const std::string &filename) } const int bmarker0=bmarker[quad0]; if (output) - cout << "bmarker0=" << bmarker0 << endl; + std::cout << "bmarker0=" << bmarker0 << std::endl; AssertThrow(n_bquads_per_bmarker[bmarker0]==n_cells, ExcIO()); // fill cells with all quad @@ -1027,7 +1030,7 @@ void GridIn<3>::read_netcdf (const std::string &filename) AssertThrow(elements_dim->is_valid(), ExcIO()); const unsigned int n_cells=elements_dim->size(); if (output) - cout << "n_cell=" << n_cells << endl; + std::cout << "n_cell=" << n_cells << std::endl; // and n_hexes NcDim *hexes_dim=nc.get_dim("no_of_hexaeders"); AssertThrow(hexes_dim->is_valid(), ExcIO()); @@ -1052,20 +1055,22 @@ void GridIn<3>::read_netcdf (const std::string &filename) AssertThrow(static_cast( vertex_indices_var->get_dim(1)->size())==vertices_per_hex, ExcIO()); - vector vertex_indices(n_cells*vertices_per_hex); - vertex_indices_var->get(vertex_indices.begin(), n_cells, vertices_per_hex); + std::vector vertex_indices(n_cells*vertices_per_hex); + // use &* to convert + // vector::iterator to int * + vertex_indices_var->get(&*vertex_indices.begin(), n_cells, vertices_per_hex); for (unsigned int i=0; i=0, ExcInternalError()); if (output) { - cout << "vertex_indices:" << endl; + std::cout << "vertex_indices:" << std::endl; for (unsigned int cell=0, v=0; cell::read_netcdf (const std::string &filename) AssertThrow(vertices_dim->is_valid(), ExcIO()); const unsigned int n_vertices=vertices_dim->size(); if (output) - cout << "n_vertices=" << n_vertices << endl; + std::cout << "n_vertices=" << n_vertices << std::endl; NcVar *points_xc=nc.get_var("points_xc"); NcVar *points_yc=nc.get_var("points_yc"); @@ -1094,10 +1099,11 @@ void GridIn<3>::read_netcdf (const std::string &filename) static_cast(n_vertices), ExcIO()); AssertThrow(points_xc->get_dim(0)->size()== static_cast(n_vertices), ExcIO()); - vector > point_values(3, vector (n_vertices)); - points_xc->get(point_values[0].begin(), n_vertices); - points_yc->get(point_values[1].begin(), n_vertices); - points_zc->get(point_values[2].begin(), n_vertices); + std::vector > point_values( + 3, std::vector (n_vertices)); + points_xc->get(&*point_values[0].begin(), n_vertices); + points_yc->get(&*point_values[1].begin(), n_vertices); + points_zc->get(&*point_values[2].begin(), n_vertices); // and fill the vertices std::vector > vertices (n_vertices);