From: Peter Munch Date: Sat, 11 Apr 2020 13:45:49 +0000 (+0200) Subject: Remove MatrixFree::DoFHandlers::level X-Git-Tag: v9.2.0-rc1~245^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=758f1b6c14fdc3f81e263a1ed3157bf4ef21e845;p=dealii.git Remove MatrixFree::DoFHandlers::level --- diff --git a/include/deal.II/matrix_free/matrix_free.h b/include/deal.II/matrix_free/matrix_free.h index bcd71ec4fc..042e47bd4b 100644 --- a/include/deal.II/matrix_free/matrix_free.h +++ b/include/deal.II/matrix_free/matrix_free.h @@ -2053,7 +2053,6 @@ private: DoFHandlers() : active_dof_handler(usual) , n_dof_handlers(0) - , level(numbers::invalid_unsigned_int) {} std::vector>> dof_handler; @@ -2070,7 +2069,6 @@ private: hp } active_dof_handler; unsigned int n_dof_handlers; - unsigned int level; }; /** diff --git a/include/deal.II/matrix_free/matrix_free.templates.h b/include/deal.II/matrix_free/matrix_free.templates.h index 3f973f263c..5d79b28dfc 100644 --- a/include/deal.II/matrix_free/matrix_free.templates.h +++ b/include/deal.II/matrix_free/matrix_free.templates.h @@ -764,7 +764,6 @@ MatrixFree::initialize_dof_handlers( { cell_level_index.clear(); dof_handlers.active_dof_handler = DoFHandlers::usual; - dof_handlers.level = additional_data.mg_level; dof_handlers.n_dof_handlers = dof_handler.size(); dof_handlers.dof_handler.resize(dof_handlers.n_dof_handlers); for (unsigned int no = 0; no < dof_handlers.n_dof_handlers; ++no) @@ -831,10 +830,11 @@ MatrixFree::initialize_dof_handlers( const std::vector *> &dof_handler, const AdditionalData & additional_data) { + (void)additional_data; + cell_level_index.clear(); dof_handlers.active_dof_handler = DoFHandlers::hp; - dof_handlers.level = additional_data.mg_level; - Assert(dof_handlers.level == numbers::invalid_unsigned_int, + Assert(additional_data.mg_level == numbers::invalid_unsigned_int, ExcNotImplemented()); dof_handlers.n_dof_handlers = dof_handler.size(); dof_handlers.hp_dof_handler.resize(dof_handlers.n_dof_handlers); @@ -1039,7 +1039,7 @@ MatrixFree::initialize_indices( { // read indices from standard DoFHandler in the usual way if (dof_handlers.active_dof_handler == DoFHandlers::usual && - dof_handlers.level == numbers::invalid_unsigned_int) + additional_data.mg_level == numbers::invalid_unsigned_int) { const DoFHandler *dofh = &*dof_handlers.dof_handler[no]; typename DoFHandler::active_cell_iterator cell_it( @@ -1067,10 +1067,10 @@ MatrixFree::initialize_indices( } // we are requested to use a multigrid level else if (dof_handlers.active_dof_handler == DoFHandlers::usual && - dof_handlers.level != numbers::invalid_unsigned_int) + additional_data.mg_level != numbers::invalid_unsigned_int) { const DoFHandler *dofh = dof_handlers.dof_handler[no]; - AssertIndexRange(dof_handlers.level, + AssertIndexRange(additional_data.mg_level, dofh->get_triangulation().n_levels()); typename DoFHandler::cell_iterator cell_it( &dofh->get_triangulation(),