From 1417550911aedce0562d8aaed1dd389aeabb28d1 Mon Sep 17 00:00:00 2001 From: guido Date: Wed, 19 Oct 2005 04:56:45 +0000 Subject: [PATCH] tests for RTN and RT git-svn-id: https://svn.dealii.org/trunk@11622 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/fe/Makefile | 2 +- tests/fe/interpolate_rt.cc | 73 +++++++++++++++++++ tests/fe/interpolate_rtn.cc | 18 +++-- .../fe/fe_data_test.output | 16 ++-- .../fe/interpolate_rt.output | 5 ++ .../fe/interpolate_rtn.output | 3 + 6 files changed, 100 insertions(+), 17 deletions(-) create mode 100644 tests/fe/interpolate_rt.cc create mode 100644 tests/results/i686-pc-linux-gnu+gcc3.2/fe/interpolate_rt.output diff --git a/tests/fe/Makefile b/tests/fe/Makefile index 1ebe5c3f2f..5c6c3b1d28 100644 --- a/tests/fe/Makefile +++ b/tests/fe/Makefile @@ -30,7 +30,7 @@ tests = fe_data_test traits fe_tools fe_tools_test mapping \ transfer internals \ dgq_1 \ q_1 q_2 q_3 q_4 interpolate_q1 \ - rt_1 rt_2 rt_3 rt_4 rt_5 rt_6 rtdiff rtn_1 interpolate_rtn \ + rt_1 rt_2 rt_3 rt_4 rt_5 rt_6 rtdiff rtn_1 interpolate_rt interpolate_rtn \ dgp_monomial_1 dgp_monomial_2 \ system_1 interpolate_system \ non_primitive_1 non_primitive_2 \ diff --git a/tests/fe/interpolate_rt.cc b/tests/fe/interpolate_rt.cc new file mode 100644 index 0000000000..4d61217071 --- /dev/null +++ b/tests/fe/interpolate_rt.cc @@ -0,0 +1,73 @@ +//---------------------------------------------------------------------- +// $Id$ +// Version: $Name$ +// +// Copyright (C) 2005 by the deal.II authors +// +// This file is subject to QPL and may not be distributed +// without copyright and license information. Please refer +// to the file deal.II/doc/license.html for the text and +// further information on this license. +// +//---------------------------------------------------------------------- + +#include "interpolate_common.h" +#include +#include + +#include + +#include + +// FE_RaviartThomas::interpolate(...) + +template +void check1(const Function& f, + const unsigned int degree) +{ + FE_RaviartThomas fe(degree); + deallog << fe.get_name() << ' '; + deallog << fe.get_generalized_support_points().size() << ' '; + + std::vector dofs(fe.dofs_per_cell); + + std::vector > + values(dim, std::vector(fe.get_generalized_support_points().size())); + std::vector > + vectors(fe.get_generalized_support_points().size(), + Vector(dim)); + f.vector_value_list(fe.get_generalized_support_points(), vectors); + + for (unsigned int c=0;c w1; +// check1(w1,1,2); +// check1(w1,2,2); +// check1(w1,3,2); + Q1WedgeFunction<2,1,2> w21; + check1(w21,1); + check1(w21,2); + Q1WedgeFunction<2,2,2> w22; + check1(w22,2); + Q1WedgeFunction<2,3,2> w23; + check1(w23,3); +// Q1WedgeFunction<3,1,3> w3; +// check1(w3,1); +// check1(w3,2); +} diff --git a/tests/fe/interpolate_rtn.cc b/tests/fe/interpolate_rtn.cc index f22e6e5265..f18bf86caa 100644 --- a/tests/fe/interpolate_rtn.cc +++ b/tests/fe/interpolate_rtn.cc @@ -54,18 +54,20 @@ int main() std::ofstream logfile ("interpolate_rtn.output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-15); + deallog.threshold_double(1.e-13); -// Q1WedgeFunction<1,1,2> w1; -// check1(w1,1,2); -// check1(w1,2,2); -// check1(w1,3,2); +// Q1WedgeFunction<1,1,2> w1; +// check1(w1,1,2); +// check1(w1,2,2); +// check1(w1,3,2); Q1WedgeFunction<2,1,2> w2; check1(w2,1); check1(w2,2); Q1WedgeFunction<2,2,2> w22; check1(w22,2); -// Q1WedgeFunction<3,1,3> w3; -// check1(w3,1); -// check1(w3,2); + Q1WedgeFunction<2,3,2> w23; + check1(w23,3); + Q1WedgeFunction<3,1,3> w3; + check1(w3,1); + check1(w3,2); } diff --git a/tests/results/i686-pc-linux-gnu+gcc3.2/fe/fe_data_test.output b/tests/results/i686-pc-linux-gnu+gcc3.2/fe/fe_data_test.output index bfd35bd791..d933dccfd6 100644 --- a/tests/results/i686-pc-linux-gnu+gcc3.2/fe/fe_data_test.output +++ b/tests/results/i686-pc-linux-gnu+gcc3.2/fe/fe_data_test.output @@ -865,7 +865,7 @@ DEAL::dofs_per_cell=4 DEAL::components=2 DEAL::degree=1 DEAL::conformity=4 -DEAL::unit_support_points=4 +DEAL::unit_support_points=0 DEAL::unit_face_support_points=1 DEAL::generalized_support_points=4 DEAL::generalized_face_support_points=1 @@ -889,7 +889,7 @@ DEAL::dofs_per_cell=12 DEAL::components=2 DEAL::degree=2 DEAL::conformity=4 -DEAL::unit_support_points=12 +DEAL::unit_support_points=0 DEAL::unit_face_support_points=2 DEAL::generalized_support_points=12 DEAL::generalized_face_support_points=2 @@ -913,9 +913,9 @@ DEAL::dofs_per_cell=24 DEAL::components=2 DEAL::degree=3 DEAL::conformity=4 -DEAL::unit_support_points=24 +DEAL::unit_support_points=0 DEAL::unit_face_support_points=3 -DEAL::generalized_support_points=24 +DEAL::generalized_support_points=21 DEAL::generalized_face_support_points=3 DEAL::support on face 0: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 DEAL::support on face 1: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 @@ -937,10 +937,10 @@ DEAL::dofs_per_cell=16 DEAL::components=3 DEAL::degree=2 DEAL::conformity=0 -DEAL::unit_support_points=16 -DEAL::unit_face_support_points=2 -DEAL::generalized_support_points=16 -DEAL::generalized_face_support_points=2 +DEAL::unit_support_points=0 +DEAL::unit_face_support_points=0 +DEAL::generalized_support_points=0 +DEAL::generalized_face_support_points=0 DEAL::support on face 0: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 DEAL::support on face 1: 0 1 2 3 4 5 6 7 8 9 10 11 13 15 DEAL::support on face 2: 0 1 2 3 4 5 6 7 8 9 10 11 14 15 diff --git a/tests/results/i686-pc-linux-gnu+gcc3.2/fe/interpolate_rt.output b/tests/results/i686-pc-linux-gnu+gcc3.2/fe/interpolate_rt.output new file mode 100644 index 0000000000..9a6c213f35 --- /dev/null +++ b/tests/results/i686-pc-linux-gnu+gcc3.2/fe/interpolate_rt.output @@ -0,0 +1,5 @@ + +DEAL::FE_RaviartThomas<2>(1) 12 vector 0.832332 Vector 0.832332 +DEAL::FE_RaviartThomas<2>(2) 21 vector 0.898440 Vector 0.898440 +DEAL::FE_RaviartThomas<2>(2) 21 vector 0.749882 Vector 0.749882 +DEAL::FE_RaviartThomas<2>(3) 32 vector 0.749555 Vector 0.749555 diff --git a/tests/results/i686-pc-linux-gnu+gcc3.2/fe/interpolate_rtn.output b/tests/results/i686-pc-linux-gnu+gcc3.2/fe/interpolate_rtn.output index 964cc11a3c..cb364a00e3 100644 --- a/tests/results/i686-pc-linux-gnu+gcc3.2/fe/interpolate_rtn.output +++ b/tests/results/i686-pc-linux-gnu+gcc3.2/fe/interpolate_rtn.output @@ -2,3 +2,6 @@ DEAL::FE_RaviartThomasNodal<2>(1) 12 vector 0 Vector 0 DEAL::FE_RaviartThomasNodal<2>(2) 24 vector 0 Vector 0 DEAL::FE_RaviartThomasNodal<2>(2) 24 vector 0 Vector 0 +DEAL::FE_RaviartThomasNodal<2>(3) 40 vector 0 Vector 0 +DEAL::FE_RaviartThomasNodal<3>(1) 36 vector 0 Vector 0 +DEAL::FE_RaviartThomasNodal<3>(2) 108 vector 0 Vector 0 -- 2.39.5