]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
include transfer matrices
authorguido <guido@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 9 Jul 2002 05:37:19 +0000 (05:37 +0000)
committerguido <guido@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 9 Jul 2002 05:37:19 +0000 (05:37 +0000)
git-svn-id: https://svn.dealii.org/trunk@6229 0785d39b-7218-0410-832d-ea1e28bc413d

tests/fe/Makefile
tests/fe/show_transfer.cc

index 2460a7d4a85d71586d6fac447f8e09cfaf796aab..f30ceae857fbbb13b7aeaf67a58125eaa1c7f018 100644 (file)
@@ -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
 
 ############################################################
index 7cfa4383a4ea4531523192be5d074861390875d6..daf8b93a0ffcc4294379603649d947536f59329f 100644 (file)
 
 #include <base/quadrature_lib.h>
 #include <lac/vector.h>
+#include <lac/sparse_matrix.h>
 #include <grid/tria.h>
 #include <grid/tria_iterator.h>
 #include <dofs/dof_accessor.h>
 #include <grid/grid_generator.h>
 #include <fe/fe_values.h>
-#include <multigrid/multigrid.h>
+#include <fe/fe_q.h>
+#include <fe/fe_dgq.h>
+#include <fe/fe_dgp.h>
+#include <multigrid/mg_transfer.h>
 #include <multigrid/mg_dof_handler.h>
 
 #include <vector>
@@ -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<int dim>
 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;
 }

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.