From 82a748b82052151b7360f3cc0dd1307f0ac4ea0b Mon Sep 17 00:00:00 2001 From: Denis Davydov <davydden@gmail.com> Date: Tue, 23 Jun 2015 19:46:12 +0200 Subject: [PATCH] fixed Table<2,T>::reinit(TableIndices<2>) --- include/deal.II/base/table.h | 2 ++ tests/base/table_05.cc | 59 ++++++++++++++++++++++++++++++++++++ tests/base/table_05.output | 4 +++ 3 files changed, 65 insertions(+) create mode 100644 tests/base/table_05.cc create mode 100644 tests/base/table_05.output diff --git a/include/deal.II/base/table.h b/include/deal.II/base/table.h index 50301c7c3d..3dc6ec75d1 100644 --- a/include/deal.II/base/table.h +++ b/include/deal.II/base/table.h @@ -866,6 +866,8 @@ public: const unsigned int size2, const bool fast = false); + using TableBase<2,T>::reinit; + /** * Access operator. Generate an object that accesses the requested row of * this two-dimensional table. Range checks are performed. diff --git a/tests/base/table_05.cc b/tests/base/table_05.cc new file mode 100644 index 0000000000..00a0b12b66 --- /dev/null +++ b/tests/base/table_05.cc @@ -0,0 +1,59 @@ +// --------------------------------------------------------------------- +// +// Copyright (C) 1998 - 2015 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. +// +// --------------------------------------------------------------------- + + +// check that Table<{1,2,3},T>::reinit(TableIndices) work + +#include "../tests.h" +#include <cmath> +#include <fstream> +#include <iomanip> +#include <cstdlib> + +#include <deal.II/base/logstream.h> +#include <deal.II/base/table.h> + +template<int dim> +void test() +{ + dealii::TableIndices<dim> new_size; + for (unsigned int d = 0; d < dim; d++) + new_size[d] = 5; + + dealii::Table<dim,int> unrolled; + unrolled.reinit(new_size); + + deallog<<"OK"<<std::endl; +} + + +int +main () +{ + std::ofstream logfile("output"); + deallog << std::fixed; + deallog << std::setprecision(0); + deallog.attach(logfile); + deallog.depth_console(0); + deallog.threshold_double(1.e-10); + + test<1>(); + test<2>(); + test<3>(); + +} + + + diff --git a/tests/base/table_05.output b/tests/base/table_05.output new file mode 100644 index 0000000000..fb71de2867 --- /dev/null +++ b/tests/base/table_05.output @@ -0,0 +1,4 @@ + +DEAL::OK +DEAL::OK +DEAL::OK -- 2.39.5