From 2e1345c18f926507b3fa93b9964bf84a05f7d17a Mon Sep 17 00:00:00 2001 From: David Wells Date: Mon, 8 Jun 2015 14:52:51 -0400 Subject: [PATCH] Update the memory consumption values for DataOut. I removed three 'dummy' integers in commit 95a5595 to silence warnings about unused private members. Most C++ compilers use 4 bytes for an int and 1 byte for an empty class, so the net result was a loss of 9 bytes for DataOutInterface (inherited by DataOut). This commit updates the expected memory usage values to match. --- .../memory_consumption_01.with_64bit_indices=off.output | 6 +++--- .../memory_consumption_01.with_64bit_indices=on.output | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/deal.II/memory_consumption_01.with_64bit_indices=off.output b/tests/deal.II/memory_consumption_01.with_64bit_indices=off.output index 8ccf448176..e334c118e4 100644 --- a/tests/deal.II/memory_consumption_01.with_64bit_indices=off.output +++ b/tests/deal.II/memory_consumption_01.with_64bit_indices=off.output @@ -44,7 +44,7 @@ DEAL::Memory consumption -- Sparsity: 928 DEAL::Memory consumption -- Matrix: 1400 DEAL::Memory consumption -- Solution: 416 DEAL::Memory consumption -- Rhs: 416 -DEAL::Memory consumption -- DataOut: 3329 +DEAL::Memory consumption -- DataOut: 3320 DEAL::2d DEAL::Cycle 0: DEAL:: Number of active cells: 20 @@ -90,7 +90,7 @@ DEAL::Memory consumption -- Sparsity: 64160 DEAL::Memory consumption -- Matrix: 120824 DEAL::Memory consumption -- Solution: 7456 DEAL::Memory consumption -- Rhs: 7456 -DEAL::Memory consumption -- DataOut: 42789 +DEAL::Memory consumption -- DataOut: 42780 DEAL::3d DEAL::Cycle 0: DEAL:: Number of active cells: 56 @@ -136,4 +136,4 @@ DEAL::Memory consumption -- Sparsity: 8321760 DEAL::Memory consumption -- Matrix: 16383928 DEAL::Memory consumption -- Solution: 259552 DEAL::Memory consumption -- Rhs: 259552 -DEAL::Memory consumption -- DataOut: 1159725 +DEAL::Memory consumption -- DataOut: 1159716 diff --git a/tests/deal.II/memory_consumption_01.with_64bit_indices=on.output b/tests/deal.II/memory_consumption_01.with_64bit_indices=on.output index 916acf5224..41ba26529c 100644 --- a/tests/deal.II/memory_consumption_01.with_64bit_indices=on.output +++ b/tests/deal.II/memory_consumption_01.with_64bit_indices=on.output @@ -44,7 +44,7 @@ DEAL::Memory consumption -- Sparsity: 1752 DEAL::Memory consumption -- Matrix: 1400 DEAL::Memory consumption -- Solution: 424 DEAL::Memory consumption -- Rhs: 424 -DEAL::Memory consumption -- DataOut: 3329 +DEAL::Memory consumption -- DataOut: 3320 DEAL::2d DEAL::Cycle 0: DEAL:: Number of active cells: 20 @@ -90,7 +90,7 @@ DEAL::Memory consumption -- Sparsity: 128216 DEAL::Memory consumption -- Matrix: 120824 DEAL::Memory consumption -- Solution: 7464 DEAL::Memory consumption -- Rhs: 7464 -DEAL::Memory consumption -- DataOut: 42789 +DEAL::Memory consumption -- DataOut: 42780 DEAL::3d DEAL::Cycle 0: DEAL:: Number of active cells: 56 @@ -136,4 +136,4 @@ DEAL::Memory consumption -- Sparsity: 16643416 DEAL::Memory consumption -- Matrix: 16383928 DEAL::Memory consumption -- Solution: 259560 DEAL::Memory consumption -- Rhs: 259560 -DEAL::Memory consumption -- DataOut: 1159725 +DEAL::Memory consumption -- DataOut: 1159716 -- 2.39.5