From 0a43f698a97bf3813598884add4fc8eacff3d771 Mon Sep 17 00:00:00 2001 From: hartmann Date: Wed, 7 Jun 2006 05:50:03 +0000 Subject: [PATCH] Revert last patch as it, seemingly, was checked in accidentally. git-svn-id: https://svn.dealii.org/trunk@13160 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/multigrid/transfer_block.cc | 56 +++++++++++++++--------------- tests/multigrid/transfer_select.cc | 16 ++++----- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/tests/multigrid/transfer_block.cc b/tests/multigrid/transfer_block.cc index b83e18693f..b9647a80c7 100644 --- a/tests/multigrid/transfer_block.cc +++ b/tests/multigrid/transfer_block.cc @@ -135,37 +135,37 @@ int main() deallog.depth_console(0); deallog.threshold_double(1.e-10); -// std::vector v1(4); -// std::vector v2(4); -// std::vector v3(4); -// for (unsigned int i=0;i<4;++i) -// { -// v1[i] = i; -// v2[i] = 0; -// v3[i] = i; -// } -// v3[0] = 0; -// v3[1] = 1; -// v3[2] = 1; -// v3[3] = 2; + std::vector v1(4); + std::vector v2(4); + std::vector v3(4); + for (unsigned int i=0;i<4;++i) + { + v1[i] = i; + v2[i] = 0; + v3[i] = i; + } + v3[0] = 0; + v3[1] = 1; + v3[2] = 1; + v3[3] = 2; -// std::vector factors; + std::vector factors; -// FESystem<2> fe1(FE_DGQ<2>(1), 4); + FESystem<2> fe1(FE_DGQ<2>(1), 4); -// vector s1(4, true); + vector s1(4, true); -// deallog << "s1 s1 v1 v1" << std::endl; -// check_block(fe1, s1, s1, factors, v1, v1); -// // deallog << "s1 s1 v1 v2" << std::endl; -// // check_block(fe1, s1, s1, factors, v1, v2); -// // deallog << "s1 s1 v1 v3" << std::endl; -// // check_block(fe1, s1, s1, factors, v1, v3); + deallog << "s1 s1 v1 v1" << std::endl; + check_block(fe1, s1, s1, factors, v1, v1); +// deallog << "s1 s1 v1 v2" << std::endl; +// check_block(fe1, s1, s1, factors, v1, v2); +// deallog << "s1 s1 v1 v3" << std::endl; +// check_block(fe1, s1, s1, factors, v1, v3); -// factors.resize(4, 1.); -// factors[1] = 2.; -// deallog << "s1 s1 v1 v1" << std::endl; -// check_block(fe1, s1, s1, factors, v1, v1); -// // deallog << "s1 s1 v1 v3" << std::endl; -// // check_block(fe1, s1, s1, factors, v1, v3); + factors.resize(4, 1.); + factors[1] = 2.; + deallog << "s1 s1 v1 v1" << std::endl; + check_block(fe1, s1, s1, factors, v1, v1); +// deallog << "s1 s1 v1 v3" << std::endl; +// check_block(fe1, s1, s1, factors, v1, v3); } diff --git a/tests/multigrid/transfer_select.cc b/tests/multigrid/transfer_select.cc index c0d6bfef99..e758e5fb4e 100644 --- a/tests/multigrid/transfer_select.cc +++ b/tests/multigrid/transfer_select.cc @@ -143,12 +143,12 @@ int main() check_select (fe1, 1, 1, v1, v1); check_select (fe1, 1, 2, v1, v1); check_select (fe1, 2, 1, v1, v1); -// check_select (fe1, 0, 0, v2, v2); -// check_select (fe1, 0, 0, v3, v3); -// check_select (fe1, 1, 1, v3, v3); -// check_select (fe1, 0, 0, v1, v3); -// check_select (fe1, 1, 1, v1, v3); -// check_select (fe1, 2, 1, v1, v3); -// check_select (fe1, 0, 1, v1, v3); -// check_select (fe1, 0, 0, v1, v2); + check_select (fe1, 0, 0, v2, v2); + check_select (fe1, 0, 0, v3, v3); + check_select (fe1, 1, 1, v3, v3); + check_select (fe1, 0, 0, v1, v3); + check_select (fe1, 1, 1, v1, v3); + check_select (fe1, 2, 1, v1, v3); + check_select (fe1, 0, 1, v1, v3); + check_select (fe1, 0, 0, v1, v2); } -- 2.39.5