From c634bcd77bb2894fe6650d2329cf3c3a875935b9 Mon Sep 17 00:00:00 2001 From: kanschat Date: Mon, 20 Sep 2010 16:57:49 +0000 Subject: [PATCH] add memory consmuption info to meshworker classes git-svn-id: https://svn.dealii.org/trunk@22090 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/include/numerics/mesh_worker_info.h | 8 +++++++- .../deal.II/include/numerics/mesh_worker_info.templates.h | 8 ++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/deal.II/deal.II/include/numerics/mesh_worker_info.h b/deal.II/deal.II/include/numerics/mesh_worker_info.h index 551016033f..197f94a20b 100644 --- a/deal.II/deal.II/include/numerics/mesh_worker_info.h +++ b/deal.II/deal.II/include/numerics/mesh_worker_info.h @@ -1279,6 +1279,8 @@ namespace MeshWorker const Mapping& mapping, const BlockInfo* block_info) { + initialize_update_flags(); + cell.template initialize >(el, mapping, cell_quadrature, cell_flags, block_info); boundary.template initialize >(el, mapping, boundary_quadrature, @@ -1300,6 +1302,8 @@ namespace MeshWorker const Mapping<1,1>& mapping, const BlockInfo* block_info) { + initialize_update_flags(); + const int dim = 1; const int sdim = 1; @@ -1317,9 +1321,11 @@ namespace MeshWorker const Mapping<1,2>& mapping, const BlockInfo* block_info) { + initialize_update_flags(); + const int dim = 1; const int sdim = 2; - + cell.initialize >(el, mapping, cell_quadrature, cell_flags, block_info); } diff --git a/deal.II/deal.II/include/numerics/mesh_worker_info.templates.h b/deal.II/deal.II/include/numerics/mesh_worker_info.templates.h index 068db97164..2a4750eaeb 100644 --- a/deal.II/deal.II/include/numerics/mesh_worker_info.templates.h +++ b/deal.II/deal.II/include/numerics/mesh_worker_info.templates.h @@ -199,10 +199,10 @@ namespace MeshWorker void IntegrationInfoBox::initialize_update_flags () { - cell_flags = update_JxW_values; - boundary_flags = UpdateFlags(update_JxW_values | update_normal_vectors); - face_flags = boundary_flags; - neighbor_flags = update_default; + cell_flags |= update_JxW_values; + boundary_flags |= UpdateFlags(update_JxW_values | update_normal_vectors); + face_flags |= boundary_flags; + neighbor_flags |= update_default; if (cell_selector.has_values() != 0) cell_flags |= update_values; if (cell_selector.has_gradients() != 0) cell_flags |= update_gradients; -- 2.39.5