From 51dbb7f7f8af66f3d4a41453b6947b66fd507cde Mon Sep 17 00:00:00 2001 From: hartmann Date: Fri, 30 Sep 2005 16:46:50 +0000 Subject: [PATCH] We do not need marker(no_of_markers). Reorder code. git-svn-id: https://svn.dealii.org/trunk@11562 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/source/grid/grid_in.cc | 83 ++++++++++---------------- 1 file changed, 32 insertions(+), 51 deletions(-) diff --git a/deal.II/deal.II/source/grid/grid_in.cc b/deal.II/deal.II/source/grid/grid_in.cc index 85e78bb77c..3e1427fbb7 100644 --- a/deal.II/deal.II/source/grid/grid_in.cc +++ b/deal.II/deal.II/source/grid/grid_in.cc @@ -1135,55 +1135,12 @@ void GridIn<3>::read_netcdf (const std::string &filename) for (unsigned int i=0; iis_valid(), ExcIO()); - const unsigned int n_markers=marker_dim->size(); - - NcVar *marker_var=nc.get_var("marker"); - AssertThrow(marker_var->is_valid(), ExcIO()); - AssertThrow(marker_var->num_dims()==1, ExcIO()); - AssertThrow(static_cast( - marker_var->get_dim(0)->size())==n_markers, ExcIO()); - - std::vector marker(n_markers); - // use &* to convert - // vector::iterator to int * - marker_var->get(&*marker.begin(), n_markers); - - if (output) - { - std::cout << "marker: "; - for (unsigned int i=0; iis_valid(), ExcIO()); - const unsigned int n_bquads=bquads_dim->size(); - - NcVar *bmarker_var=nc.get_var("boundarymarker_of_surfaces"); - AssertThrow(bmarker_var->is_valid(), ExcIO()); - AssertThrow(bmarker_var->num_dims()==1, ExcIO()); - AssertThrow(static_cast( - bmarker_var->get_dim(0)->size())==n_bquads, ExcIO()); - - std::vector bmarker(n_bquads); - bmarker_var->get(&*bmarker.begin(), n_bquads); - // we only handle boundary - // indicators that fit into an - // unsigned char. Also, we don't - // take 255 as it denotes an - // internal face - for (unsigned int i=0; i::read_netcdf (const std::string &filename) NcVar *bvertex_indices_var=nc.get_var("points_of_surfacequadrilaterals"); AssertThrow(bvertex_indices_var->is_valid(), ExcIO()); AssertThrow(bvertex_indices_var->num_dims()==2, ExcIO()); - AssertThrow(static_cast( - bvertex_indices_var->get_dim(0)->size())==n_bquads, ExcIO()); + const unsigned int n_bquads=bvertex_indices_var->get_dim(0)->size(); AssertThrow(static_cast( bvertex_indices_var->get_dim(1)->size())== GeometryInfo::vertices_per_face, ExcIO()); @@ -1216,6 +1172,31 @@ void GridIn<3>::read_netcdf (const std::string &filename) } } + // next we read + // int boundarymarker_of_surfaces( + // no_of_surfaceelements) + NcDim *bquads_dim=nc.get_dim("no_of_surfacequadrilaterals"); + AssertThrow(bquads_dim->is_valid(), ExcIO()); + AssertThrow(bquads_dim->size()==n_bquads, ExcIO()); + + NcVar *bmarker_var=nc.get_var("boundarymarker_of_surfaces"); + AssertThrow(bmarker_var->is_valid(), ExcIO()); + AssertThrow(bmarker_var->num_dims()==1, ExcIO()); + AssertThrow(static_cast( + bmarker_var->get_dim(0)->size())==n_bquads, ExcIO()); + + std::vector bmarker(n_bquads); + bmarker_var->get(&*bmarker.begin(), n_bquads); + // we only handle boundary + // indicators that fit into an + // unsigned char. Also, we don't + // take 255 as it denotes an + // internal face + for (unsigned int i=0; i