From d77a42b3461515112ba1d16ab55d3e45a4f25060 Mon Sep 17 00:00:00 2001 From: guido Date: Tue, 9 Jul 2002 05:37:19 +0000 Subject: [PATCH] include transfer matrices git-svn-id: https://svn.dealii.org/trunk@6229 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/fe/Makefile | 4 +++- tests/fe/show_transfer.cc | 36 +++++++++++++++--------------------- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/tests/fe/Makefile b/tests/fe/Makefile index 2460a7d4a8..f30ceae857 100644 --- a/tests/fe/Makefile +++ b/tests/fe/Makefile @@ -33,9 +33,11 @@ mapping_q1_eulerian.exe : mapping_q1_eulerian.go $(libraries) non_primitive_1.exe : non_primitive_1.go $(libraries) numbering.exe : numbering.go $(libraries) shapes.exe : shapes.go $(libraries) +show_transfer.exe : show_transfer.go $(libraries) tests = derivatives fe_data_test fe_traits fe_tools_test mapping \ - mapping_c1 shapes numbering mapping_q1_eulerian internals \ + mapping_c1 shapes numbering mapping_q1_eulerian \ + show_transfer internals \ non_primitive_1 ############################################################ diff --git a/tests/fe/show_transfer.cc b/tests/fe/show_transfer.cc index 7cfa4383a4..daf8b93a0f 100644 --- a/tests/fe/show_transfer.cc +++ b/tests/fe/show_transfer.cc @@ -17,12 +17,16 @@ #include #include +#include #include #include #include #include #include -#include +#include +#include +#include +#include #include #include @@ -31,7 +35,7 @@ char fname[50]; -#define TEST(l,el) { el fe; print_matrix(of, tr, l, fe, #el); } +#define TEST(l,el, deg) { el fe(deg); print_matrix(of, tr, l, fe, #el); } template inline void @@ -75,26 +79,16 @@ main() std::ofstream of("transfer.dat"); - TEST(1,FEQ1<2>); - TEST(1,FEQ2<2>); - TEST(1,FEQ3<2>); - TEST(1,FEQ4<2>); + TEST(1, FE_Q<2>, 1); + TEST(1, FE_Q<2>, 2); + TEST(1, FE_Q<2>, 3); +// TEST(1, FE_Q<2>, 4); - TEST(1,FEDG_Q0<2>); - TEST(1,FEDG_Q1<2>); - TEST(1,FEDG_Q2<2>); - TEST(1,FEDG_Q3<2>); - TEST(1,FEDG_Q4<2>); + TEST(1, FE_DGQ<2>, 0); + TEST(1, FE_DGQ<2>, 1); + TEST(1, FE_DGQ<2>, 2); + TEST(1, FE_DGQ<2>, 3); + TEST(1, FE_DGQ<2>, 4); - TEST(2,FEQ1<2>); - TEST(2,FEQ2<2>); - TEST(2,FEQ3<2>); - TEST(2,FEQ4<2>); - - TEST(2,FEDG_Q0<2>); - TEST(2,FEDG_Q1<2>); - TEST(2,FEDG_Q2<2>); - TEST(2,FEDG_Q3<2>); - TEST(2,FEDG_Q4<2>); return 0; } -- 2.39.5