From 8eb6d46a2a713c95cb12de848aa33656765d55e6 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Tue, 8 Aug 2017 12:22:10 -0600 Subject: [PATCH] Remove the memory_consumption tests. These have, over the years, caused us significant pain in maintenance (as evidenced by the fact that one of them has 8 output variants). On the other hand, none of us can recall a case where they would have helped track down a bug. Thus, delete them. --- tests/base/memory_consumption_01.cc | 405 ------------------ ...nsumption_01.with_64bit_indices=off.output | 139 ------ ...umption_01.with_64bit_indices=off.output.2 | 139 ------ ...umption_01.with_64bit_indices=off.output.3 | 139 ------ ...umption_01.with_64bit_indices=off.output.4 | 139 ------ ...with_64bit_indices=off.output.clang-libc++ | 139 ------ ...ith_64bit_indices=off.output.clang8-sierra | 139 ------ ...onsumption_01.with_64bit_indices=on.output | 139 ------ ...sumption_01.with_64bit_indices=on.output.2 | 139 ------ tests/base/memory_consumption_02.cc | 92 ---- tests/base/memory_consumption_02.output | 149 ------- tests/base/memory_consumption_03.cc | 34 -- tests/base/memory_consumption_03.output | 3 - 13 files changed, 1795 deletions(-) delete mode 100644 tests/base/memory_consumption_01.cc delete mode 100644 tests/base/memory_consumption_01.with_64bit_indices=off.output delete mode 100644 tests/base/memory_consumption_01.with_64bit_indices=off.output.2 delete mode 100644 tests/base/memory_consumption_01.with_64bit_indices=off.output.3 delete mode 100644 tests/base/memory_consumption_01.with_64bit_indices=off.output.4 delete mode 100644 tests/base/memory_consumption_01.with_64bit_indices=off.output.clang-libc++ delete mode 100644 tests/base/memory_consumption_01.with_64bit_indices=off.output.clang8-sierra delete mode 100644 tests/base/memory_consumption_01.with_64bit_indices=on.output delete mode 100644 tests/base/memory_consumption_01.with_64bit_indices=on.output.2 delete mode 100644 tests/base/memory_consumption_02.cc delete mode 100644 tests/base/memory_consumption_02.output delete mode 100644 tests/base/memory_consumption_03.cc delete mode 100644 tests/base/memory_consumption_03.output diff --git a/tests/base/memory_consumption_01.cc b/tests/base/memory_consumption_01.cc deleted file mode 100644 index ef49eb2c3e..0000000000 --- a/tests/base/memory_consumption_01.cc +++ /dev/null @@ -1,405 +0,0 @@ -// --------------------------------------------------------------------- -// -// Copyright (C) 2007 - 2016 by the deal.II authors -// -// This file is part of the deal.II library. -// -// The deal.II library is free software; you can use it, redistribute -// it, and/or modify it under the terms of the GNU Lesser General -// Public License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// The full text of the license can be found in the file LICENSE at -// the top level of the deal.II distribution. -// -// --------------------------------------------------------------------- - - - -// an only slightly modified version of step-6 in which we compute -// memory consumption data in each iteration - -#include "../tests.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include -#include - - -#include - -#include - -#include - -using namespace dealii; - - - -template -class Step6 -{ -public: - Step6 (); - ~Step6 (); - - void run (); - -private: - void setup_system (); - void assemble_system (); - void solve (); - void refine_grid (); - - Triangulation triangulation; - - DoFHandler dof_handler; - FE_Q fe; - - ConstraintMatrix hanging_node_constraints; - - SparsityPattern sparsity_pattern; - SparseMatrix system_matrix; - - Vector solution; - Vector system_rhs; -}; - - - - -template -class Coefficient : public Function -{ -public: - Coefficient () : Function() {} - - virtual double value (const Point &p, - const unsigned int component = 0) const; - - virtual void value_list (const std::vector > &points, - std::vector &values, - const unsigned int component = 0) const; -}; - - - -template -double Coefficient::value (const Point &p, - const unsigned int) const -{ - if (p.square() < 0.5*0.5) - return 20; - else - return 1; -} - - - -template -void Coefficient::value_list (const std::vector > &points, - std::vector &values, - const unsigned int component) const -{ - const unsigned int n_points = points.size(); - - Assert (values.size() == n_points, - ExcDimensionMismatch (values.size(), n_points)); - - Assert (component == 0, - ExcIndexRange (component, 0, 1)); - - for (unsigned int i=0; i -Step6::Step6 () - : - dof_handler (triangulation), - fe (2) -{} - - - -template -Step6::~Step6 () -{ - dof_handler.clear (); -} - - - -template -void Step6::setup_system () -{ - dof_handler.distribute_dofs (fe); - - solution.reinit (dof_handler.n_dofs()); - system_rhs.reinit (dof_handler.n_dofs()); - - - hanging_node_constraints.clear (); - DoFTools::make_hanging_node_constraints (dof_handler, - hanging_node_constraints); - - hanging_node_constraints.close (); - - DynamicSparsityPattern c_sparsity(dof_handler.n_dofs()); - DoFTools::make_sparsity_pattern (dof_handler, c_sparsity); - - hanging_node_constraints.condense (c_sparsity); - - sparsity_pattern.copy_from(c_sparsity); - - system_matrix.reinit (sparsity_pattern); -} - - -template -void Step6::assemble_system () -{ - const QGauss quadrature_formula(3); - - FEValues fe_values (fe, quadrature_formula, - update_values | update_gradients | - update_quadrature_points | update_JxW_values); - - const unsigned int dofs_per_cell = fe.dofs_per_cell; - const unsigned int n_q_points = quadrature_formula.size(); - - FullMatrix cell_matrix (dofs_per_cell, dofs_per_cell); - Vector cell_rhs (dofs_per_cell); - - std::vector local_dof_indices (dofs_per_cell); - - const Coefficient coefficient; - std::vector coefficient_values (n_q_points); - - typename DoFHandler::active_cell_iterator - cell = dof_handler.begin_active(), - endc = dof_handler.end(); - for (; cell!=endc; ++cell) - { - cell_matrix = 0; - cell_rhs = 0; - - fe_values.reinit (cell); - - coefficient.value_list (fe_values.get_quadrature_points(), - coefficient_values); - - for (unsigned int q_point=0; q_pointget_dof_indices (local_dof_indices); - for (unsigned int i=0; i boundary_values; - VectorTools::interpolate_boundary_values (dof_handler, - 0, - ZeroFunction(), - boundary_values); - MatrixTools::apply_boundary_values (boundary_values, - system_matrix, - solution, - system_rhs); -} - - - - - -template -void Step6::solve () -{ - SolverControl solver_control (1000, 1e-12); - SolverCG<> solver (solver_control); - - PreconditionSSOR<> preconditioner; - preconditioner.initialize(system_matrix, 1.2); - - try - { - deallog.depth_file(0); - solver.solve (system_matrix, solution, system_rhs, - preconditioner); - deallog.depth_file(3); - } - catch (std::exception &e) - { - deallog.depth_file(3); - deallog << e.what() << std::endl; - abort (); - } - - hanging_node_constraints.distribute (solution); -} - - - -template -void Step6::refine_grid () -{ - Vector estimated_error_per_cell (triangulation.n_active_cells()); - - KellyErrorEstimator::estimate (dof_handler, - QGauss(3), - typename FunctionMap::type(), - solution, - estimated_error_per_cell); - - GridRefinement::refine_and_coarsen_fixed_number (triangulation, - estimated_error_per_cell, - 0.3, 0.03); - - triangulation.execute_coarsening_and_refinement (); -} - - - - - -template -void Step6::run () -{ - deallog << dim << "d" << std::endl; - - for (unsigned int cycle=0; cycle<4; ++cycle) - { - deallog << "Cycle " << cycle << ':' << std::endl; - - if (cycle == 0) - { - if (dim > 1) - { - GridGenerator::hyper_ball (triangulation); - - static const HyperBallBoundary boundary; - triangulation.set_boundary (0, boundary); - - triangulation.refine_global (1); - } - else - { - GridGenerator::hyper_cube (triangulation); - triangulation.refine_global (3); - } - } - else - refine_grid (); - - - deallog << " Number of active cells: " - << triangulation.n_active_cells() - << std::endl; - - setup_system (); - - deallog << " Number of degrees of freedom: " - << dof_handler.n_dofs() - << std::endl; - - assemble_system (); - solve (); - - deallog << "Memory consumption -- Triangulation: " << triangulation.memory_consumption() - << std::endl; - deallog << "Memory consumption -- DoFHandler: " << dof_handler.memory_consumption() - << std::endl; - deallog << "Memory consumption -- FE: " << fe.memory_consumption() - << std::endl; - deallog << "Memory consumption -- Constraints: " << hanging_node_constraints.memory_consumption() - << std::endl; - deallog << "Memory consumption -- Sparsity: " << sparsity_pattern.memory_consumption() - << std::endl; - deallog << "Memory consumption -- Matrix: " << system_matrix.memory_consumption() - << std::endl; - deallog << "Memory consumption -- Solution: " << solution.memory_consumption() - << std::endl; - deallog << "Memory consumption -- Rhs: " << system_rhs.memory_consumption() - << std::endl; - } - - DataOutBase::EpsFlags eps_flags; - eps_flags.z_scaling = 4; - - DataOut data_out; - data_out.set_flags (eps_flags); - - data_out.attach_dof_handler (dof_handler); - data_out.add_data_vector (solution, "solution"); - data_out.build_patches (); - - deallog << "Memory consumption -- DataOut: " << data_out.memory_consumption() - << std::endl; -} - - - - -int main() -{ - deal_II_exceptions::disable_abort_on_exception(); - - initlog(); - deallog.threshold_double(1.e-10); - - Step6<1>().run(); - Step6<2>().run(); - Step6<3>().run(); -} diff --git a/tests/base/memory_consumption_01.with_64bit_indices=off.output b/tests/base/memory_consumption_01.with_64bit_indices=off.output deleted file mode 100644 index eea424d401..0000000000 --- a/tests/base/memory_consumption_01.with_64bit_indices=off.output +++ /dev/null @@ -1,139 +0,0 @@ - -DEAL::1d -DEAL::Cycle 0: -DEAL:: Number of active cells: 8 -DEAL:: Number of degrees of freedom: 17 -DEAL::Memory consumption -- Triangulation: 3090 -DEAL::Memory consumption -- DoFHandler: 1016 -DEAL::Memory consumption -- FE: 1480 -DEAL::Memory consumption -- Constraints: 118 -DEAL::Memory consumption -- Sparsity: 456 -DEAL::Memory consumption -- Matrix: 632 -DEAL::Memory consumption -- Solution: 240 -DEAL::Memory consumption -- Rhs: 240 -DEAL::Cycle 1: -DEAL:: Number of active cells: 11 -DEAL:: Number of degrees of freedom: 23 -DEAL::Memory consumption -- Triangulation: 4026 -DEAL::Memory consumption -- DoFHandler: 1204 -DEAL::Memory consumption -- FE: 1480 -DEAL::Memory consumption -- Constraints: 118 -DEAL::Memory consumption -- Sparsity: 576 -DEAL::Memory consumption -- Matrix: 824 -DEAL::Memory consumption -- Solution: 288 -DEAL::Memory consumption -- Rhs: 288 -DEAL::Cycle 2: -DEAL:: Number of active cells: 15 -DEAL:: Number of degrees of freedom: 31 -DEAL::Memory consumption -- Triangulation: 4946 -DEAL::Memory consumption -- DoFHandler: 1396 -DEAL::Memory consumption -- FE: 1480 -DEAL::Memory consumption -- Constraints: 118 -DEAL::Memory consumption -- Sparsity: 736 -DEAL::Memory consumption -- Matrix: 1080 -DEAL::Memory consumption -- Solution: 352 -DEAL::Memory consumption -- Rhs: 352 -DEAL::Cycle 3: -DEAL:: Number of active cells: 20 -DEAL:: Number of degrees of freedom: 41 -DEAL::Memory consumption -- Triangulation: 6090 -DEAL::Memory consumption -- DoFHandler: 1624 -DEAL::Memory consumption -- FE: 1480 -DEAL::Memory consumption -- Constraints: 118 -DEAL::Memory consumption -- Sparsity: 936 -DEAL::Memory consumption -- Matrix: 1400 -DEAL::Memory consumption -- Solution: 432 -DEAL::Memory consumption -- Rhs: 432 -DEAL::Memory consumption -- DataOut: 3490 -DEAL::2d -DEAL::Cycle 0: -DEAL:: Number of active cells: 20 -DEAL:: Number of degrees of freedom: 89 -DEAL::Memory consumption -- Triangulation: 5415 -DEAL::Memory consumption -- DoFHandler: 1976 -DEAL::Memory consumption -- FE: 3896 -DEAL::Memory consumption -- Constraints: 118 -DEAL::Memory consumption -- Sparsity: 5736 -DEAL::Memory consumption -- Matrix: 10616 -DEAL::Memory consumption -- Solution: 816 -DEAL::Memory consumption -- Rhs: 816 -DEAL::Cycle 1: -DEAL:: Number of active cells: 44 -DEAL:: Number of degrees of freedom: 209 -DEAL::Memory consumption -- Triangulation: 11183 -DEAL::Memory consumption -- DoFHandler: 3768 -DEAL::Memory consumption -- FE: 3896 -DEAL::Memory consumption -- Constraints: 3142 -DEAL::Memory consumption -- Sparsity: 13992 -DEAL::Memory consumption -- Matrix: 26168 -DEAL::Memory consumption -- Solution: 1776 -DEAL::Memory consumption -- Rhs: 1776 -DEAL::Cycle 2: -DEAL:: Number of active cells: 92 -DEAL:: Number of degrees of freedom: 449 -DEAL::Memory consumption -- Triangulation: 21895 -DEAL::Memory consumption -- DoFHandler: 7224 -DEAL::Memory consumption -- FE: 3896 -DEAL::Memory consumption -- Constraints: 10774 -DEAL::Memory consumption -- Sparsity: 31240 -DEAL::Memory consumption -- Matrix: 58744 -DEAL::Memory consumption -- Solution: 3696 -DEAL::Memory consumption -- Rhs: 3696 -DEAL::Cycle 3: -DEAL:: Number of active cells: 200 -DEAL:: Number of degrees of freedom: 921 -DEAL::Memory consumption -- Triangulation: 44023 -DEAL::Memory consumption -- DoFHandler: 14712 -DEAL::Memory consumption -- FE: 3896 -DEAL::Memory consumption -- Constraints: 20006 -DEAL::Memory consumption -- Sparsity: 64168 -DEAL::Memory consumption -- Matrix: 120824 -DEAL::Memory consumption -- Solution: 7472 -DEAL::Memory consumption -- Rhs: 7472 -DEAL::Memory consumption -- DataOut: 42950 -DEAL::3d -DEAL::Cycle 0: -DEAL:: Number of active cells: 56 -DEAL:: Number of degrees of freedom: 517 -DEAL::Memory consumption -- Triangulation: 25011 -DEAL::Memory consumption -- DoFHandler: 9800 -DEAL::Memory consumption -- FE: 12272 -DEAL::Memory consumption -- Constraints: 118 -DEAL::Memory consumption -- Sparsity: 120280 -DEAL::Memory consumption -- Matrix: 236280 -DEAL::Memory consumption -- Solution: 4240 -DEAL::Memory consumption -- Rhs: 4240 -DEAL::Cycle 1: -DEAL:: Number of active cells: 217 -DEAL:: Number of degrees of freedom: 2217 -DEAL::Memory consumption -- Triangulation: 98505 -DEAL::Memory consumption -- DoFHandler: 38036 -DEAL::Memory consumption -- FE: 12272 -DEAL::Memory consumption -- Constraints: 55302 -DEAL::Memory consumption -- Sparsity: 567152 -DEAL::Memory consumption -- Matrix: 1116424 -DEAL::Memory consumption -- Solution: 17840 -DEAL::Memory consumption -- Rhs: 17840 -DEAL::Cycle 2: -DEAL:: Number of active cells: 896 -DEAL:: Number of degrees of freedom: 9373 -DEAL::Memory consumption -- Triangulation: 395027 -DEAL::Memory consumption -- DoFHandler: 151320 -DEAL::Memory consumption -- FE: 12272 -DEAL::Memory consumption -- Constraints: 367126 -DEAL::Memory consumption -- Sparsity: 2517208 -DEAL::Memory consumption -- Matrix: 4959288 -DEAL::Memory consumption -- Solution: 75088 -DEAL::Memory consumption -- Rhs: 75088 -DEAL::Cycle 3: -DEAL:: Number of active cells: 3248 -DEAL:: Number of degrees of freedom: 32433 -DEAL::Memory consumption -- Triangulation: 1390231 -DEAL::Memory consumption -- DoFHandler: 542048 -DEAL::Memory consumption -- FE: 12272 -DEAL::Memory consumption -- Constraints: 1307846 -DEAL::Memory consumption -- Sparsity: 8321768 -DEAL::Memory consumption -- Matrix: 16383928 -DEAL::Memory consumption -- Solution: 259568 -DEAL::Memory consumption -- Rhs: 259568 -DEAL::Memory consumption -- DataOut: 1159886 diff --git a/tests/base/memory_consumption_01.with_64bit_indices=off.output.2 b/tests/base/memory_consumption_01.with_64bit_indices=off.output.2 deleted file mode 100644 index 7953dd1ae0..0000000000 --- a/tests/base/memory_consumption_01.with_64bit_indices=off.output.2 +++ /dev/null @@ -1,139 +0,0 @@ - -DEAL::1d -DEAL::Cycle 0: -DEAL:: Number of active cells: 8 -DEAL:: Number of degrees of freedom: 17 -DEAL::Memory consumption -- Triangulation: 3090 -DEAL::Memory consumption -- DoFHandler: 976 -DEAL::Memory consumption -- FE: 1488 -DEAL::Memory consumption -- Constraints: 78 -DEAL::Memory consumption -- Sparsity: 456 -DEAL::Memory consumption -- Matrix: 632 -DEAL::Memory consumption -- Solution: 240 -DEAL::Memory consumption -- Rhs: 240 -DEAL::Cycle 1: -DEAL:: Number of active cells: 11 -DEAL:: Number of degrees of freedom: 23 -DEAL::Memory consumption -- Triangulation: 4026 -DEAL::Memory consumption -- DoFHandler: 1164 -DEAL::Memory consumption -- FE: 1488 -DEAL::Memory consumption -- Constraints: 78 -DEAL::Memory consumption -- Sparsity: 576 -DEAL::Memory consumption -- Matrix: 824 -DEAL::Memory consumption -- Solution: 288 -DEAL::Memory consumption -- Rhs: 288 -DEAL::Cycle 2: -DEAL:: Number of active cells: 15 -DEAL:: Number of degrees of freedom: 31 -DEAL::Memory consumption -- Triangulation: 4946 -DEAL::Memory consumption -- DoFHandler: 1356 -DEAL::Memory consumption -- FE: 1488 -DEAL::Memory consumption -- Constraints: 78 -DEAL::Memory consumption -- Sparsity: 736 -DEAL::Memory consumption -- Matrix: 1080 -DEAL::Memory consumption -- Solution: 352 -DEAL::Memory consumption -- Rhs: 352 -DEAL::Cycle 3: -DEAL:: Number of active cells: 20 -DEAL:: Number of degrees of freedom: 41 -DEAL::Memory consumption -- Triangulation: 6090 -DEAL::Memory consumption -- DoFHandler: 1584 -DEAL::Memory consumption -- FE: 1488 -DEAL::Memory consumption -- Constraints: 78 -DEAL::Memory consumption -- Sparsity: 936 -DEAL::Memory consumption -- Matrix: 1400 -DEAL::Memory consumption -- Solution: 432 -DEAL::Memory consumption -- Rhs: 432 -DEAL::Memory consumption -- DataOut: 3490 -DEAL::2d -DEAL::Cycle 0: -DEAL:: Number of active cells: 20 -DEAL:: Number of degrees of freedom: 89 -DEAL::Memory consumption -- Triangulation: 5431 -DEAL::Memory consumption -- DoFHandler: 1936 -DEAL::Memory consumption -- FE: 3904 -DEAL::Memory consumption -- Constraints: 78 -DEAL::Memory consumption -- Sparsity: 5736 -DEAL::Memory consumption -- Matrix: 10616 -DEAL::Memory consumption -- Solution: 816 -DEAL::Memory consumption -- Rhs: 816 -DEAL::Cycle 1: -DEAL:: Number of active cells: 44 -DEAL:: Number of degrees of freedom: 209 -DEAL::Memory consumption -- Triangulation: 11215 -DEAL::Memory consumption -- DoFHandler: 3728 -DEAL::Memory consumption -- FE: 3904 -DEAL::Memory consumption -- Constraints: 3102 -DEAL::Memory consumption -- Sparsity: 13992 -DEAL::Memory consumption -- Matrix: 26168 -DEAL::Memory consumption -- Solution: 1776 -DEAL::Memory consumption -- Rhs: 1776 -DEAL::Cycle 2: -DEAL:: Number of active cells: 92 -DEAL:: Number of degrees of freedom: 449 -DEAL::Memory consumption -- Triangulation: 21927 -DEAL::Memory consumption -- DoFHandler: 7184 -DEAL::Memory consumption -- FE: 3904 -DEAL::Memory consumption -- Constraints: 10734 -DEAL::Memory consumption -- Sparsity: 31240 -DEAL::Memory consumption -- Matrix: 58744 -DEAL::Memory consumption -- Solution: 3696 -DEAL::Memory consumption -- Rhs: 3696 -DEAL::Cycle 3: -DEAL:: Number of active cells: 200 -DEAL:: Number of degrees of freedom: 921 -DEAL::Memory consumption -- Triangulation: 44055 -DEAL::Memory consumption -- DoFHandler: 14672 -DEAL::Memory consumption -- FE: 3904 -DEAL::Memory consumption -- Constraints: 19966 -DEAL::Memory consumption -- Sparsity: 64168 -DEAL::Memory consumption -- Matrix: 120824 -DEAL::Memory consumption -- Solution: 7472 -DEAL::Memory consumption -- Rhs: 7472 -DEAL::Memory consumption -- DataOut: 42950 -DEAL::3d -DEAL::Cycle 0: -DEAL:: Number of active cells: 56 -DEAL:: Number of degrees of freedom: 517 -DEAL::Memory consumption -- Triangulation: 25043 -DEAL::Memory consumption -- DoFHandler: 9760 -DEAL::Memory consumption -- FE: 12280 -DEAL::Memory consumption -- Constraints: 78 -DEAL::Memory consumption -- Sparsity: 120280 -DEAL::Memory consumption -- Matrix: 236280 -DEAL::Memory consumption -- Solution: 4240 -DEAL::Memory consumption -- Rhs: 4240 -DEAL::Cycle 1: -DEAL:: Number of active cells: 217 -DEAL:: Number of degrees of freedom: 2217 -DEAL::Memory consumption -- Triangulation: 98569 -DEAL::Memory consumption -- DoFHandler: 37996 -DEAL::Memory consumption -- FE: 12280 -DEAL::Memory consumption -- Constraints: 55262 -DEAL::Memory consumption -- Sparsity: 567152 -DEAL::Memory consumption -- Matrix: 1116424 -DEAL::Memory consumption -- Solution: 17840 -DEAL::Memory consumption -- Rhs: 17840 -DEAL::Cycle 2: -DEAL:: Number of active cells: 896 -DEAL:: Number of degrees of freedom: 9373 -DEAL::Memory consumption -- Triangulation: 395091 -DEAL::Memory consumption -- DoFHandler: 151280 -DEAL::Memory consumption -- FE: 12280 -DEAL::Memory consumption -- Constraints: 367086 -DEAL::Memory consumption -- Sparsity: 2517208 -DEAL::Memory consumption -- Matrix: 4959288 -DEAL::Memory consumption -- Solution: 75088 -DEAL::Memory consumption -- Rhs: 75088 -DEAL::Cycle 3: -DEAL:: Number of active cells: 3248 -DEAL:: Number of degrees of freedom: 32433 -DEAL::Memory consumption -- Triangulation: 1390359 -DEAL::Memory consumption -- DoFHandler: 542008 -DEAL::Memory consumption -- FE: 12280 -DEAL::Memory consumption -- Constraints: 1307806 -DEAL::Memory consumption -- Sparsity: 8321768 -DEAL::Memory consumption -- Matrix: 16383928 -DEAL::Memory consumption -- Solution: 259568 -DEAL::Memory consumption -- Rhs: 259568 -DEAL::Memory consumption -- DataOut: 1159886 diff --git a/tests/base/memory_consumption_01.with_64bit_indices=off.output.3 b/tests/base/memory_consumption_01.with_64bit_indices=off.output.3 deleted file mode 100644 index 646851b539..0000000000 --- a/tests/base/memory_consumption_01.with_64bit_indices=off.output.3 +++ /dev/null @@ -1,139 +0,0 @@ - -DEAL::1d -DEAL::Cycle 0: -DEAL:: Number of active cells: 8 -DEAL:: Number of degrees of freedom: 17 -DEAL::Memory consumption -- Triangulation: 3090 -DEAL::Memory consumption -- DoFHandler: 1016 -DEAL::Memory consumption -- FE: 1480 -DEAL::Memory consumption -- Constraints: 118 -DEAL::Memory consumption -- Sparsity: 456 -DEAL::Memory consumption -- Matrix: 632 -DEAL::Memory consumption -- Solution: 240 -DEAL::Memory consumption -- Rhs: 240 -DEAL::Cycle 1: -DEAL:: Number of active cells: 11 -DEAL:: Number of degrees of freedom: 23 -DEAL::Memory consumption -- Triangulation: 4026 -DEAL::Memory consumption -- DoFHandler: 1204 -DEAL::Memory consumption -- FE: 1480 -DEAL::Memory consumption -- Constraints: 118 -DEAL::Memory consumption -- Sparsity: 576 -DEAL::Memory consumption -- Matrix: 824 -DEAL::Memory consumption -- Solution: 288 -DEAL::Memory consumption -- Rhs: 288 -DEAL::Cycle 2: -DEAL:: Number of active cells: 15 -DEAL:: Number of degrees of freedom: 31 -DEAL::Memory consumption -- Triangulation: 4946 -DEAL::Memory consumption -- DoFHandler: 1396 -DEAL::Memory consumption -- FE: 1480 -DEAL::Memory consumption -- Constraints: 118 -DEAL::Memory consumption -- Sparsity: 736 -DEAL::Memory consumption -- Matrix: 1080 -DEAL::Memory consumption -- Solution: 352 -DEAL::Memory consumption -- Rhs: 352 -DEAL::Cycle 3: -DEAL:: Number of active cells: 20 -DEAL:: Number of degrees of freedom: 41 -DEAL::Memory consumption -- Triangulation: 6090 -DEAL::Memory consumption -- DoFHandler: 1624 -DEAL::Memory consumption -- FE: 1480 -DEAL::Memory consumption -- Constraints: 118 -DEAL::Memory consumption -- Sparsity: 936 -DEAL::Memory consumption -- Matrix: 1400 -DEAL::Memory consumption -- Solution: 432 -DEAL::Memory consumption -- Rhs: 432 -DEAL::Memory consumption -- DataOut: 3394 -DEAL::2d -DEAL::Cycle 0: -DEAL:: Number of active cells: 20 -DEAL:: Number of degrees of freedom: 89 -DEAL::Memory consumption -- Triangulation: 5415 -DEAL::Memory consumption -- DoFHandler: 1976 -DEAL::Memory consumption -- FE: 3896 -DEAL::Memory consumption -- Constraints: 118 -DEAL::Memory consumption -- Sparsity: 5736 -DEAL::Memory consumption -- Matrix: 10616 -DEAL::Memory consumption -- Solution: 816 -DEAL::Memory consumption -- Rhs: 816 -DEAL::Cycle 1: -DEAL:: Number of active cells: 44 -DEAL:: Number of degrees of freedom: 209 -DEAL::Memory consumption -- Triangulation: 11183 -DEAL::Memory consumption -- DoFHandler: 3768 -DEAL::Memory consumption -- FE: 3896 -DEAL::Memory consumption -- Constraints: 3142 -DEAL::Memory consumption -- Sparsity: 13992 -DEAL::Memory consumption -- Matrix: 26168 -DEAL::Memory consumption -- Solution: 1776 -DEAL::Memory consumption -- Rhs: 1776 -DEAL::Cycle 2: -DEAL:: Number of active cells: 92 -DEAL:: Number of degrees of freedom: 449 -DEAL::Memory consumption -- Triangulation: 21895 -DEAL::Memory consumption -- DoFHandler: 7224 -DEAL::Memory consumption -- FE: 3896 -DEAL::Memory consumption -- Constraints: 10774 -DEAL::Memory consumption -- Sparsity: 31240 -DEAL::Memory consumption -- Matrix: 58744 -DEAL::Memory consumption -- Solution: 3696 -DEAL::Memory consumption -- Rhs: 3696 -DEAL::Cycle 3: -DEAL:: Number of active cells: 200 -DEAL:: Number of degrees of freedom: 921 -DEAL::Memory consumption -- Triangulation: 44023 -DEAL::Memory consumption -- DoFHandler: 14712 -DEAL::Memory consumption -- FE: 3896 -DEAL::Memory consumption -- Constraints: 20006 -DEAL::Memory consumption -- Sparsity: 64168 -DEAL::Memory consumption -- Matrix: 120824 -DEAL::Memory consumption -- Solution: 7472 -DEAL::Memory consumption -- Rhs: 7472 -DEAL::Memory consumption -- DataOut: 42854 -DEAL::3d -DEAL::Cycle 0: -DEAL:: Number of active cells: 56 -DEAL:: Number of degrees of freedom: 517 -DEAL::Memory consumption -- Triangulation: 25011 -DEAL::Memory consumption -- DoFHandler: 9800 -DEAL::Memory consumption -- FE: 12272 -DEAL::Memory consumption -- Constraints: 118 -DEAL::Memory consumption -- Sparsity: 120280 -DEAL::Memory consumption -- Matrix: 236280 -DEAL::Memory consumption -- Solution: 4240 -DEAL::Memory consumption -- Rhs: 4240 -DEAL::Cycle 1: -DEAL:: Number of active cells: 217 -DEAL:: Number of degrees of freedom: 2217 -DEAL::Memory consumption -- Triangulation: 98505 -DEAL::Memory consumption -- DoFHandler: 38036 -DEAL::Memory consumption -- FE: 12272 -DEAL::Memory consumption -- Constraints: 55302 -DEAL::Memory consumption -- Sparsity: 567152 -DEAL::Memory consumption -- Matrix: 1116424 -DEAL::Memory consumption -- Solution: 17840 -DEAL::Memory consumption -- Rhs: 17840 -DEAL::Cycle 2: -DEAL:: Number of active cells: 896 -DEAL:: Number of degrees of freedom: 9373 -DEAL::Memory consumption -- Triangulation: 395027 -DEAL::Memory consumption -- DoFHandler: 151320 -DEAL::Memory consumption -- FE: 12272 -DEAL::Memory consumption -- Constraints: 367126 -DEAL::Memory consumption -- Sparsity: 2517208 -DEAL::Memory consumption -- Matrix: 4959288 -DEAL::Memory consumption -- Solution: 75088 -DEAL::Memory consumption -- Rhs: 75088 -DEAL::Cycle 3: -DEAL:: Number of active cells: 3248 -DEAL:: Number of degrees of freedom: 32433 -DEAL::Memory consumption -- Triangulation: 1390231 -DEAL::Memory consumption -- DoFHandler: 542048 -DEAL::Memory consumption -- FE: 12272 -DEAL::Memory consumption -- Constraints: 1307846 -DEAL::Memory consumption -- Sparsity: 8321768 -DEAL::Memory consumption -- Matrix: 16383928 -DEAL::Memory consumption -- Solution: 259568 -DEAL::Memory consumption -- Rhs: 259568 -DEAL::Memory consumption -- DataOut: 1159790 diff --git a/tests/base/memory_consumption_01.with_64bit_indices=off.output.4 b/tests/base/memory_consumption_01.with_64bit_indices=off.output.4 deleted file mode 100644 index 419b6a54c0..0000000000 --- a/tests/base/memory_consumption_01.with_64bit_indices=off.output.4 +++ /dev/null @@ -1,139 +0,0 @@ - -DEAL::1d -DEAL::Cycle 0: -DEAL:: Number of active cells: 8 -DEAL:: Number of degrees of freedom: 17 -DEAL::Memory consumption -- Triangulation: 3090 -DEAL::Memory consumption -- DoFHandler: 976 -DEAL::Memory consumption -- FE: 1480 -DEAL::Memory consumption -- Constraints: 79 -DEAL::Memory consumption -- Sparsity: 456 -DEAL::Memory consumption -- Matrix: 632 -DEAL::Memory consumption -- Solution: 240 -DEAL::Memory consumption -- Rhs: 240 -DEAL::Cycle 1: -DEAL:: Number of active cells: 11 -DEAL:: Number of degrees of freedom: 23 -DEAL::Memory consumption -- Triangulation: 4026 -DEAL::Memory consumption -- DoFHandler: 1164 -DEAL::Memory consumption -- FE: 1480 -DEAL::Memory consumption -- Constraints: 79 -DEAL::Memory consumption -- Sparsity: 576 -DEAL::Memory consumption -- Matrix: 824 -DEAL::Memory consumption -- Solution: 288 -DEAL::Memory consumption -- Rhs: 288 -DEAL::Cycle 2: -DEAL:: Number of active cells: 15 -DEAL:: Number of degrees of freedom: 31 -DEAL::Memory consumption -- Triangulation: 4946 -DEAL::Memory consumption -- DoFHandler: 1356 -DEAL::Memory consumption -- FE: 1480 -DEAL::Memory consumption -- Constraints: 79 -DEAL::Memory consumption -- Sparsity: 736 -DEAL::Memory consumption -- Matrix: 1080 -DEAL::Memory consumption -- Solution: 352 -DEAL::Memory consumption -- Rhs: 352 -DEAL::Cycle 3: -DEAL:: Number of active cells: 20 -DEAL:: Number of degrees of freedom: 41 -DEAL::Memory consumption -- Triangulation: 6090 -DEAL::Memory consumption -- DoFHandler: 1584 -DEAL::Memory consumption -- FE: 1480 -DEAL::Memory consumption -- Constraints: 79 -DEAL::Memory consumption -- Sparsity: 936 -DEAL::Memory consumption -- Matrix: 1400 -DEAL::Memory consumption -- Solution: 432 -DEAL::Memory consumption -- Rhs: 432 -DEAL::Memory consumption -- DataOut: 3394 -DEAL::2d -DEAL::Cycle 0: -DEAL:: Number of active cells: 20 -DEAL:: Number of degrees of freedom: 89 -DEAL::Memory consumption -- Triangulation: 5415 -DEAL::Memory consumption -- DoFHandler: 1936 -DEAL::Memory consumption -- FE: 3896 -DEAL::Memory consumption -- Constraints: 79 -DEAL::Memory consumption -- Sparsity: 5736 -DEAL::Memory consumption -- Matrix: 10616 -DEAL::Memory consumption -- Solution: 816 -DEAL::Memory consumption -- Rhs: 816 -DEAL::Cycle 1: -DEAL:: Number of active cells: 44 -DEAL:: Number of degrees of freedom: 209 -DEAL::Memory consumption -- Triangulation: 11183 -DEAL::Memory consumption -- DoFHandler: 3728 -DEAL::Memory consumption -- FE: 3896 -DEAL::Memory consumption -- Constraints: 3103 -DEAL::Memory consumption -- Sparsity: 13992 -DEAL::Memory consumption -- Matrix: 26168 -DEAL::Memory consumption -- Solution: 1776 -DEAL::Memory consumption -- Rhs: 1776 -DEAL::Cycle 2: -DEAL:: Number of active cells: 92 -DEAL:: Number of degrees of freedom: 449 -DEAL::Memory consumption -- Triangulation: 21895 -DEAL::Memory consumption -- DoFHandler: 7184 -DEAL::Memory consumption -- FE: 3896 -DEAL::Memory consumption -- Constraints: 10735 -DEAL::Memory consumption -- Sparsity: 31240 -DEAL::Memory consumption -- Matrix: 58744 -DEAL::Memory consumption -- Solution: 3696 -DEAL::Memory consumption -- Rhs: 3696 -DEAL::Cycle 3: -DEAL:: Number of active cells: 200 -DEAL:: Number of degrees of freedom: 921 -DEAL::Memory consumption -- Triangulation: 44023 -DEAL::Memory consumption -- DoFHandler: 14672 -DEAL::Memory consumption -- FE: 3896 -DEAL::Memory consumption -- Constraints: 19967 -DEAL::Memory consumption -- Sparsity: 64168 -DEAL::Memory consumption -- Matrix: 120824 -DEAL::Memory consumption -- Solution: 7472 -DEAL::Memory consumption -- Rhs: 7472 -DEAL::Memory consumption -- DataOut: 42854 -DEAL::3d -DEAL::Cycle 0: -DEAL:: Number of active cells: 56 -DEAL:: Number of degrees of freedom: 517 -DEAL::Memory consumption -- Triangulation: 25011 -DEAL::Memory consumption -- DoFHandler: 9760 -DEAL::Memory consumption -- FE: 12272 -DEAL::Memory consumption -- Constraints: 79 -DEAL::Memory consumption -- Sparsity: 120280 -DEAL::Memory consumption -- Matrix: 236280 -DEAL::Memory consumption -- Solution: 4240 -DEAL::Memory consumption -- Rhs: 4240 -DEAL::Cycle 1: -DEAL:: Number of active cells: 217 -DEAL:: Number of degrees of freedom: 2217 -DEAL::Memory consumption -- Triangulation: 98505 -DEAL::Memory consumption -- DoFHandler: 37996 -DEAL::Memory consumption -- FE: 12272 -DEAL::Memory consumption -- Constraints: 55263 -DEAL::Memory consumption -- Sparsity: 567152 -DEAL::Memory consumption -- Matrix: 1116424 -DEAL::Memory consumption -- Solution: 17840 -DEAL::Memory consumption -- Rhs: 17840 -DEAL::Cycle 2: -DEAL:: Number of active cells: 896 -DEAL:: Number of degrees of freedom: 9373 -DEAL::Memory consumption -- Triangulation: 395027 -DEAL::Memory consumption -- DoFHandler: 151280 -DEAL::Memory consumption -- FE: 12272 -DEAL::Memory consumption -- Constraints: 367087 -DEAL::Memory consumption -- Sparsity: 2517208 -DEAL::Memory consumption -- Matrix: 4959288 -DEAL::Memory consumption -- Solution: 75088 -DEAL::Memory consumption -- Rhs: 75088 -DEAL::Cycle 3: -DEAL:: Number of active cells: 3248 -DEAL:: Number of degrees of freedom: 32433 -DEAL::Memory consumption -- Triangulation: 1390231 -DEAL::Memory consumption -- DoFHandler: 542008 -DEAL::Memory consumption -- FE: 12272 -DEAL::Memory consumption -- Constraints: 1307807 -DEAL::Memory consumption -- Sparsity: 8321768 -DEAL::Memory consumption -- Matrix: 16383928 -DEAL::Memory consumption -- Solution: 259568 -DEAL::Memory consumption -- Rhs: 259568 -DEAL::Memory consumption -- DataOut: 1159790 diff --git a/tests/base/memory_consumption_01.with_64bit_indices=off.output.clang-libc++ b/tests/base/memory_consumption_01.with_64bit_indices=off.output.clang-libc++ deleted file mode 100644 index 32d57877ea..0000000000 --- a/tests/base/memory_consumption_01.with_64bit_indices=off.output.clang-libc++ +++ /dev/null @@ -1,139 +0,0 @@ - -DEAL::1d -DEAL::Cycle 0: -DEAL:: Number of active cells: 8 -DEAL:: Number of degrees of freedom: 17 -DEAL::Memory consumption -- Triangulation: 2842 -DEAL::Memory consumption -- DoFHandler: 928 -DEAL::Memory consumption -- FE: 1232 -DEAL::Memory consumption -- Constraints: 78 -DEAL::Memory consumption -- Sparsity: 432 -DEAL::Memory consumption -- Matrix: 608 -DEAL::Memory consumption -- Solution: 216 -DEAL::Memory consumption -- Rhs: 216 -DEAL::Cycle 1: -DEAL:: Number of active cells: 11 -DEAL:: Number of degrees of freedom: 23 -DEAL::Memory consumption -- Triangulation: 3650 -DEAL::Memory consumption -- DoFHandler: 1116 -DEAL::Memory consumption -- FE: 1232 -DEAL::Memory consumption -- Constraints: 78 -DEAL::Memory consumption -- Sparsity: 552 -DEAL::Memory consumption -- Matrix: 800 -DEAL::Memory consumption -- Solution: 264 -DEAL::Memory consumption -- Rhs: 264 -DEAL::Cycle 2: -DEAL:: Number of active cells: 15 -DEAL:: Number of degrees of freedom: 31 -DEAL::Memory consumption -- Triangulation: 4506 -DEAL::Memory consumption -- DoFHandler: 1308 -DEAL::Memory consumption -- FE: 1232 -DEAL::Memory consumption -- Constraints: 78 -DEAL::Memory consumption -- Sparsity: 712 -DEAL::Memory consumption -- Matrix: 1056 -DEAL::Memory consumption -- Solution: 328 -DEAL::Memory consumption -- Rhs: 328 -DEAL::Cycle 3: -DEAL:: Number of active cells: 20 -DEAL:: Number of degrees of freedom: 41 -DEAL::Memory consumption -- Triangulation: 5602 -DEAL::Memory consumption -- DoFHandler: 1536 -DEAL::Memory consumption -- FE: 1232 -DEAL::Memory consumption -- Constraints: 78 -DEAL::Memory consumption -- Sparsity: 912 -DEAL::Memory consumption -- Matrix: 1376 -DEAL::Memory consumption -- Solution: 408 -DEAL::Memory consumption -- Rhs: 408 -DEAL::Memory consumption -- DataOut: 2978 -DEAL::2d -DEAL::Cycle 0: -DEAL:: Number of active cells: 20 -DEAL:: Number of degrees of freedom: 89 -DEAL::Memory consumption -- Triangulation: 5231 -DEAL::Memory consumption -- DoFHandler: 1888 -DEAL::Memory consumption -- FE: 3168 -DEAL::Memory consumption -- Constraints: 78 -DEAL::Memory consumption -- Sparsity: 5712 -DEAL::Memory consumption -- Matrix: 10592 -DEAL::Memory consumption -- Solution: 792 -DEAL::Memory consumption -- Rhs: 792 -DEAL::Cycle 1: -DEAL:: Number of active cells: 44 -DEAL:: Number of degrees of freedom: 209 -DEAL::Memory consumption -- Triangulation: 10951 -DEAL::Memory consumption -- DoFHandler: 3680 -DEAL::Memory consumption -- FE: 3168 -DEAL::Memory consumption -- Constraints: 3102 -DEAL::Memory consumption -- Sparsity: 13968 -DEAL::Memory consumption -- Matrix: 26144 -DEAL::Memory consumption -- Solution: 1752 -DEAL::Memory consumption -- Rhs: 1752 -DEAL::Cycle 2: -DEAL:: Number of active cells: 92 -DEAL:: Number of degrees of freedom: 449 -DEAL::Memory consumption -- Triangulation: 21599 -DEAL::Memory consumption -- DoFHandler: 7136 -DEAL::Memory consumption -- FE: 3168 -DEAL::Memory consumption -- Constraints: 10734 -DEAL::Memory consumption -- Sparsity: 31216 -DEAL::Memory consumption -- Matrix: 58720 -DEAL::Memory consumption -- Solution: 3672 -DEAL::Memory consumption -- Rhs: 3672 -DEAL::Cycle 3: -DEAL:: Number of active cells: 200 -DEAL:: Number of degrees of freedom: 921 -DEAL::Memory consumption -- Triangulation: 43727 -DEAL::Memory consumption -- DoFHandler: 14624 -DEAL::Memory consumption -- FE: 3168 -DEAL::Memory consumption -- Constraints: 19966 -DEAL::Memory consumption -- Sparsity: 64144 -DEAL::Memory consumption -- Matrix: 120800 -DEAL::Memory consumption -- Solution: 7448 -DEAL::Memory consumption -- Rhs: 7448 -DEAL::Memory consumption -- DataOut: 38118 -DEAL::3d -DEAL::Cycle 0: -DEAL:: Number of active cells: 56 -DEAL:: Number of degrees of freedom: 517 -DEAL::Memory consumption -- Triangulation: 24699 -DEAL::Memory consumption -- DoFHandler: 9712 -DEAL::Memory consumption -- FE: 10104 -DEAL::Memory consumption -- Constraints: 78 -DEAL::Memory consumption -- Sparsity: 120256 -DEAL::Memory consumption -- Matrix: 236256 -DEAL::Memory consumption -- Solution: 4216 -DEAL::Memory consumption -- Rhs: 4216 -DEAL::Cycle 1: -DEAL:: Number of active cells: 217 -DEAL:: Number of degrees of freedom: 2217 -DEAL::Memory consumption -- Triangulation: 98113 -DEAL::Memory consumption -- DoFHandler: 37948 -DEAL::Memory consumption -- FE: 10104 -DEAL::Memory consumption -- Constraints: 55262 -DEAL::Memory consumption -- Sparsity: 567128 -DEAL::Memory consumption -- Matrix: 1116400 -DEAL::Memory consumption -- Solution: 17816 -DEAL::Memory consumption -- Rhs: 17816 -DEAL::Cycle 2: -DEAL:: Number of active cells: 896 -DEAL:: Number of degrees of freedom: 9373 -DEAL::Memory consumption -- Triangulation: 394523 -DEAL::Memory consumption -- DoFHandler: 151232 -DEAL::Memory consumption -- FE: 10104 -DEAL::Memory consumption -- Constraints: 367086 -DEAL::Memory consumption -- Sparsity: 2517184 -DEAL::Memory consumption -- Matrix: 4959264 -DEAL::Memory consumption -- Solution: 75064 -DEAL::Memory consumption -- Rhs: 75064 -DEAL::Cycle 3: -DEAL:: Number of active cells: 3248 -DEAL:: Number of degrees of freedom: 32433 -DEAL::Memory consumption -- Triangulation: 1389679 -DEAL::Memory consumption -- DoFHandler: 541960 -DEAL::Memory consumption -- FE: 10104 -DEAL::Memory consumption -- Constraints: 1307806 -DEAL::Memory consumption -- Sparsity: 8321744 -DEAL::Memory consumption -- Matrix: 16383904 -DEAL::Memory consumption -- Solution: 259544 -DEAL::Memory consumption -- Rhs: 259544 -DEAL::Memory consumption -- DataOut: 1081902 diff --git a/tests/base/memory_consumption_01.with_64bit_indices=off.output.clang8-sierra b/tests/base/memory_consumption_01.with_64bit_indices=off.output.clang8-sierra deleted file mode 100644 index 0eafee19b0..0000000000 --- a/tests/base/memory_consumption_01.with_64bit_indices=off.output.clang8-sierra +++ /dev/null @@ -1,139 +0,0 @@ - -DEAL::1d -DEAL::Cycle 0: -DEAL:: Number of active cells: 8 -DEAL:: Number of degrees of freedom: 17 -DEAL::Memory consumption -- Triangulation: 2842 -DEAL::Memory consumption -- DoFHandler: 992 -DEAL::Memory consumption -- FE: 1224 -DEAL::Memory consumption -- Constraints: 142 -DEAL::Memory consumption -- Sparsity: 432 -DEAL::Memory consumption -- Matrix: 608 -DEAL::Memory consumption -- Solution: 216 -DEAL::Memory consumption -- Rhs: 216 -DEAL::Cycle 1: -DEAL:: Number of active cells: 11 -DEAL:: Number of degrees of freedom: 23 -DEAL::Memory consumption -- Triangulation: 3650 -DEAL::Memory consumption -- DoFHandler: 1180 -DEAL::Memory consumption -- FE: 1224 -DEAL::Memory consumption -- Constraints: 142 -DEAL::Memory consumption -- Sparsity: 552 -DEAL::Memory consumption -- Matrix: 800 -DEAL::Memory consumption -- Solution: 264 -DEAL::Memory consumption -- Rhs: 264 -DEAL::Cycle 2: -DEAL:: Number of active cells: 15 -DEAL:: Number of degrees of freedom: 31 -DEAL::Memory consumption -- Triangulation: 4506 -DEAL::Memory consumption -- DoFHandler: 1372 -DEAL::Memory consumption -- FE: 1224 -DEAL::Memory consumption -- Constraints: 142 -DEAL::Memory consumption -- Sparsity: 712 -DEAL::Memory consumption -- Matrix: 1056 -DEAL::Memory consumption -- Solution: 328 -DEAL::Memory consumption -- Rhs: 328 -DEAL::Cycle 3: -DEAL:: Number of active cells: 20 -DEAL:: Number of degrees of freedom: 41 -DEAL::Memory consumption -- Triangulation: 5602 -DEAL::Memory consumption -- DoFHandler: 1600 -DEAL::Memory consumption -- FE: 1224 -DEAL::Memory consumption -- Constraints: 142 -DEAL::Memory consumption -- Sparsity: 912 -DEAL::Memory consumption -- Matrix: 1376 -DEAL::Memory consumption -- Solution: 408 -DEAL::Memory consumption -- Rhs: 408 -DEAL::Memory consumption -- DataOut: 2978 -DEAL::2d -DEAL::Cycle 0: -DEAL:: Number of active cells: 20 -DEAL:: Number of degrees of freedom: 89 -DEAL::Memory consumption -- Triangulation: 5215 -DEAL::Memory consumption -- DoFHandler: 1952 -DEAL::Memory consumption -- FE: 3160 -DEAL::Memory consumption -- Constraints: 142 -DEAL::Memory consumption -- Sparsity: 5712 -DEAL::Memory consumption -- Matrix: 10592 -DEAL::Memory consumption -- Solution: 792 -DEAL::Memory consumption -- Rhs: 792 -DEAL::Cycle 1: -DEAL:: Number of active cells: 44 -DEAL:: Number of degrees of freedom: 209 -DEAL::Memory consumption -- Triangulation: 10919 -DEAL::Memory consumption -- DoFHandler: 3744 -DEAL::Memory consumption -- FE: 3160 -DEAL::Memory consumption -- Constraints: 3166 -DEAL::Memory consumption -- Sparsity: 13968 -DEAL::Memory consumption -- Matrix: 26144 -DEAL::Memory consumption -- Solution: 1752 -DEAL::Memory consumption -- Rhs: 1752 -DEAL::Cycle 2: -DEAL:: Number of active cells: 92 -DEAL:: Number of degrees of freedom: 449 -DEAL::Memory consumption -- Triangulation: 21567 -DEAL::Memory consumption -- DoFHandler: 7200 -DEAL::Memory consumption -- FE: 3160 -DEAL::Memory consumption -- Constraints: 10798 -DEAL::Memory consumption -- Sparsity: 31216 -DEAL::Memory consumption -- Matrix: 58720 -DEAL::Memory consumption -- Solution: 3672 -DEAL::Memory consumption -- Rhs: 3672 -DEAL::Cycle 3: -DEAL:: Number of active cells: 200 -DEAL:: Number of degrees of freedom: 921 -DEAL::Memory consumption -- Triangulation: 43695 -DEAL::Memory consumption -- DoFHandler: 14688 -DEAL::Memory consumption -- FE: 3160 -DEAL::Memory consumption -- Constraints: 20030 -DEAL::Memory consumption -- Sparsity: 64144 -DEAL::Memory consumption -- Matrix: 120800 -DEAL::Memory consumption -- Solution: 7448 -DEAL::Memory consumption -- Rhs: 7448 -DEAL::Memory consumption -- DataOut: 38118 -DEAL::3d -DEAL::Cycle 0: -DEAL:: Number of active cells: 56 -DEAL:: Number of degrees of freedom: 517 -DEAL::Memory consumption -- Triangulation: 24667 -DEAL::Memory consumption -- DoFHandler: 9776 -DEAL::Memory consumption -- FE: 10096 -DEAL::Memory consumption -- Constraints: 142 -DEAL::Memory consumption -- Sparsity: 120256 -DEAL::Memory consumption -- Matrix: 236256 -DEAL::Memory consumption -- Solution: 4216 -DEAL::Memory consumption -- Rhs: 4216 -DEAL::Cycle 1: -DEAL:: Number of active cells: 217 -DEAL:: Number of degrees of freedom: 2217 -DEAL::Memory consumption -- Triangulation: 98049 -DEAL::Memory consumption -- DoFHandler: 38012 -DEAL::Memory consumption -- FE: 10096 -DEAL::Memory consumption -- Constraints: 55326 -DEAL::Memory consumption -- Sparsity: 567128 -DEAL::Memory consumption -- Matrix: 1116400 -DEAL::Memory consumption -- Solution: 17816 -DEAL::Memory consumption -- Rhs: 17816 -DEAL::Cycle 2: -DEAL:: Number of active cells: 896 -DEAL:: Number of degrees of freedom: 9373 -DEAL::Memory consumption -- Triangulation: 394459 -DEAL::Memory consumption -- DoFHandler: 151296 -DEAL::Memory consumption -- FE: 10096 -DEAL::Memory consumption -- Constraints: 367150 -DEAL::Memory consumption -- Sparsity: 2517184 -DEAL::Memory consumption -- Matrix: 4959264 -DEAL::Memory consumption -- Solution: 75064 -DEAL::Memory consumption -- Rhs: 75064 -DEAL::Cycle 3: -DEAL:: Number of active cells: 3248 -DEAL:: Number of degrees of freedom: 32433 -DEAL::Memory consumption -- Triangulation: 1389551 -DEAL::Memory consumption -- DoFHandler: 542024 -DEAL::Memory consumption -- FE: 10096 -DEAL::Memory consumption -- Constraints: 1307870 -DEAL::Memory consumption -- Sparsity: 8321744 -DEAL::Memory consumption -- Matrix: 16383904 -DEAL::Memory consumption -- Solution: 259544 -DEAL::Memory consumption -- Rhs: 259544 -DEAL::Memory consumption -- DataOut: 1081902 diff --git a/tests/base/memory_consumption_01.with_64bit_indices=on.output b/tests/base/memory_consumption_01.with_64bit_indices=on.output deleted file mode 100644 index 41e4d7ea73..0000000000 --- a/tests/base/memory_consumption_01.with_64bit_indices=on.output +++ /dev/null @@ -1,139 +0,0 @@ - -DEAL::1d -DEAL::Cycle 0: -DEAL:: Number of active cells: 8 -DEAL:: Number of degrees of freedom: 17 -DEAL::Memory consumption -- Triangulation: 3090 -DEAL::Memory consumption -- DoFHandler: 1320 -DEAL::Memory consumption -- FE: 1480 -DEAL::Memory consumption -- Constraints: 122 -DEAL::Memory consumption -- Sparsity: 792 -DEAL::Memory consumption -- Matrix: 632 -DEAL::Memory consumption -- Solution: 248 -DEAL::Memory consumption -- Rhs: 248 -DEAL::Cycle 1: -DEAL:: Number of active cells: 11 -DEAL:: Number of degrees of freedom: 23 -DEAL::Memory consumption -- Triangulation: 4026 -DEAL::Memory consumption -- DoFHandler: 1616 -DEAL::Memory consumption -- FE: 1480 -DEAL::Memory consumption -- Constraints: 122 -DEAL::Memory consumption -- Sparsity: 1032 -DEAL::Memory consumption -- Matrix: 824 -DEAL::Memory consumption -- Solution: 296 -DEAL::Memory consumption -- Rhs: 296 -DEAL::Cycle 2: -DEAL:: Number of active cells: 15 -DEAL:: Number of degrees of freedom: 31 -DEAL::Memory consumption -- Triangulation: 4946 -DEAL::Memory consumption -- DoFHandler: 1952 -DEAL::Memory consumption -- FE: 1480 -DEAL::Memory consumption -- Constraints: 122 -DEAL::Memory consumption -- Sparsity: 1352 -DEAL::Memory consumption -- Matrix: 1080 -DEAL::Memory consumption -- Solution: 360 -DEAL::Memory consumption -- Rhs: 360 -DEAL::Cycle 3: -DEAL:: Number of active cells: 20 -DEAL:: Number of degrees of freedom: 41 -DEAL::Memory consumption -- Triangulation: 6090 -DEAL::Memory consumption -- DoFHandler: 2360 -DEAL::Memory consumption -- FE: 1480 -DEAL::Memory consumption -- Constraints: 122 -DEAL::Memory consumption -- Sparsity: 1752 -DEAL::Memory consumption -- Matrix: 1400 -DEAL::Memory consumption -- Solution: 440 -DEAL::Memory consumption -- Rhs: 440 -DEAL::Memory consumption -- DataOut: 3490 -DEAL::2d -DEAL::Cycle 0: -DEAL:: Number of active cells: 20 -DEAL:: Number of degrees of freedom: 89 -DEAL::Memory consumption -- Triangulation: 5415 -DEAL::Memory consumption -- DoFHandler: 3328 -DEAL::Memory consumption -- FE: 3896 -DEAL::Memory consumption -- Constraints: 122 -DEAL::Memory consumption -- Sparsity: 11352 -DEAL::Memory consumption -- Matrix: 10616 -DEAL::Memory consumption -- Solution: 824 -DEAL::Memory consumption -- Rhs: 824 -DEAL::Cycle 1: -DEAL:: Number of active cells: 44 -DEAL:: Number of degrees of freedom: 209 -DEAL::Memory consumption -- Triangulation: 11183 -DEAL::Memory consumption -- DoFHandler: 6848 -DEAL::Memory consumption -- FE: 3896 -DEAL::Memory consumption -- Constraints: 4634 -DEAL::Memory consumption -- Sparsity: 27864 -DEAL::Memory consumption -- Matrix: 26168 -DEAL::Memory consumption -- Solution: 1784 -DEAL::Memory consumption -- Rhs: 1784 -DEAL::Cycle 2: -DEAL:: Number of active cells: 92 -DEAL:: Number of degrees of freedom: 449 -DEAL::Memory consumption -- Triangulation: 21895 -DEAL::Memory consumption -- DoFHandler: 13712 -DEAL::Memory consumption -- FE: 3896 -DEAL::Memory consumption -- Constraints: 15290 -DEAL::Memory consumption -- Sparsity: 62360 -DEAL::Memory consumption -- Matrix: 58744 -DEAL::Memory consumption -- Solution: 3704 -DEAL::Memory consumption -- Rhs: 3704 -DEAL::Cycle 3: -DEAL:: Number of active cells: 200 -DEAL:: Number of degrees of freedom: 921 -DEAL::Memory consumption -- Triangulation: 44023 -DEAL::Memory consumption -- DoFHandler: 28688 -DEAL::Memory consumption -- FE: 3896 -DEAL::Memory consumption -- Constraints: 28122 -DEAL::Memory consumption -- Sparsity: 128216 -DEAL::Memory consumption -- Matrix: 120824 -DEAL::Memory consumption -- Solution: 7480 -DEAL::Memory consumption -- Rhs: 7480 -DEAL::Memory consumption -- DataOut: 42950 -DEAL::3d -DEAL::Cycle 0: -DEAL:: Number of active cells: 56 -DEAL:: Number of degrees of freedom: 517 -DEAL::Memory consumption -- Triangulation: 25011 -DEAL::Memory consumption -- DoFHandler: 18952 -DEAL::Memory consumption -- FE: 12272 -DEAL::Memory consumption -- Constraints: 122 -DEAL::Memory consumption -- Sparsity: 240440 -DEAL::Memory consumption -- Matrix: 236280 -DEAL::Memory consumption -- Solution: 4248 -DEAL::Memory consumption -- Rhs: 4248 -DEAL::Cycle 1: -DEAL:: Number of active cells: 217 -DEAL:: Number of degrees of freedom: 2217 -DEAL::Memory consumption -- Triangulation: 98505 -DEAL::Memory consumption -- DoFHandler: 75360 -DEAL::Memory consumption -- FE: 12272 -DEAL::Memory consumption -- Constraints: 78490 -DEAL::Memory consumption -- Sparsity: 1134184 -DEAL::Memory consumption -- Matrix: 1116424 -DEAL::Memory consumption -- Solution: 17848 -DEAL::Memory consumption -- Rhs: 17848 -DEAL::Cycle 2: -DEAL:: Number of active cells: 896 -DEAL:: Number of degrees of freedom: 9373 -DEAL::Memory consumption -- Triangulation: 395027 -DEAL::Memory consumption -- DoFHandler: 301880 -DEAL::Memory consumption -- FE: 12272 -DEAL::Memory consumption -- Constraints: 487354 -DEAL::Memory consumption -- Sparsity: 5034296 -DEAL::Memory consumption -- Matrix: 4959288 -DEAL::Memory consumption -- Solution: 75096 -DEAL::Memory consumption -- Rhs: 75096 -DEAL::Cycle 3: -DEAL:: Number of active cells: 3248 -DEAL:: Number of degrees of freedom: 32433 -DEAL::Memory consumption -- Triangulation: 1390231 -DEAL::Memory consumption -- DoFHandler: 1083256 -DEAL::Memory consumption -- FE: 12272 -DEAL::Memory consumption -- Constraints: 1729818 -DEAL::Memory consumption -- Sparsity: 16643416 -DEAL::Memory consumption -- Matrix: 16383928 -DEAL::Memory consumption -- Solution: 259576 -DEAL::Memory consumption -- Rhs: 259576 -DEAL::Memory consumption -- DataOut: 1159886 diff --git a/tests/base/memory_consumption_01.with_64bit_indices=on.output.2 b/tests/base/memory_consumption_01.with_64bit_indices=on.output.2 deleted file mode 100644 index 764dba30be..0000000000 --- a/tests/base/memory_consumption_01.with_64bit_indices=on.output.2 +++ /dev/null @@ -1,139 +0,0 @@ - -DEAL::1d -DEAL::Cycle 0: -DEAL:: Number of active cells: 8 -DEAL:: Number of degrees of freedom: 17 -DEAL::Memory consumption -- Triangulation: 3090 -DEAL::Memory consumption -- DoFHandler: 1320 -DEAL::Memory consumption -- FE: 1480 -DEAL::Memory consumption -- Constraints: 122 -DEAL::Memory consumption -- Sparsity: 792 -DEAL::Memory consumption -- Matrix: 632 -DEAL::Memory consumption -- Solution: 248 -DEAL::Memory consumption -- Rhs: 248 -DEAL::Cycle 1: -DEAL:: Number of active cells: 11 -DEAL:: Number of degrees of freedom: 23 -DEAL::Memory consumption -- Triangulation: 4026 -DEAL::Memory consumption -- DoFHandler: 1616 -DEAL::Memory consumption -- FE: 1480 -DEAL::Memory consumption -- Constraints: 122 -DEAL::Memory consumption -- Sparsity: 1032 -DEAL::Memory consumption -- Matrix: 824 -DEAL::Memory consumption -- Solution: 296 -DEAL::Memory consumption -- Rhs: 296 -DEAL::Cycle 2: -DEAL:: Number of active cells: 15 -DEAL:: Number of degrees of freedom: 31 -DEAL::Memory consumption -- Triangulation: 4946 -DEAL::Memory consumption -- DoFHandler: 1952 -DEAL::Memory consumption -- FE: 1480 -DEAL::Memory consumption -- Constraints: 122 -DEAL::Memory consumption -- Sparsity: 1352 -DEAL::Memory consumption -- Matrix: 1080 -DEAL::Memory consumption -- Solution: 360 -DEAL::Memory consumption -- Rhs: 360 -DEAL::Cycle 3: -DEAL:: Number of active cells: 20 -DEAL:: Number of degrees of freedom: 41 -DEAL::Memory consumption -- Triangulation: 6090 -DEAL::Memory consumption -- DoFHandler: 2360 -DEAL::Memory consumption -- FE: 1480 -DEAL::Memory consumption -- Constraints: 122 -DEAL::Memory consumption -- Sparsity: 1752 -DEAL::Memory consumption -- Matrix: 1400 -DEAL::Memory consumption -- Solution: 440 -DEAL::Memory consumption -- Rhs: 440 -DEAL::Memory consumption -- DataOut: 3394 -DEAL::2d -DEAL::Cycle 0: -DEAL:: Number of active cells: 20 -DEAL:: Number of degrees of freedom: 89 -DEAL::Memory consumption -- Triangulation: 5415 -DEAL::Memory consumption -- DoFHandler: 3328 -DEAL::Memory consumption -- FE: 3896 -DEAL::Memory consumption -- Constraints: 122 -DEAL::Memory consumption -- Sparsity: 11352 -DEAL::Memory consumption -- Matrix: 10616 -DEAL::Memory consumption -- Solution: 824 -DEAL::Memory consumption -- Rhs: 824 -DEAL::Cycle 1: -DEAL:: Number of active cells: 44 -DEAL:: Number of degrees of freedom: 209 -DEAL::Memory consumption -- Triangulation: 11183 -DEAL::Memory consumption -- DoFHandler: 6848 -DEAL::Memory consumption -- FE: 3896 -DEAL::Memory consumption -- Constraints: 4634 -DEAL::Memory consumption -- Sparsity: 27864 -DEAL::Memory consumption -- Matrix: 26168 -DEAL::Memory consumption -- Solution: 1784 -DEAL::Memory consumption -- Rhs: 1784 -DEAL::Cycle 2: -DEAL:: Number of active cells: 92 -DEAL:: Number of degrees of freedom: 449 -DEAL::Memory consumption -- Triangulation: 21895 -DEAL::Memory consumption -- DoFHandler: 13712 -DEAL::Memory consumption -- FE: 3896 -DEAL::Memory consumption -- Constraints: 15290 -DEAL::Memory consumption -- Sparsity: 62360 -DEAL::Memory consumption -- Matrix: 58744 -DEAL::Memory consumption -- Solution: 3704 -DEAL::Memory consumption -- Rhs: 3704 -DEAL::Cycle 3: -DEAL:: Number of active cells: 200 -DEAL:: Number of degrees of freedom: 921 -DEAL::Memory consumption -- Triangulation: 44023 -DEAL::Memory consumption -- DoFHandler: 28688 -DEAL::Memory consumption -- FE: 3896 -DEAL::Memory consumption -- Constraints: 28122 -DEAL::Memory consumption -- Sparsity: 128216 -DEAL::Memory consumption -- Matrix: 120824 -DEAL::Memory consumption -- Solution: 7480 -DEAL::Memory consumption -- Rhs: 7480 -DEAL::Memory consumption -- DataOut: 42854 -DEAL::3d -DEAL::Cycle 0: -DEAL:: Number of active cells: 56 -DEAL:: Number of degrees of freedom: 517 -DEAL::Memory consumption -- Triangulation: 25011 -DEAL::Memory consumption -- DoFHandler: 18952 -DEAL::Memory consumption -- FE: 12272 -DEAL::Memory consumption -- Constraints: 122 -DEAL::Memory consumption -- Sparsity: 240440 -DEAL::Memory consumption -- Matrix: 236280 -DEAL::Memory consumption -- Solution: 4248 -DEAL::Memory consumption -- Rhs: 4248 -DEAL::Cycle 1: -DEAL:: Number of active cells: 217 -DEAL:: Number of degrees of freedom: 2217 -DEAL::Memory consumption -- Triangulation: 98505 -DEAL::Memory consumption -- DoFHandler: 75360 -DEAL::Memory consumption -- FE: 12272 -DEAL::Memory consumption -- Constraints: 78490 -DEAL::Memory consumption -- Sparsity: 1134184 -DEAL::Memory consumption -- Matrix: 1116424 -DEAL::Memory consumption -- Solution: 17848 -DEAL::Memory consumption -- Rhs: 17848 -DEAL::Cycle 2: -DEAL:: Number of active cells: 896 -DEAL:: Number of degrees of freedom: 9373 -DEAL::Memory consumption -- Triangulation: 395027 -DEAL::Memory consumption -- DoFHandler: 301880 -DEAL::Memory consumption -- FE: 12272 -DEAL::Memory consumption -- Constraints: 487354 -DEAL::Memory consumption -- Sparsity: 5034296 -DEAL::Memory consumption -- Matrix: 4959288 -DEAL::Memory consumption -- Solution: 75096 -DEAL::Memory consumption -- Rhs: 75096 -DEAL::Cycle 3: -DEAL:: Number of active cells: 3248 -DEAL:: Number of degrees of freedom: 32433 -DEAL::Memory consumption -- Triangulation: 1390231 -DEAL::Memory consumption -- DoFHandler: 1083256 -DEAL::Memory consumption -- FE: 12272 -DEAL::Memory consumption -- Constraints: 1729818 -DEAL::Memory consumption -- Sparsity: 16643416 -DEAL::Memory consumption -- Matrix: 16383928 -DEAL::Memory consumption -- Solution: 259576 -DEAL::Memory consumption -- Rhs: 259576 -DEAL::Memory consumption -- DataOut: 1159790 diff --git a/tests/base/memory_consumption_02.cc b/tests/base/memory_consumption_02.cc deleted file mode 100644 index b970c4bdac..0000000000 --- a/tests/base/memory_consumption_02.cc +++ /dev/null @@ -1,92 +0,0 @@ -// Test the sizes of fundamental types, their pointers, and vectors comprised -// of either. -#include "../tests.h" -#include -#include -#include - -#include -#include -#include - -#define CONCAT(a, b) a##b -#define MAKE_LABEL(a, b) CONCAT(a, b) -#define EQUALITY_TEST(a) EqualityWithSizeofTest MAKE_LABEL(b_, __LINE__); \ - EqualityWithSizeofTest MAKE_LABEL(c_, __LINE__); \ - EqualityWithSizeofTest MAKE_LABEL(d_, __LINE__); - -using namespace dealii; - -template -struct EqualityWithSizeofTest -{ - EqualityWithSizeofTest() - { - T t = 0; - deallog << (sizeof(t) == dealii::MemoryConsumption::memory_consumption(t)) - << std::endl; - - std::vector vector_test(42); - deallog << ((sizeof(std::vector) + vector_test.capacity()*sizeof(T)) - == dealii::MemoryConsumption::memory_consumption(vector_test)) - << std::endl; - } -}; - - -template -struct EqualityWithSizeofTest -{ - EqualityWithSizeofTest() - { - T *t = nullptr; - deallog << (sizeof(t) == dealii::MemoryConsumption::memory_consumption(t)) - << std::endl; - - std::vector vector_test(42); - deallog << ((sizeof(std::vector) + vector_test.capacity()*sizeof(T *)) - == dealii::MemoryConsumption::memory_consumption(vector_test)) - << std::endl; - } -}; - - -int main() -{ - initlog(); - - // do not test value type (just pointers) with void - EqualityWithSizeofTest a; - EqualityWithSizeofTest b; - - // std::vector is overloaded to work as a bit field, so the vector - // version should be unequal - EQUALITY_TEST(bool) - EQUALITY_TEST(signed char) - EQUALITY_TEST(unsigned char) - // char* is overloaded to measure the length of a C string, so the pointer - // version should be unequal - EQUALITY_TEST(char) - EQUALITY_TEST(wchar_t) - - EQUALITY_TEST(short) - EQUALITY_TEST(short int) - EQUALITY_TEST(signed short) - EQUALITY_TEST(signed short int) - EQUALITY_TEST(unsigned short) - EQUALITY_TEST(unsigned short int) - EQUALITY_TEST(int) - EQUALITY_TEST(signed) - EQUALITY_TEST(signed int) - EQUALITY_TEST(unsigned) - EQUALITY_TEST(unsigned int) - EQUALITY_TEST(long) - EQUALITY_TEST(long int) - EQUALITY_TEST(signed long) - EQUALITY_TEST(signed long int) - EQUALITY_TEST(unsigned long int) - - EQUALITY_TEST(float) - EQUALITY_TEST(double) - EQUALITY_TEST(long double) -} diff --git a/tests/base/memory_consumption_02.output b/tests/base/memory_consumption_02.output deleted file mode 100644 index 7bdb9e67b0..0000000000 --- a/tests/base/memory_consumption_02.output +++ /dev/null @@ -1,149 +0,0 @@ - -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::0 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::0 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 -DEAL::1 diff --git a/tests/base/memory_consumption_03.cc b/tests/base/memory_consumption_03.cc deleted file mode 100644 index e37e494ac3..0000000000 --- a/tests/base/memory_consumption_03.cc +++ /dev/null @@ -1,34 +0,0 @@ -// --------------------------------------------------------------------- -// -// Copyright (C) 2016 by the deal.II authors -// -// This file is part of the deal.II library. -// -// The deal.II library is free software; you can use it, redistribute -// it, and/or modify it under the terms of the GNU Lesser General -// Public License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// The full text of the license can be found in the file LICENSE at -// the top level of the deal.II distribution. -// -// --------------------------------------------------------------------- - - - -// test memory_consumption() on std::array - -#include "../tests.h" - -#include - -#include - - -int main() -{ - initlog(); - - typedef std::array, 3> IntArray; - deallog << dealii::MemoryConsumption::memory_consumption(IntArray()) << std::endl; - deallog << sizeof(IntArray) << std::endl; -} diff --git a/tests/base/memory_consumption_03.output b/tests/base/memory_consumption_03.output deleted file mode 100644 index 703ca29d82..0000000000 --- a/tests/base/memory_consumption_03.output +++ /dev/null @@ -1,3 +0,0 @@ - -DEAL::36 -DEAL::36 -- 2.39.5